[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39909] branches/cycles: Compile fixes for MinGW, checked with basic initial setup, no CUDA, gcc 4. 5.2.

[Antony Riakiotakis]

Revision: 39909
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39909
Author:   psy-fi
Date:     2011-09-04 15:39:09 +0000 (Sun, 04 Sep 2011)
Log Message:
-----------
Compile fixes for MinGW, checked with basic initial setup, no CUDA, gcc 4.5.2.
OpenImageIO still gives link-time errors, will try to make a lib for MinGW, see if it is fixed.

Modified Paths:
--------------
    branches/cycles/CMakeLists.txt
    branches/cycles/intern/cycles/CMakeLists.txt
    branches/cycles/intern/cycles/util/util_math.h
    branches/cycles/intern/cycles/util/util_system.cpp

Modified: branches/cycles/CMakeLists.txt
===================================================================
--- branches/cycles/CMakeLists.txt	2011-09-04 14:59:20 UTC (rev 39908)
+++ branches/cycles/CMakeLists.txt	2011-09-04 15:39:09 UTC (rev 39909)
@@ -975,6 +975,28 @@
 			set(PYTHON_LIBRARIES  "${PYTHON_LIBRARY}")
 		endif()
 
+		if(WITH_BOOST)
+			set(BOOST ${LIBDIR}/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_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})
+			set(BOOST_LIBPATH ${BOOST}/lib)
+			set(BOOST_DEFINITIONS "-DBOOST_ALL_NO_LIB")
+		endif()
+			
+		if(WITH_OPENIMAGEIO)
+			set(OPENIMAGEIO ${LIBDIR}/openimageio)
+			set(OPENIMAGEIO_INCLUDE_DIR ${OPENIMAGEIO}/include)
+			set(OPENIMAGEIO_LIBRARY OpenImageIO)
+			set(OPENIMAGEIO_LIBPATH ${OPENIMAGEIO}/lib)
+			set(OPENIMAGEIO_DEFINITIONS)
+		endif()
+
 		set(PLATFORM_LINKFLAGS "--stack,2097152")
 
 	endif()

Modified: branches/cycles/intern/cycles/CMakeLists.txt
===================================================================
--- branches/cycles/intern/cycles/CMakeLists.txt	2011-09-04 14:59:20 UTC (rev 39908)
+++ branches/cycles/intern/cycles/CMakeLists.txt	2011-09-04 15:39:09 UTC (rev 39909)
@@ -16,8 +16,13 @@
 endif(APPLE)
 
 if(WIN32)
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Ox /Ot /arch:SSE2 -D_CRT_SECURE_NO_WARNINGS /EHsc /fp:fast")
-	set(RTTI_DISABLE_FLAGS "/GR- -DBOOST_NO_RTTI -DBOOST_NO_TYPEID")
+	if(MSVC)
+		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Ox /Ot /arch:SSE2 -D_CRT_SECURE_NO_WARNINGS /EHsc /fp:fast")
+		set(RTTI_DISABLE_FLAGS "/GR- -DBOOST_NO_RTTI -DBOOST_NO_TYPEID")
+	elseif(CMAKE_COMPILER_IS_GNUCC)
+		set(CMAKE_CXX_FLAGS "${GCC_WARNING_FLAGS} ${GCC_OPTIM_FLAGS}")
+		set(RTTI_DISABLE_FLAGS "-fno-rtti -DBOOST_NO_RTTI -DBOOST_NO_TYPEID")
+	endif()
 endif(WIN32)
 
 if(UNIX AND NOT APPLE)

Modified: branches/cycles/intern/cycles/util/util_math.h
===================================================================
--- branches/cycles/intern/cycles/util/util_math.h	2011-09-04 14:59:20 UTC (rev 39908)
+++ branches/cycles/intern/cycles/util/util_math.h	2011-09-04 15:39:09 UTC (rev 39909)
@@ -60,8 +60,10 @@
 
 #ifndef __KERNEL_GPU__
 
+#if(!defined(FREE_WINDOWS))
 #define copysignf(x, y) ((float)_copysign(x, y))
 #define hypotf(x, y) _hypotf(x, y)
+#endif
 
 #endif
 

Modified: branches/cycles/intern/cycles/util/util_system.cpp
===================================================================
--- branches/cycles/intern/cycles/util/util_system.cpp	2011-09-04 14:59:20 UTC (rev 39908)
+++ branches/cycles/intern/cycles/util/util_system.cpp	2011-09-04 15:39:09 UTC (rev 39909)
@@ -20,7 +20,9 @@
 #include "util_types.h"
 
 #ifdef _WIN32
+#if(!defined(FREE_WINDOWS))
 #include <intrin.h>
+#endif
 #include <windows.h>
 #elif defined(__APPLE__)
 #include <sys/sysctl.h>
@@ -57,7 +59,7 @@
 	return count;
 }
 
-#ifndef _WIN32
+#if !defined(_WIN32) || defined(FREE_WINDOWS)
 static void __cpuid(int data[4], int selector)
 {
 #ifdef __x86_64__