Undo revision 23130 which was a merge with 2.5, a messy one because I did something...
[blender.git] / source / creator / CMakeLists.txt
index f563dec..a9368e0 100644 (file)
@@ -139,7 +139,7 @@ IF(WITH_INSTALL)
         COMMAND rm -rf ${TARGETDIR}/.blender/python/lib/python${PYTHON_VERSION}/site-packages
         COMMAND mkdir ${TARGETDIR}/.blender/python/lib/python${PYTHON_VERSION}/site-packages    # python needs it.
 
-        COMMAND rm -f ${TARGETDIR}/.blender/python/lib/python${PYTHON_VERSION}/lib-dynload/_tkinter.so
+        COMMAND rm ${TARGETDIR}/.blender/python/lib/python${PYTHON_VERSION}/lib-dynload/_tkinter.so
         COMMAND find ${TARGETDIR}/.blender/python/lib/python${PYTHON_VERSION} -name "test" -prune -exec rm -rf {} "\;"
         COMMAND find ${TARGETDIR}/.blender/python/lib/python${PYTHON_VERSION} -name "*.py?" -exec rm -rf {} "\;"
         COMMAND find ${TARGETDIR}/.blender/python/lib/python${PYTHON_VERSION} -name "*.so"-exec strip -s {} "\;"
@@ -261,34 +261,6 @@ IF(WITH_INSTALL)
         COMMAND copy /Y \"${WIN_LIBDIR}\\ffmpeg\\lib\\xvidcore.dll\" \"${TARGETDIR}\\\"
       )
     ENDIF(WITH_FFMPEG)
-
-    IF(WITH_SNDFILE)
-      ADD_CUSTOM_COMMAND(TARGET blender
-        POST_BUILD
-        MAIN_DEPENDENCY blender
-        COMMAND copy /Y \"${WIN_LIBDIR}\\sndfile\\lib\\libsndfile-1.dll\" \"${TARGETDIR}\\\"
-      )
-    ENDIF(WITH_SNDFILE)
-
-    IF(WITH_JACK)
-      ADD_CUSTOM_COMMAND(TARGET blender
-        POST_BUILD
-        MAIN_DEPENDENCY blender
-        COMMAND copy /Y \"${WIN_LIBDIR}\\jack\\lib\\libjack.dll\" \"${TARGETDIR}\\\"
-      )
-    ENDIF(WITH_JACK)
-
-    IF(WITH_OPENAL)
-      ADD_CUSTOM_COMMAND(TARGET blender
-        POST_BUILD
-        MAIN_DEPENDENCY blender
-        COMMAND copy /Y \"${WIN_LIBDIR}\\openal\\lib\\OpenAL32.dll\" \"${TARGETDIR}\\\"
-        COMMAND copy /Y \"${WIN_LIBDIR}\\openal\\lib\\wrap_oal.dll\" \"${TARGETDIR}\\\"
-
-      )
-    ENDIF(WITH_OPENAL)
-
-
   ENDIF(WIN32)
 ENDIF(WITH_INSTALL)
 
@@ -347,8 +319,6 @@ IF(UNIX)
     bf_dummy 
     bf_bullet 
     bf_smoke
-    bf_minilzo
-    bf_lzma
     bf_common 
     bf_ketsji 
     bf_logic 
@@ -367,6 +337,7 @@ IF(UNIX)
     bf_moto 
     bf_python
     bf_gen_python
+    bf_quicktime
     extern_binreloc
     extern_glew
     extern_libopenjpeg
@@ -381,11 +352,6 @@ IF(UNIX)
     SET(BLENDER_SORTED_LIBS ${BLENDER_SORTED_LIBS} bf_guardedalloc_cpp)
   ENDIF(WITH_CXX_GUARDEDALLOC)
 
-  IF(WITH_QUICKTIME)
-    SET(BLENDER_SORTED_LIBS ${BLENDER_SORTED_LIBS} bf_quicktime)
-  ENDIF(WITH_QUICKTIME)
-
-
   FOREACH(SORTLIB ${BLENDER_SORTED_LIBS})
     SET(REMLIB ${SORTLIB})
     FOREACH(SEARCHLIB ${BLENDER_LINK_LIBS})