[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22739] branches/blender2.5/blender: [ #19232] (2.5) Correction of cmake for windows about audio (jack and openal)
Campbell Barton
ideasman42 at gmail.com
Mon Aug 24 12:07:49 CEST 2009
Revision: 22739
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22739
Author: campbellbarton
Date: 2009-08-24 12:07:49 +0200 (Mon, 24 Aug 2009)
Log Message:
-----------
[#19232] (2.5) Correction of cmake for windows about audio (jack and openal)
from Guillaume Lecocq (lguillaume)
[#19247] (2.5) useless WITH_OPENEXR redefinition
from Mauro Toffanin (equilibrium)
Modified Paths:
--------------
branches/blender2.5/blender/CMakeLists.txt
branches/blender2.5/blender/source/blender/imbuf/intern/openexr/openexr_api.cpp
branches/blender2.5/blender/source/creator/CMakeLists.txt
Modified: branches/blender2.5/blender/CMakeLists.txt
===================================================================
--- branches/blender2.5/blender/CMakeLists.txt 2009-08-24 09:17:09 UTC (rev 22738)
+++ branches/blender2.5/blender/CMakeLists.txt 2009-08-24 10:07:49 UTC (rev 22739)
@@ -251,8 +251,8 @@
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)
Modified: branches/blender2.5/blender/source/blender/imbuf/intern/openexr/openexr_api.cpp
===================================================================
--- branches/blender2.5/blender/source/blender/imbuf/intern/openexr/openexr_api.cpp 2009-08-24 09:17:09 UTC (rev 22738)
+++ branches/blender2.5/blender/source/blender/imbuf/intern/openexr/openexr_api.cpp 2009-08-24 10:07:49 UTC (rev 22739)
@@ -51,7 +51,6 @@
#include "IMB_imbuf.h"
#include "IMB_allocimbuf.h"
-#define WITH_OPENEXR
#include "openexr_multi.h"
}
Modified: branches/blender2.5/blender/source/creator/CMakeLists.txt
===================================================================
--- branches/blender2.5/blender/source/creator/CMakeLists.txt 2009-08-24 09:17:09 UTC (rev 22738)
+++ branches/blender2.5/blender/source/creator/CMakeLists.txt 2009-08-24 10:07:49 UTC (rev 22739)
@@ -261,6 +261,26 @@
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)
More information about the Bf-blender-cvs
mailing list