From 7883180ab9f685a0262b0f0830c44bc594082105 Mon Sep 17 00:00:00 2001 From: "gregory.hainaut" Date: Sat, 5 Jun 2010 11:56:52 +0000 Subject: [PATCH] [cmake] * align cmake flags with codeblock one. (note spu2x may still fail to compile with inline problem) * Some final cleaning. You must be able to see your reflection now ;) git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3169 96395faa-99c1-11dd-bbfe-3dabce05a288 --- CMakeLists.txt | 14 -------------- cmake/SearchForStuff.cmake | 10 +++++++--- plugins/CDVDiso/src/CMakeLists.txt | 1 + plugins/CDVDnull/CMakeLists.txt | 1 + plugins/GSnull/CMakeLists.txt | 1 + plugins/PadNull/CMakeLists.txt | 1 + plugins/SPU2null/CMakeLists.txt | 1 + plugins/USBnull/CMakeLists.txt | 1 + plugins/dev9null/CMakeLists.txt | 1 + plugins/onepad/CMakeLists.txt | 1 + plugins/spu2-x/src/CMakeLists.txt | 1 + plugins/zeropad/CMakeLists.txt | 1 + plugins/zerospu2/CMakeLists.txt | 1 + plugins/zzogl-pg/opengl/CMakeLists.txt | 1 + 14 files changed, 19 insertions(+), 17 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e088fb98fe..b56e7470e7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,20 +18,6 @@ detectOperatingSystem() SET(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS " ") SET(CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS " ") -#------------------------------------------------------------------------------- -# Detect the 32bit/64bit and set the 32bit library path 32_LD_LIBRARY_PATH -# Note: Must be done before SearchForStuff -#------------------------------------------------------------------------------- -if(Linux) - if(CMAKE_SIZEOF_VOID_P MATCHES "8" AND EXISTS "/usr/lib32") - # 64 bits machine with 32 bits library in /usr/lib32 - set(32_LD_LIBRARY_PATH /usr/lib32) - else(CMAKE_SIZEOF_VOID_P MATCHES "8" AND EXISTS "/usr/lib32") - # default case - set(32_LD_LIBRARY_PATH /usr/lib) - endif(CMAKE_SIZEOF_VOID_P MATCHES "8" AND EXISTS "/usr/lib32") -endif(Linux) - #------------------------------------------------------------------------------- # Include specific module # BuildParameters Must be done before SearchForStuff diff --git a/cmake/SearchForStuff.cmake b/cmake/SearchForStuff.cmake index 7bc4ad3d8b..003c249b24 100644 --- a/cmake/SearchForStuff.cmake +++ b/cmake/SearchForStuff.cmake @@ -155,10 +155,14 @@ endif(Subversion_FOUND) # Wx if(wxWidgets_FOUND) if(Linux) - # Force the use of 32 bit library - STRING(REGEX REPLACE "/usr/lib/wx" "${32_LD_LIBRARY_PATH}/wx" - wxWidgets_INCLUDE_DIRS "${wxWidgets_INCLUDE_DIRS}") + # Force the use of 32 bit library configuration on + # 64 bits machine with 32 bits library in /usr/lib32 + if(CMAKE_SIZEOF_VOID_P MATCHES "8" AND EXISTS "/usr/lib32") + STRING(REGEX REPLACE "/usr/lib/wx" "/usr/lib32/wx" + wxWidgets_INCLUDE_DIRS "${wxWidgets_INCLUDE_DIRS}") + endif(CMAKE_SIZEOF_VOID_P MATCHES "8" AND EXISTS "/usr/lib32") endif(Linux) + include(${wxWidgets_USE_FILE}) endif(wxWidgets_FOUND) diff --git a/plugins/CDVDiso/src/CMakeLists.txt b/plugins/CDVDiso/src/CMakeLists.txt index 558646e0f3..76a2c43234 100644 --- a/plugins/CDVDiso/src/CMakeLists.txt +++ b/plugins/CDVDiso/src/CMakeLists.txt @@ -12,6 +12,7 @@ set(CommonFlags set(OptimizationFlags -O2 + -DNDEBUG ) # Debug - Build diff --git a/plugins/CDVDnull/CMakeLists.txt b/plugins/CDVDnull/CMakeLists.txt index e7f23b0802..7a21881880 100644 --- a/plugins/CDVDnull/CMakeLists.txt +++ b/plugins/CDVDnull/CMakeLists.txt @@ -11,6 +11,7 @@ set(CommonFlags set(OptimizationFlags -O2 + -DNDEBUG ) # Debug - Build diff --git a/plugins/GSnull/CMakeLists.txt b/plugins/GSnull/CMakeLists.txt index 5566ffcd0b..c1cb569348 100644 --- a/plugins/GSnull/CMakeLists.txt +++ b/plugins/GSnull/CMakeLists.txt @@ -12,6 +12,7 @@ set(CommonFlags set(OptimizationFlags -O2 + -DNDEBUG ) # Debug - Build diff --git a/plugins/PadNull/CMakeLists.txt b/plugins/PadNull/CMakeLists.txt index 3701cdb3ad..c45e305d9e 100644 --- a/plugins/PadNull/CMakeLists.txt +++ b/plugins/PadNull/CMakeLists.txt @@ -11,6 +11,7 @@ set(CommonFlags set(OptimizationFlags -O2 + -DNDEBUG ) # Debug - Build diff --git a/plugins/SPU2null/CMakeLists.txt b/plugins/SPU2null/CMakeLists.txt index 627d7a528d..f9d49df370 100644 --- a/plugins/SPU2null/CMakeLists.txt +++ b/plugins/SPU2null/CMakeLists.txt @@ -11,6 +11,7 @@ set(CommonFlags set(OptimizationFlags -O2 + -DNDEBUG ) # Debug - Build diff --git a/plugins/USBnull/CMakeLists.txt b/plugins/USBnull/CMakeLists.txt index d693d88c03..afcdf651e3 100644 --- a/plugins/USBnull/CMakeLists.txt +++ b/plugins/USBnull/CMakeLists.txt @@ -11,6 +11,7 @@ set(CommonFlags set(OptimizationFlags -O2 + -DNDEBUG ) # Debug - Build diff --git a/plugins/dev9null/CMakeLists.txt b/plugins/dev9null/CMakeLists.txt index d688c56748..39f12d8144 100644 --- a/plugins/dev9null/CMakeLists.txt +++ b/plugins/dev9null/CMakeLists.txt @@ -11,6 +11,7 @@ set(CommonFlags set(OptimizationFlags -O2 + -DNDEBUG ) # Debug - Build diff --git a/plugins/onepad/CMakeLists.txt b/plugins/onepad/CMakeLists.txt index 789205e0a0..ef8b3bac62 100644 --- a/plugins/onepad/CMakeLists.txt +++ b/plugins/onepad/CMakeLists.txt @@ -11,6 +11,7 @@ set(CommonFlags set(OptimizationFlags -O2 + -DNDEBUG ) # Debug - Build diff --git a/plugins/spu2-x/src/CMakeLists.txt b/plugins/spu2-x/src/CMakeLists.txt index a072a18ad6..42fe7b0fec 100644 --- a/plugins/spu2-x/src/CMakeLists.txt +++ b/plugins/spu2-x/src/CMakeLists.txt @@ -21,6 +21,7 @@ set(CommonFlags ) set(OptimizationFlags + -O2 -DNDEBUG ) diff --git a/plugins/zeropad/CMakeLists.txt b/plugins/zeropad/CMakeLists.txt index b5f8dea559..abaf7f0511 100644 --- a/plugins/zeropad/CMakeLists.txt +++ b/plugins/zeropad/CMakeLists.txt @@ -11,6 +11,7 @@ set(CommonFlags set(OptimizationFlags -O2 + -DNDEBUG -fomit-frame-pointer ) diff --git a/plugins/zerospu2/CMakeLists.txt b/plugins/zerospu2/CMakeLists.txt index bf69a16586..958c891a03 100644 --- a/plugins/zerospu2/CMakeLists.txt +++ b/plugins/zerospu2/CMakeLists.txt @@ -12,6 +12,7 @@ set(CommonFlags set(OptimizationFlags -O2 + -DNDEBUG ) # Debug - Build diff --git a/plugins/zzogl-pg/opengl/CMakeLists.txt b/plugins/zzogl-pg/opengl/CMakeLists.txt index 14fe834dde..3fd106a63b 100644 --- a/plugins/zzogl-pg/opengl/CMakeLists.txt +++ b/plugins/zzogl-pg/opengl/CMakeLists.txt @@ -33,6 +33,7 @@ set(CommonFlags set(OptimizationFlags -O2 + -DNDEBUG ) # Debug - Build