Revert changes that disable features on MinGW.
authorAntony Riakiotakis <kalast@gmail.com>
Thu, 12 Apr 2012 08:36:07 +0000 (08:36 +0000)
committerAntony Riakiotakis <kalast@gmail.com>
Thu, 12 Apr 2012 08:36:07 +0000 (08:36 +0000)
To compile on MinGW it is important to have the latest MinGW (gcc 4.6.2)

I have updated the instructions on the wiki to reflect this:  http://wiki.blender.org/index.php/Dev:2.5/Doc/Building_Blender/Windows/Environment

CMakeLists.txt

index 9a5eb86af05db88424474dd8884bc9cbfb228d24..2c4cdb62da5fe0a8ea9c9b6f39c2f67f192f0b37 100644 (file)
@@ -148,14 +148,11 @@ mark_as_advanced(WITH_AUDASPACE)
 
 
 # (unix defaults to OpenMP On)
-
 if(UNIX AND NOT APPLE)
-       set(PLATFORM_DEFAULT ON)
+       option(WITH_OPENMP        "Enable OpenMP (has to be supported by the compiler)" ON)
 else()
-       set(PLATFORM_DEFAULT OFF)
+       option(WITH_OPENMP        "Enable OpenMP (has to be supported by the compiler)" OFF)
 endif()
-option(WITH_OPENMP        "Enable OpenMP (has to be supported by the compiler)" PLATFORM_DEFAULT)
-unset(PLATFORM_DEFAULT)
 
 if(UNIX AND NOT APPLE)
        option(WITH_X11_XINPUT "Enable X11 Xinput (tablet support and unicode input)"   ON)
@@ -174,27 +171,19 @@ else()
 endif()
 
 # Modifiers
-option(WITH_MOD_FLUID           "Enable Elbeem Modifier (Fluid Simulation)" ON)
-option(WITH_MOD_SMOKE           "Enable Smoke Modifier (Smoke Simulation)" ON)
-option(WITH_MOD_DECIMATE        "Enable Decimate Modifier" ON)
-option(WITH_MOD_BOOLEAN         "Enable Boolean Modifier" ON)
-option(WITH_MOD_REMESH          "Enable Remesh Modifier" ON)
-option(WITH_MOD_CLOTH_ELTOPO    "Enable Experimental cloth solver" OFF)
+option(WITH_MOD_FLUID          "Enable Elbeem Modifier (Fluid Simulation)" ON)
+option(WITH_MOD_SMOKE          "Enable Smoke Modifier (Smoke Simulation)" ON)
+option(WITH_MOD_DECIMATE               "Enable Decimate Modifier" ON)
+option(WITH_MOD_BOOLEAN                "Enable Boolean Modifier" ON)
+option(WITH_MOD_REMESH         "Enable Remesh Modifier" ON)
+option(WITH_MOD_CLOTH_ELTOPO           "Enable Experimental cloth solver" OFF)
 mark_as_advanced(WITH_MOD_CLOTH_ELTOPO)
 option(WITH_MOD_OCEANSIM        "Enable Ocean Modifier" OFF)
 
 # Image format support
-
-if(NOT MINGW)
-       set(PLATFORM_DEFAULT ON)
-else()
-       set(PLATFORM_DEFAULT OFF)
-endif()
-option(WITH_IMAGE_OPENEXR       "Enable OpenEXR Support (http://www.openexr.com)" ${PLATFORM_DEFAULT})
-option(WITH_IMAGE_TIFF          "Enable LibTIFF Support"                          ${PLATFORM_DEFAULT})
-unset(PLATFORM_DEFAULT)
-
+option(WITH_IMAGE_OPENEXR       "Enable OpenEXR Support (http://www.openexr.com)" ON)
 option(WITH_IMAGE_OPENJPEG      "Enable OpenJpeg Support (http://www.openjpeg.org)" ON)
+option(WITH_IMAGE_TIFF          "Enable LibTIFF Support" ON)
 option(WITH_IMAGE_DDS           "Enable DDS Image Support" ON)
 option(WITH_IMAGE_CINEON        "Enable CINEON and DPX Image Support" ON)
 option(WITH_IMAGE_HDR           "Enable HDR Image Support" ON)
@@ -236,14 +225,7 @@ endif()
 option(WITH_PYTHON_INSTALL       "Copy system python into the blender install folder" ON)
 
 # Cycles
-if(NOT MINGW)
-       set(PLATFORM_DEFAULT ON)
-else()
-       set(PLATFORM_DEFAULT OFF)
-endif()
-option(WITH_CYCLES                                     "Enable cycles Render Engine" ${PLATFORM_DEFAULT})
-unset(PLATFORM_DEFAULT)
-
+option(WITH_CYCLES                                     "Enable cycles Render Engine" ON)
 option(WITH_CYCLES_TEST                                "Build cycles test application" OFF)
 option(WITH_CYCLES_CUDA_BINARIES       "Build cycles CUDA binaries" OFF)
 set(CYCLES_CUDA_BINARIES_ARCH          sm_13 sm_20 sm_21 CACHE STRING "CUDA architectures to build binaries for")
@@ -343,29 +325,6 @@ if(WITH_PYTHON_MODULE AND WITH_PYTHON_INSTALL)
        message(FATAL_ERROR "WITH_PYTHON_MODULE requires WITH_PYTHON_INSTALL to be OFF")
 endif()
 
-# mingw needs some work to support all windows libs
-# ...until then complain if they are used rather then failing.
-if(MINGW)
-
-       # temp macro to avoid lots of copy/paste messages
-       macro(mingw_unsupported
-             opt)
-
-               if(${opt})
-                       message(FATAL_ERROR "MINGW requires " ${opt} " to be OFF "
-                                           "because it is currently unsupported, remove this "
-                                           "line if youre a developer who wants to add support.")
-               endif()
-       endmacro()
-
-       mingw_unsupported(WITH_CODEC_QUICKTIME)
-       mingw_unsupported(WITH_CYCLES)
-       mingw_unsupported(WITH_IMAGE_OPENEXR)
-       mingw_unsupported(WITH_IMAGE_TIFF)
-
-       unset(mingw_unsupported)
-endif()
-
 
 if(NOT WITH_FFTW3 AND WITH_MOD_OCEANSIM)
        message(FATAL_ERROR "WITH_MOD_OCEANSIM requires WITH_FFTW3 to be ON")