[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [24241] trunk/blender: Mac :

Damien Plisson damien.plisson at yahoo.fr
Mon Nov 2 15:03:13 CET 2009


Revision: 24241
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24241
Author:   damien78
Date:     2009-11-02 15:03:13 +0100 (Mon, 02 Nov 2009)

Log Message:
-----------
Mac :
- Updated CMake files for building with openCollada

Update of the 10.5 libs including openCollada is coming in next commit

Modified Paths:
--------------
    trunk/blender/CMakeLists.txt
    trunk/blender/source/blender/collada/CMakeLists.txt

Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt	2009-11-02 13:20:14 UTC (rev 24240)
+++ trunk/blender/CMakeLists.txt	2009-11-02 14:03:13 UTC (rev 24241)
@@ -91,7 +91,7 @@
 	MESSAGE("WARNING: WITH_PLAYER needs WITH_GAMEENGINE")
 ENDIF(NOT WITH_GAMEENGINE AND WITH_PLAYER)
 
-IF (WITH_OPENCOLLADA)
+IF (WITH_OPENCOLLADA AND NOT APPLE)
 SET(OPENCOLLADA /usr/local/opencollada CACHE FILEPATH "OpenCollada Directory")
 SET(OPENCOLLADA_LIBPATH ${OPENCOLLADA})
 SET(OPENCOLLADA_LIB OpenCollada)
@@ -101,9 +101,8 @@
 SET(EXPAT /usr CACHE FILEPATH "Expat Directory")
 SET(EXPAT_LIBPATH ${EXPAT}/lib)
 SET(EXPAT_LIB expat)
+ENDIF (WITH_OPENCOLLADA AND NOT APPLE)
 
-ENDIF (WITH_OPENCOLLADA)
-
 # For alternate Python locations the commandline can be used to override detected/default cache settings, e.g:
 # On Unix: 
 #   cmake -D PYTHON_LIB=/usr/local/lib/python2.3/config/libpython2.3.so -D PYTHON_INC=/usr/local/include/python2.3 -D PYTHON_BINARY=/usr/local/bin/python2.3 -G "Unix Makefiles" ../blender
@@ -517,12 +516,28 @@
 	SET(PLATFORM_CFLAGS "-pipe -fPIC -funsigned-char -fno-strict-aliasing")
 	SET(PLATFORM_LINKFLAGS "-fexceptions -framework CoreServices -framework Foundation -framework IOKit -framework AppKit -framework Carbon -framework AGL -framework AudioUnit -framework AudioToolbox -framework CoreAudio -framework QuickTime")
 	ENDIF (WITH_COCOA)
+
 	IF(WITH_OPENMP)
 		SET(LLIBS "${LLIBS} -lgomp ")
 		SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fopenmp ")
 		SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fopenmp ")
 	ENDIF(WITH_OPENMP)
 
+	IF (WITH_OPENCOLLADA)
+		SET(OPENCOLLADA ${LIBDIR}/opencollada)
+		SET(OPENCOLLADA_INC ${OPENCOLLADA}/include)
+		SET(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib)
+		SET(OPENCOLLADA_LIB "OpenCOLLADASaxFrameworkLoader -lOpenCOLLADAFramework -lOpenCOLLADABaseUtils -lOpenCOLLADAStreamWriter -lMathMLSolver -lGeneratedSaxParser -lUTF -lxml2" )
+		#pcre is bundled with openCollada
+		#SET(PCRE ${LIBDIR}/pcre)
+		#SET(PCRE_LIBPATH ${PCRE}/lib)
+		SET(PCRE_LIB pcre)
+		#native OSX libxml2 is used
+		#SET(EXPAT ${LIBDIR}/expat)
+		#SET(EXPAT_LIBPATH ${EXPAT}/lib)
+		#SET(EXPAT_LIB expat)
+	ENDIF (WITH_OPENCOLLADA)
+
 	SET(SDL ${LIBDIR}/sdl)
 	SET(SDL_INCLUDE_DIR ${SDL}/include)
 	SET(SDL_LIBRARY SDL)

Modified: trunk/blender/source/blender/collada/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/collada/CMakeLists.txt	2009-11-02 13:20:14 UTC (rev 24240)
+++ trunk/blender/source/blender/collada/CMakeLists.txt	2009-11-02 14:03:13 UTC (rev 24241)
@@ -26,6 +26,7 @@
 
 FILE(GLOB SRC *.cpp)
 
+IF(APPLE)
 SET(INC
   .
   ../blenlib
@@ -35,10 +36,29 @@
   ../makesrna
   ../editors/include
   ../../../intern/guardedalloc
+  ${OPENCOLLADA_INC}/COLLADAStreamWriter
+  ${OPENCOLLADA_INC}/COLLADABaseUtils
+  ${OPENCOLLADA_INC}/COLLADAFramework
+  ${OPENCOLLADA_INC}/COLLADASaxFrameworkLoader 
+)
+
+ELSE(APPLE)
+
+SET(INC
+  .
+  ../blenlib
+  ../blenkernel
+  ../windowmanager
+  ../makesdna
+  ../makesrna
+  ../editors/include
+  ../../../intern/guardedalloc
   ${OPENCOLLADA}/COLLADAStreamWriter/include
   ${OPENCOLLADA}/COLLADABaseUtils/include
   ${OPENCOLLADA}/COLLADAFramework/include
   ${OPENCOLLADA}/COLLADASaxFrameworkLoader/include 
 )
 
+ENDIF(APPLE)
+
 BLENDERLIB(bf_collada "${SRC}" "${INC}")





More information about the Bf-blender-cvs mailing list