weight paint without shading when in wire view. use stipple wire to help show where...

[blender.git] / CMake / macros.cmake

diff --git a/CMake/macros.cmake b/CMake/macros.cmake
index bc8892e4b999c653df0340e6b5254180ad0be047..258cbdf57b688a6ea0563084196ef4e76567688f 100644 (file)
--- a/CMake/macros.cmake
+++ b/CMake/macros.cmake
@@ -42,14 +42,45 @@ MACRO(SETUP_LIBDIRS)
   if(COMMAND cmake_policy)
     CMAKE_POLICY(SET CMP0003 NEW)
   endif(COMMAND cmake_policy)
-  LINK_DIRECTORIES(${PYTHON_LIBPATH} ${SDL_LIBPATH} ${JPEG_LIBPATH} ${PNG_LIBPATH} ${ZLIB_LIBPATH} ${ICONV_LIBPATH} ${OPENEXR_LIBPATH} ${QUICKTIME_LIBPATH} ${FFMPEG_LIBPATH})
-  LINK_DIRECTORIES(${FREETYPE_LIBPATH})
+  
+  LINK_DIRECTORIES(${JPEG_LIBPATH} ${PNG_LIBPATH} ${ZLIB_LIBPATH} ${FREETYPE_LIBPATH} ${LIBSAMPLERATE_LIBPATH})
+  
+  IF(WITH_PYTHON)
+    LINK_DIRECTORIES(${PYTHON_LIBPATH})
+  ENDIF(WITH_PYTHON)
   IF(WITH_INTERNATIONAL)
+    LINK_DIRECTORIES(${ICONV_LIBPATH})
     LINK_DIRECTORIES(${GETTEXT_LIBPATH})
   ENDIF(WITH_INTERNATIONAL)
+  IF(WITH_SDL)
+    LINK_DIRECTORIES(${SDL_LIBPATH})
+  ENDIF(WITH_SDL)
+  IF(WITH_FFMPEG)
+    LINK_DIRECTORIES(${FFMPEG_LIBPATH})
+  ENDIF(WITH_FFMPEG)
+  IF(WITH_OPENEXR)
+    LINK_DIRECTORIES(${OPENEXR_LIBPATH})
+  ENDIF(WITH_OPENEXR)
+  IF(WITH_QUICKTIME)
+    LINK_DIRECTORIES(${QUICKTIME_LIBPATH})
+  ENDIF(WITH_QUICKTIME)
   IF(WITH_OPENAL)
     LINK_DIRECTORIES(${OPENAL_LIBPATH})
   ENDIF(WITH_OPENAL)
+  IF(WITH_JACK)
+    LINK_DIRECTORIES(${JACK_LIBPATH})
+  ENDIF(WITH_JACK)
+  IF(WITH_SNDFILE)
+    LINK_DIRECTORIES(${SNDFILE_LIBPATH})
+  ENDIF(WITH_SNDFILE)
+  IF(WITH_FFTW3)
+    LINK_DIRECTORIES(${FFTW3_LIBPATH})
+  ENDIF(WITH_FFTW3)
+  IF(WITH_OPENCOLLADA)
+    LINK_DIRECTORIES(${OPENCOLLADA_LIBPATH})
+    LINK_DIRECTORIES(${PCRE_LIBPATH})
+    LINK_DIRECTORIES(${EXPAT_LIBPATH})
+  ENDIF(WITH_OPENCOLLADA)
 
   IF(WIN32)
     LINK_DIRECTORIES(${PTHREADS_LIBPATH})
@@ -59,51 +90,47 @@ ENDMACRO(SETUP_LIBDIRS)
 MACRO(SETUP_LIBLINKS
   target)
   SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${PLATFORM_LINKFLAGS} ")
-  #TARGET_LINK_LIBRARIES(${target} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${PYTHON_LIB} ${PYTHON_LINKFLAGS} ${JPEG_LIB} ${PNG_LIB} ${ZLIB_LIB} ${SDL_LIB} ${LLIBS})
 
-  TARGET_LINK_LIBRARIES(${target} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${PYTHON_LINKFLAGS} ${JPEG_LIB} ${PNG_LIB} ${ZLIB_LIB} ${SDL_LIB} ${LLIBS})
+  TARGET_LINK_LIBRARIES(${target} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${JPEG_LIBRARY} ${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(WIN32)
-
-            TARGET_LINK_LIBRARIES(${target} debug ${PYTHON_LIB}_d)
-
-            TARGET_LINK_LIBRARIES(${target} optimized ${PYTHON_LIB})
-
-  ELSE(WIN32)
-
-            TARGET_LINK_LIBRARIES(${target} ${PYTHON_LIB})
-
-  ENDIF(WIN32)
-
-
-  TARGET_LINK_LIBRARIES(${target} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${PYTHON_LINKFLAGS} ${JPEG_LIB} ${PNG_LIB} ${ZLIB_LIB} ${SDL_LIB} ${LLIBS})
-  TARGET_LINK_LIBRARIES(${target} ${FREETYPE_LIB})
-
-  # since we are using the local libs for python when compiling msvc projects, we need to add _d when compiling debug versions
-
-  IF(WIN32)
-
-            TARGET_LINK_LIBRARIES(${target} debug ${PYTHON_LIB}_d)
-
-            TARGET_LINK_LIBRARIES(${target} optimized ${PYTHON_LIB})
-
-            ELSE(WIN32)
-
-            TARGET_LINK_LIBRARIES(${target} ${PYTHON_LIB})
-
-  ENDIF(WIN32)
+  IF(WITH_PYTHON)
+    TARGET_LINK_LIBRARIES(${target} ${PYTHON_LINKFLAGS})
+  
+    IF(WIN32)
+      TARGET_LINK_LIBRARIES(${target} debug ${PYTHON_LIB}_d)
+      TARGET_LINK_LIBRARIES(${target} optimized ${PYTHON_LIB})
+    ELSE(WIN32)
+      TARGET_LINK_LIBRARIES(${target} ${PYTHON_LIB})
+    ENDIF(WIN32)
+  ENDIF(WITH_PYTHON)
+  
+  TARGET_LINK_LIBRARIES(${target} ${OPENGL_glu_LIBRARY} ${JPEG_LIB} ${PNG_LIB} ${ZLIB_LIB})
+  TARGET_LINK_LIBRARIES(${target} ${FREETYPE_LIBRARY} ${LIBSAMPLERATE_LIB})
 
   IF(WITH_INTERNATIONAL)
     TARGET_LINK_LIBRARIES(${target} ${GETTEXT_LIB})
+       
+    IF(WIN32)
+      TARGET_LINK_LIBRARIES(${target} ${ICONV_LIB})
+    ENDIF(WIN32)
   ENDIF(WITH_INTERNATIONAL)
+  
   IF(WITH_OPENAL)
-    TARGET_LINK_LIBRARIES(${target} ${OPENAL_LIB})
+    TARGET_LINK_LIBRARIES(${target} ${OPENAL_LIBRARY})
   ENDIF(WITH_OPENAL)
-  IF(WIN32)
-    TARGET_LINK_LIBRARIES(${target} ${ICONV_LIB})
-  ENDIF(WIN32)
+  IF(WITH_FFTW3)  
+    TARGET_LINK_LIBRARIES(${target} ${FFTW3_LIB})
+  ENDIF(WITH_FFTW3)
+  IF(WITH_JACK)
+    TARGET_LINK_LIBRARIES(${target} ${JACK_LIB})
+  ENDIF(WITH_JACK)
+  IF(WITH_SNDFILE)
+    TARGET_LINK_LIBRARIES(${target} ${SNDFILE_LIB})
+  ENDIF(WITH_SNDFILE)
+  IF(WITH_SDL)
+    TARGET_LINK_LIBRARIES(${target} ${SDL_LIBRARY})
+  ENDIF(WITH_SDL)
   IF(WITH_QUICKTIME)
     TARGET_LINK_LIBRARIES(${target} ${QUICKTIME_LIB})
   ENDIF(WITH_QUICKTIME)
@@ -113,7 +140,13 @@ MACRO(SETUP_LIBLINKS
   IF(WITH_FFMPEG)
     TARGET_LINK_LIBRARIES(${target} ${FFMPEG_LIB})
   ENDIF(WITH_FFMPEG)
+  IF(WITH_OPENCOLLADA)
+    TARGET_LINK_LIBRARIES(${target} ${OPENCOLLADA_LIB})
+    TARGET_LINK_LIBRARIES(${target} ${PCRE_LIB})
+    TARGET_LINK_LIBRARIES(${target} ${EXPAT_LIB})
+  ENDIF(WITH_OPENCOLLADA)
   IF(WIN32)
     TARGET_LINK_LIBRARIES(${target} ${PTHREADS_LIB})
   ENDIF(WIN32)
 ENDMACRO(SETUP_LIBLINKS)
+