Revision: 41665
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41665
Author: psy-fi
Date: 2011-11-08 16:03:28 +0000 (Tue, 08 Nov 2011)
Log Message:
-----------
*Correct syntax for static, since we invoke g++ as linker and we have to pass
it to ld.
*CMakefile: Update boost and OpenImageIO libraries for MinGW like in the cycles
branch
Modified Paths:
--------------
trunk/blender/CMakeLists.txt
Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt 2011-11-08 16:02:34 UTC (rev 41664)
+++ trunk/blender/CMakeLists.txt 2011-11-08 16:03:28 UTC (rev 41665)
@@ -843,7 +843,7 @@
else()
# keep GCC specific stuff here
if(CMAKE_COMPILER_IS_GNUCC)
- set(PLATFORM_LINKLIBS "-lshell32 -lshfolder -lgdi32
-lmsvcrt -lwinmm -lmingw32 -lm -lws2_32 -lz -lstdc++ -lole32 -luuid -lwsock32")
+ set(PLATFORM_LINKLIBS "-lshell32 -lshfolder -lgdi32
-lmsvcrt -lwinmm -lmingw32 -lm -lws2_32 -lz -lstdc++ -lole32 -luuid -lwsock32
-lpsapi")
set(PLATFORM_CFLAGS "-pipe -funsigned-char
-fno-strict-aliasing")
add_definitions(-D_LARGEFILE_SOURCE
-D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE)
@@ -940,28 +940,28 @@
endif()
if(WITH_BOOST)
- set(BOOST ${LIBDIR}/boost)
+ set(BOOST ${LIBDIR}/gcc/boost)
set(BOOST_INCLUDE_DIR ${BOOST}/include)
- set(BOOST_POSTFIX "vc90-mt-s-1_46_1")
- set(BOOST_DEBUG_POSTFIX "vc90-mt-sgd-1_46_1")
+ set(BOOST_POSTFIX "mgw45-mt-s-1_47")
+ set(BOOST_DEBUG_POSTFIX "mgw45-mt-sd-1_47")
set(BOOST_LIBRARIES
- optimized libboost_date_time-${BOOST_POSTFIX}
libboost_filesystem-${BOOST_POSTFIX}
- libboost_regex-${BOOST_POSTFIX}
libboost_system-${BOOST_POSTFIX} libboost_thread-${BOOST_POSTFIX}
- debug libboost_date_time-${BOOST_DEBUG_POSTFIX}
libboost_filesystem-${BOOST_DEBUG_POSTFIX}
- libboost_regex-${BOOST_DEBUG_POSTFIX}
libboost_system-${BOOST_DEBUG_POSTFIX} libboost_thread-${BOOST_DEBUG_POSTFIX})
+ optimized boost_date_time-${BOOST_POSTFIX}
boost_filesystem-${BOOST_POSTFIX}
+ boost_regex-${BOOST_POSTFIX}
boost_system-${BOOST_POSTFIX} boost_thread-${BOOST_POSTFIX}
+ debug boost_date_time-${BOOST_DEBUG_POSTFIX}
boost_filesystem-${BOOST_DEBUG_POSTFIX}
+ boost_regex-${BOOST_DEBUG_POSTFIX}
boost_system-${BOOST_DEBUG_POSTFIX} boost_thread-${BOOST_DEBUG_POSTFIX})
set(BOOST_LIBPATH ${BOOST}/lib)
- set(BOOST_DEFINITIONS "-DBOOST_ALL_NO_LIB")
+ set(BOOST_DEFINITIONS "-DBOOST_ALL_NO_LIB
-DBOOST_THREAD_USE_LIB ")
endif()
if(WITH_OPENIMAGEIO)
- set(OPENIMAGEIO ${LIBDIR}/openimageio)
+ set(OPENIMAGEIO ${LIBDIR}/gcc/openimageio)
set(OPENIMAGEIO_INCLUDE_DIRS ${OPENIMAGEIO}/include)
set(OPENIMAGEIO_LIBRARIES OpenImageIO)
set(OPENIMAGEIO_LIBPATH ${OPENIMAGEIO}/lib)
set(OPENIMAGEIO_DEFINITIONS)
endif()
- set(PLATFORM_LINKFLAGS "--stack,2097152")
+ set(PLATFORM_LINKFLAGS "-Xlinker --stack=2097152")
endif()
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
