diff options
| author | Arystanbek Dyussenov <arystan.d@gmail.com> | 2009-11-29 21:54:37 +0300 |
|---|---|---|
| committer | Arystanbek Dyussenov <arystan.d@gmail.com> | 2009-11-29 21:54:37 +0300 |
| commit | 71a2cc322286a689e19c4ad069fded3b02d43f38 (patch) | |
| tree | eb10907e08a370fbd0f70075ff19aa825b01c607 /CMakeLists.txt | |
| parent | ead79e535d403f3cff00352a9ef0a750afbab30d (diff) | |
| parent | ae16f465738b538964e5f00c1506582d47ead7d1 (diff) | |
Merge from trunk -r 24758:25003.
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 46 |
1 files changed, 28 insertions, 18 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 14510cbeecd..184b106a84d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -# $Id$ + # $Id$ # ***** BEGIN GPL LICENSE BLOCK ***** # # This program is free software; you can redistribute it and/or @@ -531,19 +531,21 @@ IF(APPLE) SET(LLIBS stdc++ SystemStubs) IF (WITH_COCOA) - SET(PLATFORM_CFLAGS "-pipe -fPIC -funsigned-char -fno-strict-aliasing -DGHOST_COCOA") - SET(PLATFORM_LINKFLAGS "-fexceptions -framework CoreServices -framework Foundation -framework IOKit -framework AppKit -framework Cocoa -framework Carbon -framework AudioUnit -framework AudioToolbox -framework CoreAudio") - IF(USE_QTKIT) - SET(PLATFORM_CFLAGS "${PLATFORM_CFLAGS} -DUSE_QTKIT") - SET(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -framework QTKit") - ELSE(USE_QTKIT) - IF(WITH_QUICKTIME) - SET(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -framework QuickTime") - ENDIF(WITH_QUICKTIME) - ENDIF(USE_QTKIT) + SET(PLATFORM_CFLAGS "-pipe -funsigned-char -DGHOST_COCOA") + SET(PLATFORM_LINKFLAGS "-fexceptions -framework CoreServices -framework Foundation -framework IOKit -framework AppKit -framework Cocoa -framework Carbon -framework AudioUnit -framework AudioToolbox -framework CoreAudio") + IF(USE_QTKIT) + SET(PLATFORM_CFLAGS "${PLATFORM_CFLAGS} -DUSE_QTKIT") + SET(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -framework QTKit") + IF(CMAKE_OSX_ARCHITECTURES MATCHES i386) + SET(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -framework QuickTime") + #libSDL still needs 32bit carbon quicktime + ENDIF(CMAKE_OSX_ARCHITECTURES MATCHES i386) + ELSEIF(WITH_QUICKTIME) + SET(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -framework QuickTime") + ENDIF(USE_QTKIT) ELSE (WITH_COCOA) - SET(PLATFORM_CFLAGS "-pipe -fPIC -funsigned-char -fno-strict-aliasing") - SET(PLATFORM_LINKFLAGS "-fexceptions -framework CoreServices -framework Foundation -framework IOKit -framework AppKit -framework Carbon -framework AGL -framework AudioUnit -framework AudioToolbox -framework CoreAudio -framework QuickTime") + SET(PLATFORM_CFLAGS "-pipe -funsigned-char") + SET(PLATFORM_LINKFLAGS "-fexceptions -framework CoreServices -framework Foundation -framework IOKit -framework AppKit -framework Carbon -framework AGL -framework AudioUnit -framework AudioToolbox -framework CoreAudio -framework QuickTime") ENDIF (WITH_COCOA) IF(WITH_OPENMP) @@ -585,15 +587,23 @@ IF(APPLE) SET(EXETYPE MACOSX_BUNDLE) - + SET(CMAKE_C_FLAGS_DEBUG "-fno-strict-aliasing -g") + SET(CMAKE_CXX_FLAGS_DEBUG "-fno-strict-aliasing -g") IF(CMAKE_OSX_ARCHITECTURES MATCHES "i386") - SET(CMAKE_CXX_FLAGS_RELEASE "-O3 -ftree-vectorize -msse -msse2 -fvariable-expansion-in-unroller") - SET(CMAKE_C_FLAGS_RELEASE "-O3 -ftree-vectorize -msse -msse2 -fvariable-expansion-in-unroller") + SET(CMAKE_CXX_FLAGS_RELEASE "-O3 -mdynamic-no-pic -ftree-vectorize -msse -msse2 -fvariable-expansion-in-unroller") + SET(CMAKE_C_FLAGS_RELEASE "-O3 -mdynamic-no-pic -ftree-vectorize -msse -msse2 -fvariable-expansion-in-unroller") ELSEIF(CMAKE_OSX_ARCHITECTURES MATCHES "x86_64") - SET(CMAKE_CXX_FLAGS_RELEASE "-O3 -ftree-vectorize -msse -msse2 -msse3 -mssse3 -fvariable-expansion-in-unroller") - SET(CMAKE_C_FLAGS_RELEASE "-O3 -ftree-vectorize -msse -msse2 -msse3 -mssse3 -fvariable-expansion-in-unroller") + SET(CMAKE_CXX_FLAGS_RELEASE "-O3 -mdynamic-no-pic -ftree-vectorize -msse -msse2 -msse3 -mssse3 -fvariable-expansion-in-unroller") + SET(CMAKE_C_FLAGS_RELEASE "-O3 -mdynamic-no-pic -ftree-vectorize -msse -msse2 -msse3 -mssse3 -fvariable-expansion-in-unroller") + ELSE(CMAKE_OSX_ARCHITECTURES MATCHES "x86_64") + SET(CMAKE_C_FLAGS_RELEASE "-mdynamic-no-pic -fno-strict-aliasing") + SET(CMAKE_CXX_FLAGS_RELEASE "-mdynamic-no-pic -fno-strict-aliasing") ENDIF(CMAKE_OSX_ARCHITECTURES MATCHES "i386") + # Better warnings + SET(C_WARNINGS "-Wall -Wno-char-subscripts -Wpointer-arith -Wcast-align -Wdeclaration-after-statement") + SET(CXX_WARNINGS "-Wall -Wno-invalid-offsetof -Wno-sign-compare") + ENDIF(APPLE) IF(CMAKE_SYSTEM_NAME MATCHES "Linux") |