diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-09-16 11:26:06 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-09-16 11:26:06 +0400 |
| commit | 19704f74b1ddc62b6c34aafb08e905a30ed60328 (patch) | |
| tree | 5e057731ec85d9d20b2e840bd2ace4aed9b0a0ac /CMakeLists.txt | |
| parent | f788c68b9c6ea0d3377ac65b80577cb66e8659d9 (diff) | |
recent fixes for mingw + cmake broke msvc
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 7d18fb11d48..4966c1d0bf5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -364,15 +364,6 @@ IF(WIN32) 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) SET(OPENAL ${LIBDIR}/openal) SET(OPENAL_INCLUDE_DIR ${OPENAL}/include) @@ -529,6 +520,15 @@ IF(WIN32) SET(JACK_LIBPATH ${JACK}/lib) 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 IF(CMAKE_CL_64) SET(PLATFORM_LINKFLAGS "/MACHINE:X64 /NODEFAULTLIB:libc.lib;MSVCRT.lib ") @@ -631,6 +631,15 @@ IF(WIN32) SET(WITH_JACK OFF) 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(WIN32) |