diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-03-24 03:14:49 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-03-24 03:14:49 +0300 |
| commit | c210b3991a074f27af80178c85d0658c4041480b (patch) | |
| tree | 91f7029e54325c125411896aba150caa7f78be05 /build_files | |
| parent | 261f74115daf8d1622c60a85ec1e0f3faef641fc (diff) | |
support for blender as a module on win32.
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/cmake/macros.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake index 2297cac8bb9..073147266bb 100644 --- a/build_files/cmake/macros.cmake +++ b/build_files/cmake/macros.cmake @@ -66,7 +66,7 @@ macro(SETUP_LIBDIRS) link_directories(${JPEG_LIBPATH} ${PNG_LIBPATH} ${ZLIB_LIBPATH} ${FREETYPE_LIBPATH}) - if(WITH_PYTHON AND NOT WITH_PYTHON_MODULE) + if(WITH_PYTHON) # AND NOT WITH_PYTHON_MODULE # WIN32 needs link_directories(${PYTHON_LIBPATH}) endif() if(WITH_INTERNATIONAL) @@ -127,7 +127,7 @@ macro(setup_liblinks target_link_libraries(${target} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${JPEG_LIBRARIES} ${PNG_LIBRARIES} ${ZLIB_LIBRARIES} ${LLIBS}) # since we are using the local libs for python when compiling msvc projects, we need to add _d when compiling debug versions - if(WITH_PYTHON AND NOT WITH_PYTHON_MODULE) + if(WITH_PYTHON) # AND NOT WITH_PYTHON_MODULE # WIN32 needs target_link_libraries(${target} ${PYTHON_LINKFLAGS}) if(WIN32 AND NOT UNIX) |