From 8864c8bbaf810733d2528c0a2b155176db21e59e Mon Sep 17 00:00:00 2001 From: "gregory.hainaut" Date: Wed, 7 Jul 2010 11:08:05 +0000 Subject: [PATCH] [cmake] Move flags clean in the build modules. Next step allow user to control them. git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3416 96395faa-99c1-11dd-bbfe-3dabce05a288 --- cmake/BuildParameters.cmake | 13 +++++++++++++ common/src/Utilities/CMakeLists.txt | 10 ---------- common/src/x86emitter/CMakeLists.txt | 10 ---------- pcsx2/CMakeLists.txt | 10 ---------- plugins/spu2-x/src/CMakeLists.txt | 10 ---------- plugins/zzogl-pg/opengl/CMakeLists.txt | 10 ---------- 6 files changed, 13 insertions(+), 50 deletions(-) diff --git a/cmake/BuildParameters.cmake b/cmake/BuildParameters.cmake index 5717516435..feb0cb84fa 100644 --- a/cmake/BuildParameters.cmake +++ b/cmake/BuildParameters.cmake @@ -12,11 +12,23 @@ # ${CMAKE_SHARED_LIBRARY_CXX_FLAGS} = "-fPIC" # ${CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS} = "-rdynamic" # +# ${CMAKE_C_FLAGS} = "-g -O2" +# ${CMAKE_CXX_FLAGS} = "-g -O2" # Use in debug mode # ${CMAKE_CXX_FLAGS_DEBUG} = "-g" # Use in release mode # ${CMAKE_CXX_FLAGS_RELEASE} = "-O3 -DNDEBUG" +#------------------------------------------------------------------------------- +# Do not use default cmake flags +#------------------------------------------------------------------------------- +set(CMAKE_C_FLAGS "") +set(CMAKE_CXX_FLAGS "") +set(CMAKE_C_FLAGS_DEBUG "") +set(CMAKE_CXX_FLAGS_DEBUG "") +set(CMAKE_C_FLAGS_RELEASE "") +set(CMAKE_CXX_FLAGS_RELEASE "") + #------------------------------------------------------------------------------- # Remove bad default option #------------------------------------------------------------------------------- @@ -25,6 +37,7 @@ SET(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS " ") SET(CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS " ") # Remove -fPIC option. No good reason to use it for plugins. Moreover we # only support x86 architecture. And last but not least it impact the performance. +# Long term future note :), amd64 build will need the -fPIC flags set(CMAKE_SHARED_LIBRARY_C_FLAGS "") set(CMAKE_SHARED_LIBRARY_CXX_FLAGS "") diff --git a/common/src/Utilities/CMakeLists.txt b/common/src/Utilities/CMakeLists.txt index 984276d754..c077440f17 100644 --- a/common/src/Utilities/CMakeLists.txt +++ b/common/src/Utilities/CMakeLists.txt @@ -9,16 +9,6 @@ endif(NOT TOP_CMAKE_WAS_SOURCED) # library name set(UtilitiesName Utilities) -# Clear default flags -set(CMAKE_C_FLAGS "") -set(CMAKE_CXX_FLAGS "") -set(CMAKE_C_FLAGS_DEBUG "") -set(CMAKE_CXX_FLAGS_DEBUG "") -set(CMAKE_C_FLAGS_DEVEL "") -set(CMAKE_CXX_FLAGS_DEVEL "") -set(CMAKE_C_FLAGS_RELEASE "") -set(CMAKE_CXX_FLAGS_RELEASE "") - # set common flags set(CommonFlags -pthread diff --git a/common/src/x86emitter/CMakeLists.txt b/common/src/x86emitter/CMakeLists.txt index 4470bb6b82..7be8c48439 100644 --- a/common/src/x86emitter/CMakeLists.txt +++ b/common/src/x86emitter/CMakeLists.txt @@ -9,16 +9,6 @@ endif(NOT TOP_CMAKE_WAS_SOURCED) # library name set(x86emitterName x86emitter) -# Clear default flags -set(CMAKE_C_FLAGS "") -set(CMAKE_CXX_FLAGS "") -set(CMAKE_C_FLAGS_DEBUG "") -set(CMAKE_CXX_FLAGS_DEBUG "") -set(CMAKE_C_FLAGS_DEVEL "") -set(CMAKE_CXX_FLAGS_DEVEL "") -set(CMAKE_C_FLAGS_RELEASE "") -set(CMAKE_CXX_FLAGS_RELEASE "") - # set common flags set(CommonFlags -pthread diff --git a/pcsx2/CMakeLists.txt b/pcsx2/CMakeLists.txt index 3e3c6efa70..9f7360b4ba 100644 --- a/pcsx2/CMakeLists.txt +++ b/pcsx2/CMakeLists.txt @@ -6,16 +6,6 @@ if(NOT TOP_CMAKE_WAS_SOURCED) endif(NOT TOP_CMAKE_WAS_SOURCED) -# Clear default flags -set(CMAKE_C_FLAGS "") -set(CMAKE_CXX_FLAGS "") -set(CMAKE_C_FLAGS_DEBUG "") -set(CMAKE_CXX_FLAGS_DEBUG "") -set(CMAKE_C_FLAGS_DEVEL "") -set(CMAKE_CXX_FLAGS_DEVEL "") -set(CMAKE_C_FLAGS_RELEASE "") -set(CMAKE_CXX_FLAGS_RELEASE "") - # set common flags set(CommonFlags -pthread diff --git a/plugins/spu2-x/src/CMakeLists.txt b/plugins/spu2-x/src/CMakeLists.txt index 29fdf09351..aeae473304 100644 --- a/plugins/spu2-x/src/CMakeLists.txt +++ b/plugins/spu2-x/src/CMakeLists.txt @@ -9,16 +9,6 @@ endif(NOT TOP_CMAKE_WAS_SOURCED) # plugin name set(spu2xName spu2x) -# Clear default flags -set(CMAKE_C_FLAGS "") -set(CMAKE_CXX_FLAGS "") -set(CMAKE_C_FLAGS_DEBUG "") -set(CMAKE_CXX_FLAGS_DEBUG "") -set(CMAKE_C_FLAGS_DEVEL "") -set(CMAKE_CXX_FLAGS_DEVEL "") -set(CMAKE_C_FLAGS_RELEASE "") -set(CMAKE_CXX_FLAGS_RELEASE "") - set(CommonFlags -Wall -m32 diff --git a/plugins/zzogl-pg/opengl/CMakeLists.txt b/plugins/zzogl-pg/opengl/CMakeLists.txt index 5e61fc6e5c..672c1b31b8 100644 --- a/plugins/zzogl-pg/opengl/CMakeLists.txt +++ b/plugins/zzogl-pg/opengl/CMakeLists.txt @@ -6,16 +6,6 @@ if(NOT TOP_CMAKE_WAS_SOURCED) endif(NOT TOP_CMAKE_WAS_SOURCED) -# Clear default flags -set(CMAKE_C_FLAGS "") -set(CMAKE_CXX_FLAGS "") -set(CMAKE_C_FLAGS_DEBUG "") -set(CMAKE_CXX_FLAGS_DEBUG "") -set(CMAKE_C_FLAGS_DEVEL "") -set(CMAKE_CXX_FLAGS_DEVEL "") -set(CMAKE_C_FLAGS_RELEASE "") -set(CMAKE_CXX_FLAGS_RELEASE "") - # plugin name set(zzoglName zzogl)