diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-02-24 07:39:20 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-02-24 07:39:20 +0400 |
| commit | d120ec146d3c28b7243371b0de1edf4ba590470c (patch) | |
| tree | a05f182978c6007bb9193f6ad0b4f2b210394ee8 /source/creator | |
| parent | 3df023ae82eef0ea105dc61c9730af87b59a07d1 (diff) | |
| parent | 93c3593d825aafe30aaf051182e50bde4c6084dd (diff) | |
Merged changes in the trunk up to revision 54802.
Diffstat (limited to 'source/creator')
| -rw-r--r-- | source/creator/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | source/creator/creator.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index 8fe7d5e6faf..7271e89461f 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -703,7 +703,7 @@ elseif(APPLE) ) # python - if(WITH_PYTHON AND NOT WITH_PYTHON_MODULE) + if(WITH_PYTHON AND NOT WITH_PYTHON_MODULE AND NOT WITH_PYTHON_FRAMEWORK) # the python zip is first extract as part of the build process, # and then later installed as part of make install. this is much # quicker, and means we can easily exclude files on copy @@ -756,7 +756,7 @@ elseif(APPLE) ) # python - if(WITH_PYTHON) + if(WITH_PYTHON AND NOT WITH_PYTHON_FRAMEWORK) add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/python COMMAND rm -rf ${CMAKE_CURRENT_BINARY_DIR}/python/ diff --git a/source/creator/creator.c b/source/creator/creator.c index 5d5d5d470b7..57915770d47 100644 --- a/source/creator/creator.c +++ b/source/creator/creator.c @@ -48,7 +48,7 @@ #endif #ifdef WIN32 -# include <Windows.h> +# include <windows.h> # include "utfconv.h" #endif |