diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-07-12 13:55:41 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-07-12 13:55:41 +0400 |
| commit | 0a11d4c81d5481243236efcd99e8bac40d2790ec (patch) | |
| tree | 81e725300638b309e1dcdc3837fb69c6ec282155 /CMakeLists.txt | |
| parent | c013974a7c2e0365f8884390002ba9b515a5edb2 (diff) | |
[#22817] Beta patch for cmake-MinGW compilation no 2
ommit FORCE CFlags, else users cant change their cflags.
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 29af4db6073..3e8b812e57c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -485,7 +485,7 @@ IF(WIN32) 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 @@ IF(WIN32) 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 @@ IF(WIN32) 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(WIN32) 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) |