mirror of https://github.com/PCSX2/pcsx2.git
cmake:
* move machine optimization in the global setup. In same time use i686 instead of i486 * Also build the debug with fvisibility=hidden No reason to use it only on devel. (actually same as codeblock) git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3628 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
parent
df436f1583
commit
fa793cca25
|
@ -96,10 +96,10 @@ endif(CMAKE_BUILD_STRIP)
|
||||||
# By default allow build on amd64 machine
|
# By default allow build on amd64 machine
|
||||||
if(DEFINED USER_CMAKE_C_FLAGS)
|
if(DEFINED USER_CMAKE_C_FLAGS)
|
||||||
message(STATUS "Pcsx2 is very sensible with gcc flags, so use USER_CMAKE_C_FLAGS at your own risk !!!")
|
message(STATUS "Pcsx2 is very sensible with gcc flags, so use USER_CMAKE_C_FLAGS at your own risk !!!")
|
||||||
string(STRIP "${USER_CMAKE_C_FLAGS} -m32" CMAKE_C_FLAGS)
|
string(STRIP "${USER_CMAKE_C_FLAGS}" CMAKE_C_FLAGS)
|
||||||
else(DEFINED USER_CMAKE_C_FLAGS)
|
|
||||||
string(STRIP "-m32" CMAKE_C_FLAGS)
|
|
||||||
endif(DEFINED USER_CMAKE_C_FLAGS)
|
endif(DEFINED USER_CMAKE_C_FLAGS)
|
||||||
|
# Use some default machine flags
|
||||||
|
string(STRIP "${CMAKE_C_FLAGS} -m32 -msse -msse2 -march=i686" CMAKE_C_FLAGS)
|
||||||
|
|
||||||
|
|
||||||
### C++ flags
|
### C++ flags
|
||||||
|
@ -108,11 +108,9 @@ endif(DEFINED USER_CMAKE_C_FLAGS)
|
||||||
if(DEFINED USER_CMAKE_CXX_FLAGS)
|
if(DEFINED USER_CMAKE_CXX_FLAGS)
|
||||||
message(STATUS "Pcsx2 is very sensible with gcc flags, so use USER_CMAKE_CXX_FLAGS at your own risk !!!")
|
message(STATUS "Pcsx2 is very sensible with gcc flags, so use USER_CMAKE_CXX_FLAGS at your own risk !!!")
|
||||||
string(STRIP "${USER_CMAKE_CXX_FLAGS}" CMAKE_CXX_FLAGS)
|
string(STRIP "${USER_CMAKE_CXX_FLAGS}" CMAKE_CXX_FLAGS)
|
||||||
string(STRIP "${USER_CMAKE_CXX_FLAGS} -m32" CMAKE_CXX_FLAGS)
|
|
||||||
else(DEFINED USER_CMAKE_CXX_FLAGS)
|
|
||||||
set(CMAKE_CXX_FLAGS "")
|
|
||||||
string(STRIP "-m32" CMAKE_CXX_FLAGS)
|
|
||||||
endif(DEFINED USER_CMAKE_CXX_FLAGS)
|
endif(DEFINED USER_CMAKE_CXX_FLAGS)
|
||||||
|
# Use some default machine flags
|
||||||
|
string(STRIP "${CMAKE_CXX_FLAGS} -m32 -msse -msse2 -march=i686" CMAKE_CXX_FLAGS)
|
||||||
|
|
||||||
#-------------------------------------------------------------------------------
|
#-------------------------------------------------------------------------------
|
||||||
# Select library system vs 3rdparty
|
# Select library system vs 3rdparty
|
||||||
|
|
|
@ -12,9 +12,7 @@ set(Output Utilities)
|
||||||
# set common flags
|
# set common flags
|
||||||
set(CommonFlags
|
set(CommonFlags
|
||||||
-pthread
|
-pthread
|
||||||
-march=i486
|
-fvisibility=hidden
|
||||||
-msse
|
|
||||||
-msse2
|
|
||||||
-fno-dse
|
-fno-dse
|
||||||
-fno-guess-branch-probability
|
-fno-guess-branch-probability
|
||||||
-fno-strict-aliasing
|
-fno-strict-aliasing
|
||||||
|
|
|
@ -12,13 +12,11 @@ set(Output x86emitter)
|
||||||
# set common flags
|
# set common flags
|
||||||
set(CommonFlags
|
set(CommonFlags
|
||||||
-pthread
|
-pthread
|
||||||
|
-fvisibility=hidden
|
||||||
-fno-guess-branch-probability
|
-fno-guess-branch-probability
|
||||||
-fno-dse
|
-fno-dse
|
||||||
-fno-tree-dse
|
-fno-tree-dse
|
||||||
-fno-strict-aliasing
|
-fno-strict-aliasing
|
||||||
-march=i486
|
|
||||||
-msse
|
|
||||||
-msse2
|
|
||||||
-pipe
|
-pipe
|
||||||
-Wno-format
|
-Wno-format
|
||||||
-Wno-unused-parameter
|
-Wno-unused-parameter
|
||||||
|
|
|
@ -9,13 +9,11 @@ endif(NOT TOP_CMAKE_WAS_SOURCED)
|
||||||
# set common flags
|
# set common flags
|
||||||
set(CommonFlags
|
set(CommonFlags
|
||||||
-pthread
|
-pthread
|
||||||
|
-fvisibility=hidden
|
||||||
-fno-guess-branch-probability
|
-fno-guess-branch-probability
|
||||||
-fno-dse
|
-fno-dse
|
||||||
-fno-tree-dse
|
-fno-tree-dse
|
||||||
-fno-strict-aliasing
|
-fno-strict-aliasing
|
||||||
-march=i486
|
|
||||||
-msse
|
|
||||||
-msse2
|
|
||||||
-pipe
|
-pipe
|
||||||
-Wno-format
|
-Wno-format
|
||||||
-Wno-unused-parameter
|
-Wno-unused-parameter
|
||||||
|
|
|
@ -10,12 +10,12 @@ endif(NOT TOP_CMAKE_WAS_SOURCED)
|
||||||
set(Output CDVDiso)
|
set(Output CDVDiso)
|
||||||
|
|
||||||
set(CommonFlags
|
set(CommonFlags
|
||||||
|
-fvisibility=hidden
|
||||||
-Wall
|
-Wall
|
||||||
-fpermissive
|
-fpermissive
|
||||||
)
|
)
|
||||||
|
|
||||||
set(OptimizationFlags
|
set(OptimizationFlags
|
||||||
-fvisibility=hidden
|
|
||||||
-O2
|
-O2
|
||||||
-DNDEBUG
|
-DNDEBUG
|
||||||
)
|
)
|
||||||
|
|
|
@ -10,11 +10,11 @@ endif(NOT TOP_CMAKE_WAS_SOURCED)
|
||||||
set(Output CDVDnull)
|
set(Output CDVDnull)
|
||||||
|
|
||||||
set(CommonFlags
|
set(CommonFlags
|
||||||
|
-fvisibility=hidden
|
||||||
-Wall
|
-Wall
|
||||||
)
|
)
|
||||||
|
|
||||||
set(OptimizationFlags
|
set(OptimizationFlags
|
||||||
-fvisibility=hidden
|
|
||||||
-O2
|
-O2
|
||||||
-DNDEBUG
|
-DNDEBUG
|
||||||
)
|
)
|
||||||
|
|
|
@ -10,11 +10,11 @@ endif(NOT TOP_CMAKE_WAS_SOURCED)
|
||||||
set(Output FWnull)
|
set(Output FWnull)
|
||||||
|
|
||||||
set(CommonFlags
|
set(CommonFlags
|
||||||
|
-fvisibility=hidden
|
||||||
-Wall
|
-Wall
|
||||||
)
|
)
|
||||||
|
|
||||||
set(OptimizationFlags
|
set(OptimizationFlags
|
||||||
-fvisibility=hidden
|
|
||||||
-O2
|
-O2
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -10,12 +10,11 @@ endif(NOT TOP_CMAKE_WAS_SOURCED)
|
||||||
set(Output GSnull)
|
set(Output GSnull)
|
||||||
|
|
||||||
set(CommonFlags
|
set(CommonFlags
|
||||||
|
-fvisibility=hidden
|
||||||
-Wall
|
-Wall
|
||||||
-msse2
|
|
||||||
)
|
)
|
||||||
|
|
||||||
set(OptimizationFlags
|
set(OptimizationFlags
|
||||||
-fvisibility=hidden
|
|
||||||
-O2
|
-O2
|
||||||
-DNDEBUG
|
-DNDEBUG
|
||||||
)
|
)
|
||||||
|
|
|
@ -9,11 +9,11 @@ endif(NOT TOP_CMAKE_WAS_SOURCED)
|
||||||
set(Output PADnull)
|
set(Output PADnull)
|
||||||
|
|
||||||
set(CommonFlags
|
set(CommonFlags
|
||||||
|
-fvisibility=hidden
|
||||||
-Wall
|
-Wall
|
||||||
)
|
)
|
||||||
|
|
||||||
set(OptimizationFlags
|
set(OptimizationFlags
|
||||||
-fvisibility=hidden
|
|
||||||
-O2
|
-O2
|
||||||
-DNDEBUG
|
-DNDEBUG
|
||||||
)
|
)
|
||||||
|
|
|
@ -10,11 +10,11 @@ endif(NOT TOP_CMAKE_WAS_SOURCED)
|
||||||
set(Output SPU2null)
|
set(Output SPU2null)
|
||||||
|
|
||||||
set(CommonFlags
|
set(CommonFlags
|
||||||
|
-fvisibility=hidden
|
||||||
-Wall
|
-Wall
|
||||||
)
|
)
|
||||||
|
|
||||||
set(OptimizationFlags
|
set(OptimizationFlags
|
||||||
-fvisibility=hidden
|
|
||||||
-O2
|
-O2
|
||||||
-DNDEBUG
|
-DNDEBUG
|
||||||
)
|
)
|
||||||
|
|
|
@ -10,11 +10,11 @@ endif(NOT TOP_CMAKE_WAS_SOURCED)
|
||||||
set(Output USBnull)
|
set(Output USBnull)
|
||||||
|
|
||||||
set(CommonFlags
|
set(CommonFlags
|
||||||
|
-fvisibility=hidden
|
||||||
-Wall
|
-Wall
|
||||||
)
|
)
|
||||||
|
|
||||||
set(OptimizationFlags
|
set(OptimizationFlags
|
||||||
-fvisibility=hidden
|
|
||||||
-O2
|
-O2
|
||||||
-DNDEBUG
|
-DNDEBUG
|
||||||
)
|
)
|
||||||
|
|
|
@ -10,11 +10,11 @@ endif(NOT TOP_CMAKE_WAS_SOURCED)
|
||||||
set(Output dev9null)
|
set(Output dev9null)
|
||||||
|
|
||||||
set(CommonFlags
|
set(CommonFlags
|
||||||
|
-fvisibility=hidden
|
||||||
-Wall
|
-Wall
|
||||||
)
|
)
|
||||||
|
|
||||||
set(OptimizationFlags
|
set(OptimizationFlags
|
||||||
-fvisibility=hidden
|
|
||||||
-O2
|
-O2
|
||||||
-DNDEBUG
|
-DNDEBUG
|
||||||
)
|
)
|
||||||
|
|
|
@ -10,11 +10,11 @@ endif(NOT TOP_CMAKE_WAS_SOURCED)
|
||||||
set(Output onepad)
|
set(Output onepad)
|
||||||
|
|
||||||
set(CommonFlags
|
set(CommonFlags
|
||||||
|
-fvisibility=hidden
|
||||||
-Wall
|
-Wall
|
||||||
)
|
)
|
||||||
|
|
||||||
set(OptimizationFlags
|
set(OptimizationFlags
|
||||||
-fvisibility=hidden
|
|
||||||
-O2
|
-O2
|
||||||
-DNDEBUG
|
-DNDEBUG
|
||||||
)
|
)
|
||||||
|
|
|
@ -10,12 +10,11 @@ endif(NOT TOP_CMAKE_WAS_SOURCED)
|
||||||
set(Output spu2x)
|
set(Output spu2x)
|
||||||
|
|
||||||
set(CommonFlags
|
set(CommonFlags
|
||||||
|
-fvisibility=hidden
|
||||||
-Wall
|
-Wall
|
||||||
-msse2
|
|
||||||
)
|
)
|
||||||
|
|
||||||
set(OptimizationFlags
|
set(OptimizationFlags
|
||||||
-fvisibility=hidden
|
|
||||||
-O2
|
-O2
|
||||||
-DNDEBUG
|
-DNDEBUG
|
||||||
)
|
)
|
||||||
|
|
|
@ -11,14 +11,13 @@ set(Output zzogl)
|
||||||
|
|
||||||
set(CommonFlags
|
set(CommonFlags
|
||||||
-pthread
|
-pthread
|
||||||
|
-DZEROGS_SSE2
|
||||||
|
-fno-regmove
|
||||||
|
-fno-strict-aliasing
|
||||||
-Wno-format
|
-Wno-format
|
||||||
-Wno-unused-parameter
|
-Wno-unused-parameter
|
||||||
-Wno-unused-value
|
-Wno-unused-value
|
||||||
-Wunused-variable
|
-Wunused-variable
|
||||||
-msse2
|
|
||||||
-fno-regmove
|
|
||||||
-fno-strict-aliasing
|
|
||||||
-DZEROGS_SSE2
|
|
||||||
)
|
)
|
||||||
|
|
||||||
set(OptimizationFlags
|
set(OptimizationFlags
|
||||||
|
|
Loading…
Reference in New Issue