[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30335] trunk/blender: partial fix [#22846 ] GCC 4.4.1 support in Windows

Campbell Barton ideasman42 at gmail.com
Wed Jul 14 20:22:39 CEST 2010


Revision: 30335
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30335
Author:   campbellbarton
Date:     2010-07-14 20:22:39 +0200 (Wed, 14 Jul 2010)

Log Message:
-----------
partial fix [#22846] GCC 4.4.1 support in Windows

Still getting error:
 Warning: .drectve `/DEFAULTLIB:"LIBCMT" /DEFAULTLIB:"OLDNAMES" ' unrecognized

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

Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt	2010-07-14 18:19:34 UTC (rev 30334)
+++ trunk/blender/CMakeLists.txt	2010-07-14 18:22:39 UTC (rev 30335)
@@ -628,6 +628,12 @@
 			SET(WITH_JACK OFF)
 		ENDIF(WITH_JACK)
 
+		IF(WITH_RAYOPTIMIZATION AND SUPPORT_SSE_BUILD)
+			SET(PLATFORM_CFLAGS " -msse -msse2 ${PLATFORM_CFLAGS}")
+			ADD_DEFINITIONS(-D__SSE__)
+			ADD_DEFINITIONS(-D__MMX__)
+		ENDIF(WITH_RAYOPTIMIZATION AND SUPPORT_SSE_BUILD)
+
 	ENDIF(MSVC)
 
 ENDIF(WIN32)

Modified: trunk/blender/source/blender/windowmanager/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/windowmanager/CMakeLists.txt	2010-07-14 18:19:34 UTC (rev 30334)
+++ trunk/blender/source/blender/windowmanager/CMakeLists.txt	2010-07-14 18:22:39 UTC (rev 30335)
@@ -49,10 +49,6 @@
 	ADD_DEFINITIONS(-DINTERNATIONAL)
 ENDIF(WITH_INTERNATIONAL)
 
-IF(WITH_OPENEXR)
-	ADD_DEFINITIONS(-DWITH_OPENEXR)
-ENDIF(WITH_OPENEXR)
-
 IF(WITH_OPENCOLLADA)
 	ADD_DEFINITIONS(-DWITH_COLLADA)
 ENDIF(WITH_OPENCOLLADA)





More information about the Bf-blender-cvs mailing list