fix for building with mingw/cmake

diff --git a/intern/ghost/CMakeLists.txt b/intern/ghost/CMakeLists.txt
index 8319772adebccf9965988594e3e5464204627f5f..845e38cbb2ef55790a5cd14f47dd820597a3795f 100644 (file)
--- 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")
 ELSEIF(WIN32)
        IF(MSVC)
                SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /WX")

-               LIST(APPEND INC ${WINTAB_INC})

        ENDIF(MSVC)
 
        ENDIF(MSVC)
 

+       LIST(APPEND INC ${WINTAB_INC})
+

        LIST(APPEND SRC
                ./intern/GHOST_DisplayManagerWin32.cpp
                ./intern/GHOST_SystemWin32.cpp
        LIST(APPEND SRC
                ./intern/GHOST_DisplayManagerWin32.cpp
                ./intern/GHOST_SystemWin32.cpp

diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index ea338cf3d6b9a8c1488a5863678f3926de5fc785..e039d67515e34ebba9b170761d80a5ecd4e3fc05 100644 (file)
--- 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\"
                                        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}\\\"
                                        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}\\\"