[#19232] (2.5) Correction of cmake for windows about audio (jack and openal)
authorCampbell Barton <ideasman42@gmail.com>
Mon, 24 Aug 2009 10:07:49 +0000 (10:07 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 24 Aug 2009 10:07:49 +0000 (10:07 +0000)
from Guillaume Lecocq (lguillaume)

[#19247] (2.5) useless WITH_OPENEXR redefinition
from Mauro Toffanin (equilibrium)

CMakeLists.txt
source/blender/imbuf/intern/openexr/openexr_api.cpp
source/creator/CMakeLists.txt

index 8ef4296e2667c10d44c9bcb0f379853c8459c6c8..d1e18723f5db4e34741a2f9c06b4ef39048a26b6 100644 (file)
@@ -251,8 +251,8 @@ IF(WIN32)
 
   IF(WITH_JACK)
     SET(JACK ${LIBDIR}/jack)
-    SET(JACK_INC ${JACK}/include/jack)
-    SET(JACK_LIB jack)
+    SET(JACK_INC ${JACK}/include/jack ${JACK}/include)
+    SET(JACK_LIB libjack)
     SET(JACK_LIBPATH ${JACK}/lib)
   ENDIF(WITH_JACK)
 
index 32d97d79bd79680d6155be57042372f3fabffa1f..a780727b1a2dc3e8288fdbfe520d37436d187ce1 100644 (file)
@@ -51,7 +51,6 @@ _CRTIMP void __cdecl _invalid_parameter_noinfo(void)
 #include "IMB_imbuf.h"
 #include "IMB_allocimbuf.h"
 
-#define WITH_OPENEXR
 #include "openexr_multi.h"
 }
 
index 3b95c409b30d1a449e07cf3ea8376aa2b1a1547f..24b70c5664a4fdc0fe6c52d29ce15040f77a8b47 100644 (file)
@@ -261,6 +261,26 @@ IF(WITH_INSTALL)
         COMMAND copy /Y \"${WIN_LIBDIR}\\ffmpeg\\lib\\xvidcore.dll\" \"${TARGETDIR}\\\"
       )
     ENDIF(WITH_FFMPEG)
+
+    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)