Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

recent fixes for mingw + cmake broke msvc

Browse Source
This commit is contained in:
Campbell Barton
2010-09-16 07:26:06 +00:00
parent f788c68b9c
commit 19704f74b1
1 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
CMakeLists.txt
View File

@@ -364,15 +364,6 @@ IF(WIN32)
SET(WINTAB_INC ${LIBDIR}/wintab/include) SET(WINTAB_INC ${LIBDIR}/wintab/include)
IF(WITH_PYTHON)
SET(PYTHON ${LIBDIR}/python)
SET(PYTHON_VERSION 3.1)
SET(PYTHON_INC "${PYTHON}/include/python${PYTHON_VERSION}")
# SET(PYTHON_BINARY python) # not used yet
SET(PYTHON_LIB python31mw)
SET(PYTHON_LIBPATH ${PYTHON}/lib)
ENDIF(WITH_PYTHON)
IF(WITH_OPENAL) IF(WITH_OPENAL)
SET(OPENAL ${LIBDIR}/openal) SET(OPENAL ${LIBDIR}/openal)
SET(OPENAL_INCLUDE_DIR ${OPENAL}/include) SET(OPENAL_INCLUDE_DIR ${OPENAL}/include)
@@ -529,6 +520,15 @@ IF(WIN32)
SET(JACK_LIBPATH ${JACK}/lib) SET(JACK_LIBPATH ${JACK}/lib)
ENDIF(WITH_JACK) ENDIF(WITH_JACK)
IF(WITH_PYTHON)
SET(PYTHON ${LIBDIR}/python)
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_LIBPATH ${PYTHON}/lib)
ENDIF(WITH_PYTHON)
# MSVC only, Mingw doesnt need # MSVC only, Mingw doesnt need
IF(CMAKE_CL_64) IF(CMAKE_CL_64)
SET(PLATFORM_LINKFLAGS "/MACHINE:X64 /NODEFAULTLIB:libc.lib;MSVCRT.lib ") SET(PLATFORM_LINKFLAGS "/MACHINE:X64 /NODEFAULTLIB:libc.lib;MSVCRT.lib ")
@@ -631,6 +631,15 @@ IF(WIN32)
SET(WITH_JACK OFF) SET(WITH_JACK OFF)
ENDIF(WITH_JACK) ENDIF(WITH_JACK)
IF(WITH_PYTHON)
SET(PYTHON ${LIBDIR}/python)
SET(PYTHON_VERSION 3.1)
SET(PYTHON_INC "${PYTHON}/include/python${PYTHON_VERSION}")
# SET(PYTHON_BINARY python) # not used yet
SET(PYTHON_LIB python31mw)
SET(PYTHON_LIBPATH ${PYTHON}/lib)
ENDIF(WITH_PYTHON)
ENDIF(MSVC) ENDIF(MSVC)
ENDIF(WIN32) ENDIF(WIN32)