diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-11-23 02:25:21 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-11-23 02:25:21 +0300 |
| commit | 837fedf372844637338f9623b92f2a5e76f493de (patch) | |
| tree | b9ce5859192b56cf8a704dcd2b894750ba47e983 | |
| parent | 94e17ff01e18cc4a8827f81bbf4340fe4f1e718e (diff) | |
fix for building with mingw/cmake
| -rw-r--r-- | intern/ghost/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | source/creator/CMakeLists.txt | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/intern/ghost/CMakeLists.txt b/intern/ghost/CMakeLists.txt index 8319772adeb..845e38cbb2e 100644 --- a/intern/ghost/CMakeLists.txt +++ b/intern/ghost/CMakeLists.txt @@ -83,9 +83,10 @@ ELSEIF(UNIX) ELSEIF(WIN32) IF(MSVC) SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /WX") - LIST(APPEND INC ${WINTAB_INC}) ENDIF(MSVC) + LIST(APPEND INC ${WINTAB_INC}) + LIST(APPEND SRC ./intern/GHOST_DisplayManagerWin32.cpp ./intern/GHOST_SystemWin32.cpp diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index ea338cf3d6b..e039d67515e 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -303,6 +303,8 @@ IF(WITH_INSTALL) POST_BUILD MAIN_DEPENDENCY blender COMMAND if not exist \"${TARGETDIR}\\${BLENDER_VERSION}\\python\\lib\" mkdir \"${TARGETDIR}\\${BLENDER_VERSION}\\python\\lib\" + COMMAND if \"$(ConfigurationName)\" == \"\" copy /Y \"${LIBDIR}\\python\\lib\\python31.dll\" \"${TARGETDIR}\\\" + COMMAND if \"$(ConfigurationName)\" == \"\" xcopy /E /Y \"${LIBDIR}\\release\\python31\\*.*\" \"${TARGETDIR}\\${BLENDER_VERSION}\\python\\lib\\\" COMMAND if \"$(ConfigurationName)\" == \"Debug\" copy /Y \"${LIBDIR}\\python\\lib\\python31_d.dll\" \"${TARGETDIR}\\\" COMMAND if \"$(ConfigurationName)\" == \"Debug\" xcopy /E /Y \"${LIBDIR}\\release\\python31_d\\*.*\" \"${TARGETDIR}\\${BLENDER_VERSION}\\python\\lib\\\" COMMAND if \"$(ConfigurationName)\" == \"RelWithDebInfo\" copy /Y \"${LIBDIR}\\python\\lib\\python31_d.dll\" \"${TARGETDIR}\\\" |