ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cmake: 

* Link zz with libjpeg. Well it seems to get the library from another place, but better be safe for the future.
* Use -pthread as a default option (again to be safer)
* Warn about breaking of strict aliasing rule 


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3761 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
gregory.hainaut@gmail.com 2010-09-13 15:26:04 +00:00
parent b15dd516c2
commit e2cb52becf
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/BuildParameters.cmake
View File

@ -99,7 +99,7 @@ if(DEFINED USER_CMAKE_C_FLAGS)
string(STRIP "${USER_CMAKE_C_FLAGS}" CMAKE_C_FLAGS) string(STRIP "${USER_CMAKE_C_FLAGS}" CMAKE_C_FLAGS)
endif(DEFINED USER_CMAKE_C_FLAGS) endif(DEFINED USER_CMAKE_C_FLAGS)
# Use some default machine flags # Use some default machine flags
string(STRIP "${CMAKE_C_FLAGS} -m32 -msse -msse2 -march=i686" CMAKE_C_FLAGS) string(STRIP "${CMAKE_C_FLAGS} -m32 -msse -msse2 -march=i686 -pthread" CMAKE_C_FLAGS)
### C++ flags ### C++ flags
@ -110,7 +110,7 @@ if(DEFINED USER_CMAKE_CXX_FLAGS)
string(STRIP "${USER_CMAKE_CXX_FLAGS}" CMAKE_CXX_FLAGS) string(STRIP "${USER_CMAKE_CXX_FLAGS}" CMAKE_CXX_FLAGS)
endif(DEFINED USER_CMAKE_CXX_FLAGS) endif(DEFINED USER_CMAKE_CXX_FLAGS)
# Use some default machine flags # Use some default machine flags
string(STRIP "${CMAKE_CXX_FLAGS} -m32 -msse -msse2 -march=i686" CMAKE_CXX_FLAGS) string(STRIP "${CMAKE_CXX_FLAGS} -m32 -msse -msse2 -march=i686 -pthread" CMAKE_CXX_FLAGS)
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
# Select library system vs 3rdparty # Select library system vs 3rdparty

1
pcsx2/CMakeLists.txt
View File

@ -14,6 +14,7 @@ set(CommonFlags
-fno-dse -fno-dse
-fno-tree-dse -fno-tree-dse
-fno-strict-aliasing -fno-strict-aliasing
-Wstrict-aliasing # Allow to track strict aliasing issue.
-pipe -pipe
-Wno-format -Wno-format
-Wno-unused-parameter -Wno-unused-parameter

4
plugins/zzogl-pg/opengl/CMakeLists.txt
View File

@ -14,6 +14,7 @@ set(CommonFlags
-DZEROGS_SSE2 -DZEROGS_SSE2
-fno-regmove -fno-regmove
-fno-strict-aliasing -fno-strict-aliasing
-Wstrict-aliasing # Allow to track strict aliasing issue.
-Wno-format -Wno-format
-Wno-unused-parameter -Wno-unused-parameter
-Wno-unused-value -Wno-unused-value
@ -156,6 +157,9 @@ target_link_libraries(${Output} ${OPENGL_LIBRARIES})
# link target with X11 # link target with X11
target_link_libraries(${Output} ${X11_LIBRARIES}) target_link_libraries(${Output} ${X11_LIBRARIES})
# link target with jpeg
target_link_libraries(${Output} ${JPEG_LIBRARIES})
# User flags options # User flags options
if(NOT USER_CMAKE_LD_FLAGS STREQUAL "") if(NOT USER_CMAKE_LD_FLAGS STREQUAL "")
target_link_libraries(${Output} "${USER_CMAKE_LD_FLAGS}") target_link_libraries(${Output} "${USER_CMAKE_LD_FLAGS}")