diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-09-15 18:36:32 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-09-15 18:36:32 +0400 |
| commit | d5ee95644d935c9b87103cb0810983761bdeb6a8 (patch) | |
| tree | f8d06caf6d7c1f3fd645dca6db7e7cab6b5d8f9d | |
| parent | 84c40629283616cd11efb22d5865ace111b6c652 (diff) | |
win32 mingw works again with cmake
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | source/creator/CMakeLists.txt | 17 |
2 files changed, 16 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 3b807d1c6bf..67422f20b21 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -369,7 +369,7 @@ IF(WIN32) SET(PYTHON_VERSION 3.1) SET(PYTHON_INC "${PYTHON}/include/python${PYTHON_VERSION}") # SET(PYTHON_BINARY python) # not used yet - SET(PYTHON_LIB python31) + SET(PYTHON_LIB python31mw) SET(PYTHON_LIBPATH ${PYTHON}/lib) ENDIF(WITH_PYTHON) diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index ea2529f1875..51f0d80b240 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -307,7 +307,6 @@ IF(WITH_INSTALL) POST_BUILD MAIN_DEPENDENCY blender COMMAND copy /Y \"${LIBDIR}\\zlib\\lib\\zlib.dll\" \"${TARGETDIR}\\\" - COMMAND copy /Y \"${LIBDIR}\\pthreads\\lib\\pthreadVC2.dll\" \"${TARGETDIR}\\\" # COMMAND copy /Y \"${LIBDIR}\\samplerate\\lib\\libsamplerate-0.dll\" \"${TARGETDIR}\\\" ) ELSE(CMAKE_CL_64) @@ -317,10 +316,24 @@ IF(WITH_INSTALL) COMMAND copy /Y \"${LIBDIR}\\gettext\\lib\\gnu_gettext.dll\" \"${TARGETDIR}\\\" COMMAND copy /Y \"${LIBDIR}\\png\\lib\\libpng.dll\" \"${TARGETDIR}\\\" COMMAND copy /Y \"${LIBDIR}\\zlib\\lib\\zlib.dll\" \"${TARGETDIR}\\\" - COMMAND copy /Y \"${LIBDIR}\\pthreads\\lib\\pthreadVC2.dll\" \"${TARGETDIR}\\\" # COMMAND copy /Y \"${LIBDIR}\\samplerate\\lib\\libsamplerate-0.dll\" \"${TARGETDIR}\\\" ) ENDIF(CMAKE_CL_64) + + + IF(MSVC) + ADD_CUSTOM_COMMAND(TARGET blender + POST_BUILD + MAIN_DEPENDENCY blender + COMMAND copy /Y \"${LIBDIR}\\pthreads\\lib\\pthreadVC2.dll\" \"${TARGETDIR}\\\" + ) + ELSE(MSVC) + ADD_CUSTOM_COMMAND(TARGET blender + POST_BUILD + MAIN_DEPENDENCY blender + COMMAND copy /Y \"${LIBDIR}\\pthreads\\lib\\pthreadGC2.dll\" \"${TARGETDIR}\\\" + ) + ENDIF(MSVC) IF(WITH_PYTHON) IF(NOT CMAKE_BUILD_TYPE) # hack: with multi-configuration generator this is "", so for now copy both python31.dll/zip and python31_d.dll/zip |