Fix CMake build system for Windows
Add support for OPTION WITH_OPENCOLLADA for Windows
This commit is contained in:
parent
21385eb4ec
commit
9256408612
|
@ -91,18 +91,6 @@ IF(NOT WITH_GAMEENGINE AND WITH_PLAYER)
|
|||
MESSAGE("WARNING: WITH_PLAYER needs WITH_GAMEENGINE")
|
||||
ENDIF(NOT WITH_GAMEENGINE AND WITH_PLAYER)
|
||||
|
||||
IF (WITH_OPENCOLLADA AND NOT APPLE)
|
||||
SET(OPENCOLLADA /usr/local/opencollada CACHE FILEPATH "OpenCollada Directory")
|
||||
SET(OPENCOLLADA_LIBPATH ${OPENCOLLADA})
|
||||
SET(OPENCOLLADA_LIB OpenCollada)
|
||||
SET(PCRE /usr CACHE FILEPATH "PCRE Directory")
|
||||
SET(PCRE_LIBPATH ${PCRE}/lib)
|
||||
SET(PCRE_LIB pcre)
|
||||
SET(EXPAT /usr CACHE FILEPATH "Expat Directory")
|
||||
SET(EXPAT_LIBPATH ${EXPAT}/lib)
|
||||
SET(EXPAT_LIB expat)
|
||||
ENDIF (WITH_OPENCOLLADA AND NOT APPLE)
|
||||
|
||||
# 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
|
||||
|
@ -119,6 +107,8 @@ INCLUDE(CMake/macros.cmake)
|
|||
#Platform specifics
|
||||
|
||||
IF(UNIX AND NOT APPLE)
|
||||
|
||||
|
||||
IF(WITH_OPENAL)
|
||||
FIND_PACKAGE(OpenAL)
|
||||
IF(OPENAL_FOUND)
|
||||
|
@ -217,6 +207,20 @@ IF(UNIX AND NOT APPLE)
|
|||
|
||||
FIND_PACKAGE(ZLIB REQUIRED)
|
||||
|
||||
IF (WITH_OPENCOLLADA)
|
||||
SET(OPENCOLLADA /usr/local/opencollada CACHE FILEPATH "OpenCollada Directory")
|
||||
SET(OPENCOLLADA_LIBPATH ${OPENCOLLADA})
|
||||
SET(OPENCOLLADA_LIB OpenCollada)
|
||||
SET(OPENCOLLADA_INC ${OPENCOLLADA})
|
||||
SET(PCRE /usr CACHE FILEPATH "PCRE Directory")
|
||||
SET(PCRE_LIBPATH ${PCRE}/lib)
|
||||
SET(PCRE_LIB pcre)
|
||||
SET(EXPAT /usr CACHE FILEPATH "Expat Directory")
|
||||
SET(EXPAT_LIBPATH ${EXPAT}/lib)
|
||||
SET(EXPAT_LIB expat)
|
||||
ENDIF (WITH_OPENCOLLADA)
|
||||
|
||||
|
||||
# Could use ${X11_Xinput_LIB} ${X11_X11_LIB} too
|
||||
SET(LLIBS "-lXi -lutil -lc -lm -lpthread -lstdc++ -lX11")
|
||||
|
||||
|
@ -400,6 +404,16 @@ IF(WIN32)
|
|||
|
||||
SET(WINTAB_INC ${LIBDIR}/wintab/include)
|
||||
|
||||
SET(OPENCOLLADA ${LIBDIR}/opencollada)
|
||||
SET(OPENCOLLADA_INC ${OPENCOLLADA}/include)
|
||||
SET(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib)
|
||||
SET(OPENCOLLADA_LIB OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils OpenCOLLADAStreamWriter MathMLSolver GeneratedSaxParser UTF xml2 )
|
||||
#pcre is bundled with openCollada
|
||||
#SET(PCRE ${LIBDIR}/pcre)
|
||||
#SET(PCRE_LIBPATH ${PCRE}/lib)
|
||||
SET(PCRE_LIB pcre)
|
||||
|
||||
|
||||
IF(CMAKE_CL_64)
|
||||
SET(PLATFORM_LINKFLAGS "/MACHINE:X64 /NODEFAULTLIB:libc.lib;MSVCRT.lib ")
|
||||
ELSE(CMAKE_CL_64)
|
||||
|
@ -532,10 +546,10 @@ IF(APPLE)
|
|||
#SET(PCRE ${LIBDIR}/pcre)
|
||||
#SET(PCRE_LIBPATH ${PCRE}/lib)
|
||||
SET(PCRE_LIB pcre)
|
||||
#native OSX libxml2 is used
|
||||
#libxml2 is used
|
||||
#SET(EXPAT ${LIBDIR}/expat)
|
||||
#SET(EXPAT_LIBPATH ${EXPAT}/lib)
|
||||
#SET(EXPAT_LIB expat)
|
||||
SET(EXPAT_LIB)
|
||||
ENDIF (WITH_OPENCOLLADA)
|
||||
|
||||
SET(SDL ${LIBDIR}/sdl)
|
||||
|
|
|
@ -53,10 +53,10 @@ SET(INC
|
|||
../makesrna
|
||||
../editors/include
|
||||
../../../intern/guardedalloc
|
||||
${OPENCOLLADA}/COLLADAStreamWriter/include
|
||||
${OPENCOLLADA}/COLLADABaseUtils/include
|
||||
${OPENCOLLADA}/COLLADAFramework/include
|
||||
${OPENCOLLADA}/COLLADASaxFrameworkLoader/include
|
||||
${OPENCOLLADA_INC}/COLLADAStreamWriter/include
|
||||
${OPENCOLLADA_INC}/COLLADABaseUtils/include
|
||||
${OPENCOLLADA_INC}/COLLADAFramework/include
|
||||
${OPENCOLLADA_INC}/COLLADASaxFrameworkLoader/include
|
||||
)
|
||||
|
||||
ENDIF(APPLE)
|
||||
|
|
|
@ -48,10 +48,10 @@ IF(WITH_QUICKTIME)
|
|||
ENDIF(WITH_QUICKTIME)
|
||||
|
||||
IF(APPLE)
|
||||
IF((CMAKE_OSX_ARCHITECTURES MATCHES "i386") OR (CMAKE_OSX_ARCHITECTURES MATCHES "x86_64"))
|
||||
IF(CMAKE_OSX_ARCHITECTURES MATCHES "i386" OR CMAKE_OSX_ARCHITECTURES MATCHES "x86_64")
|
||||
SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -mfpmath=sse")
|
||||
SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -mfpmath=sse")
|
||||
ENDIF((CMAKE_OSX_ARCHITECTURES MATCHES "i386") OR (CMAKE_OSX_ARCHITECTURES MATCHES "x86_64"))
|
||||
ENDIF(CMAKE_OSX_ARCHITECTURES MATCHES "i386" OR CMAKE_OSX_ARCHITECTURES MATCHES "x86_64")
|
||||
ENDIF(APPLE)
|
||||
|
||||
#TODO
|
||||
|
|
Loading…
Reference in New Issue