diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2011-09-04 19:39:09 +0400 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2011-09-04 19:39:09 +0400 |
| commit | 6edb09fe935eff6bc6f928cc1527e48a06d2657a (patch) | |
| tree | 68b6eb2ad30746da14a98825e90d2b3eb0172cc6 /intern/cycles/CMakeLists.txt | |
| parent | db1664ed4c44ff56ce286e0007dfd1587109c7a5 (diff) | |
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.
Diffstat (limited to 'intern/cycles/CMakeLists.txt')
| -rw-r--r-- | intern/cycles/CMakeLists.txt | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/intern/cycles/CMakeLists.txt b/intern/cycles/CMakeLists.txt index fd501b85be9..5d76f57fa73 100644 --- a/intern/cycles/CMakeLists.txt +++ b/intern/cycles/CMakeLists.txt @@ -16,8 +16,13 @@ if(APPLE) 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) |