[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

@@ -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

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)
 

plugins/CDVDiso/src/CMakeLists.txt

@@ -12,6 +12,7 @@ set(CommonFlags
 
 set(OptimizationFlags
     -O2
+    -DNDEBUG
     )
 
 # Debug - Build

plugins/CDVDnull/CMakeLists.txt

@@ -11,6 +11,7 @@ set(CommonFlags
 
 set(OptimizationFlags
     -O2
+    -DNDEBUG
     )
 
 # Debug - Build

plugins/GSnull/CMakeLists.txt

@@ -12,6 +12,7 @@ set(CommonFlags
 
 set(OptimizationFlags
     -O2
+    -DNDEBUG
     )
 
 # Debug - Build

plugins/PadNull/CMakeLists.txt

@@ -11,6 +11,7 @@ set(CommonFlags
 
 set(OptimizationFlags
     -O2
+    -DNDEBUG
     )
 
 # Debug - Build

plugins/SPU2null/CMakeLists.txt

@@ -11,6 +11,7 @@ set(CommonFlags
 
 set(OptimizationFlags
     -O2
+    -DNDEBUG
     )
 
 # Debug - Build

plugins/USBnull/CMakeLists.txt

@@ -11,6 +11,7 @@ set(CommonFlags
 
 set(OptimizationFlags
     -O2
+    -DNDEBUG
     )
 
 # Debug - Build

plugins/dev9null/CMakeLists.txt

@@ -11,6 +11,7 @@ set(CommonFlags
 
 set(OptimizationFlags
     -O2
+    -DNDEBUG
     )
 
 # Debug - Build

plugins/onepad/CMakeLists.txt

@@ -11,6 +11,7 @@ set(CommonFlags
 
 set(OptimizationFlags
     -O2
+    -DNDEBUG
     )
 
 # Debug - Build

plugins/spu2-x/src/CMakeLists.txt

@@ -21,6 +21,7 @@ set(CommonFlags
     )
 
 set(OptimizationFlags
+    -O2
     -DNDEBUG
     )
 

plugins/zeropad/CMakeLists.txt

@@ -11,6 +11,7 @@ set(CommonFlags
 
 set(OptimizationFlags
     -O2
+    -DNDEBUG
     -fomit-frame-pointer
     )
 

plugins/zerospu2/CMakeLists.txt

@@ -12,6 +12,7 @@ set(CommonFlags
 
 set(OptimizationFlags
     -O2
+    -DNDEBUG
     )
 
 # Debug - Build

plugins/zzogl-pg/opengl/CMakeLists.txt

@@ -33,6 +33,7 @@ set(CommonFlags
 
 set(OptimizationFlags
     -O2
+    -DNDEBUG
     )
 
 # Debug - Build