Revision: 30216
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30216
Author: campbellbarton
Date: 2010-07-12 11:55:41 +0200 (Mon, 12 Jul 2010)
Log Message:
-----------
[#22817] Beta patch for cmake-MinGW compilation no 2
ommit FORCE CFlags, else users cant change their cflags.
Modified Paths:
--------------
trunk/blender/CMakeLists.txt
Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt 2010-07-12 09:46:02 UTC (rev 30215)
+++ trunk/blender/CMakeLists.txt 2010-07-12 09:55:41 UTC (rev 30216)
@@ -485,7 +485,7 @@
SET(PCRE_LIB pcre)
ENDIF(WITH_OPENCOLLADA)
- # TODO: IF(WITH_LCMS)
+ # TODO: IF(WITH_LCMS)
IF(WITH_FFMPEG)
SET(FFMPEG ${LIBDIR}/ffmpeg)
@@ -534,7 +534,7 @@
ELSE(MSVC) # MINGW
SET(LLIBS "-lshell32 -lshfolder -lgdi32 -lmsvcrt -lwinmm
-lmingw32 -lm -lws2_32 -lz -lstdc++ -lole32 -luuid")
- SET(CMAKE_CXX_FLAGS "-pipe -funsigned-char
-fno-strict-aliasing -mwindows" CACHE STRING "Mingw C++ flags ")
+ SET(CMAKE_CXX_FLAGS "-pipe -funsigned-char
-fno-strict-aliasing" CACHE STRING "Mingw C++ flags ")
SET(CMAKE_C_FLAGS "-pipe -funsigned-char
-fno-strict-aliasing" CACHE STRING "Mingw C flags ")
SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -g" CACHE STRING "Mingw
debug C++ flags ")
@@ -561,7 +561,7 @@
SET(GETTEXT_LIB intl)
ENDIF(WITH_INTERNATIONAL)
- SET(JPEG_LIBRARY jpeg)
+ SET(JPEG_LIBRARY libjpeg)
SET(PNG_LIBRARIES png)
SET(ZLIB ${LIBDIR}/zlib)
@@ -607,7 +607,7 @@
IF(WITH_OPENEXR)
SET(OPENEXR ${LIBDIR}/gcc/openexr)
SET(OPENEXR_INC ${OPENEXR}/include
${OPENEXR}/include/OpenEXR)
- SET(OPENEXR_LIB Half IlmImf Iex)
+ SET(OPENEXR_LIB Half IlmImf Imath IlmThread)
SET(OPENEXR_LIBPATH ${OPENEXR}/lib)
ENDIF(WITH_OPENEXR)
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
