[cmake]:

* remove the dependency on libportaudiocpp as codeblock. (issue 721)
* Improve build on 64 bit system


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3151 96395faa-99c1-11dd-bbfe-3dabce05a288

3rdparty/SoundTouch/CMakeLists.txt

@@ -3,22 +3,28 @@
 # library name
 set(SoundTouchName SoundTouch)
 
+set(CommonFlags
+    -m32
+    -march=athlon-xp
+    -march=prescott
+    )
+
 # Debug - Build
 if(CMAKE_BUILD_TYPE STREQUAL Debug)
 	# add defines
-	add_definitions(-g -O0 -march=athlon-xp -march=prescott -m32)
+	add_definitions(${CommonFlags} -g -O0)
 endif(CMAKE_BUILD_TYPE STREQUAL Debug)
 
 # Devel - Build
 if(CMAKE_BUILD_TYPE STREQUAL Devel)
 	# add defines
-	add_definitions(-O1 -g -W -march=athlon-xp -march=prescott -m32)
+	add_definitions(${CommonFlags} -O1 -g -W)
 endif(CMAKE_BUILD_TYPE STREQUAL Devel)
 
 # Release - Build
 if(CMAKE_BUILD_TYPE STREQUAL Release)
 	# add defines
-	add_definitions(-fexpensive-optimizations -O3 -Os -W -march=athlon-xp -march=prescott -m32)
+	add_definitions(${CommonFlags} -fexpensive-optimizations -O3 -Os -W)
 endif(CMAKE_BUILD_TYPE STREQUAL Release)
 
 # variable with all sources of this library

3rdparty/bzip2/CMakeLists.txt

@@ -3,22 +3,28 @@
 # library name
 set(bzip2Name bzip2)
 
+set(CommonFlags
+    -m32
+    -march=athlon-xp
+    -march=prescott
+    )
+
 # Debug - Build
 if(CMAKE_BUILD_TYPE STREQUAL Debug)
 	# add defines
-	add_definitions(-g -O0 -march=athlon-xp -march=prescott)
+	add_definitions(${CommonFlags} -g -O0)
 endif(CMAKE_BUILD_TYPE STREQUAL Debug)
 
 # Devel - Build
 if(CMAKE_BUILD_TYPE STREQUAL Devel)
 	# add defines
-	add_definitions(-O1 -g -W -march=athlon-xp -march=prescott)
+	add_definitions(${CommonFlags} -O1 -g -W)
 endif(CMAKE_BUILD_TYPE STREQUAL Devel)
 
 # Release - Build
 if(CMAKE_BUILD_TYPE STREQUAL Release)
 	# add defines
-	add_definitions(-fexpensive-optimizations -O3 -Os -W -march=athlon-xp -march=prescott)
+	add_definitions(${CommonFlags} -fexpensive-optimizations -O3 -Os -W)
 endif(CMAKE_BUILD_TYPE STREQUAL Release)
 
 # variable with all sources of this library

3rdparty/liba52/CMakeLists.txt

@@ -3,22 +3,34 @@
 # library name
 set(a52Name a52)
 
+set(CommonFlags
+    -Wall
+    -m32
+    -g
+    )
+
+set(OptimizationFlags
+    -O2
+    -Os
+    )
+
+
 # Debug - Build
 if(CMAKE_BUILD_TYPE STREQUAL Debug)
 	# add defines
-	add_definitions(-g -Wall)
+	add_definitions(${CommonFlags})
 endif(CMAKE_BUILD_TYPE STREQUAL Debug)
 
 # Devel - Build
 if(CMAKE_BUILD_TYPE STREQUAL Devel)
 	# add defines
-	add_definitions(-O2 -Wall -g -Os)
+	add_definitions(${CommonFlags} ${OptimizationFlags})
 endif(CMAKE_BUILD_TYPE STREQUAL Devel)
 
 # Release - Build
 if(CMAKE_BUILD_TYPE STREQUAL Release)
 	# add defines
-	add_definitions(-O2 -Wall -g -Os)
+	add_definitions(${CommonFlags} ${OptimizationFlags})
 endif(CMAKE_BUILD_TYPE STREQUAL Release)
 
 # variable with all sources of this library

3rdparty/zlib/CMakeLists.txt

@@ -3,54 +3,59 @@
 # library name
 set(zlibName zlib)
 
+set(CommonFlags
+    -W
+    -m32
+    )
+
 # Debug - Build
 if(CMAKE_BUILD_TYPE STREQUAL Debug)
 	# add defines
-	add_definitions(-W -g -O0)
+	add_definitions(${CommonFlags} -g -O0)
 endif(CMAKE_BUILD_TYPE STREQUAL Debug)
 
 # Devel - Build
 if(CMAKE_BUILD_TYPE STREQUAL Devel)
 	# add defines
-	add_definitions(-O2 -W)
+	add_definitions(${CommonFlags} -O2)
 endif(CMAKE_BUILD_TYPE STREQUAL Devel)
 
 # Release - Build
 if(CMAKE_BUILD_TYPE STREQUAL Release)
 	# add defines
-	add_definitions(-fexpensive-optimizations -O3 -W)
+	add_definitions(${CommonFlags} -fexpensive-optimizations -O3)
 endif(CMAKE_BUILD_TYPE STREQUAL Release)
 
 # variable with all sources of this library
 set(zlibSources
-compress.c  
+compress.c
-deflate.c  
+deflate.c
-gzwrite.c  
+gzwrite.c
-trees.c    
+trees.c
 crc32.c
 gzlib.c
-infback.c  
+infback.c
-inftrees.c  
+inftrees.c
-adler32.c    
+adler32.c
-gzclose.c  
+gzclose.c
-gzread.c  
+gzread.c
-inffast.c  
+inffast.c
-inflate.c   
+inflate.c
-uncompr.c 
+uncompr.c
 zutil.c)
 
 # variable with all headers of this library
 set(zlibHeaders
-gzguts.h  
+gzguts.h
-inffast.h   
+inffast.h
-inflate.h   
+inflate.h
-zconf.h      
+zconf.h
 zlib.h
 zutil.h
-deflate.h 
+deflate.h
-inffixed.h  
+inffixed.h
 trees.h
-crc32.h     
+crc32.h
 inftrees.h )
 
 # add library

cmake/FindPortAudio.cmake

@@ -14,8 +14,10 @@ find_path(PORTAUDIO_INCLUDE_DIR portaudio.h)
 
 # finally the library itself
 find_library(libPortAudio NAMES portaudio)
-find_library(libPortAudioCpp NAMES portaudiocpp)
+# Seems to run OK without libportaudiocpp so do not pull additional dependency
-set(PORTAUDIO_LIBRARIES ${libPortAudio} ${libPortAudioCpp})
+# find_library(libPortAudioCpp NAMES portaudiocpp)
+# set(PORTAUDIO_LIBRARIES ${libPortAudio} ${libPortAudioCpp})
+set(PORTAUDIO_LIBRARIES ${libPortAudio})
 
 # handle the QUIETLY and REQUIRED arguments and set PORTAUDIO_FOUND to TRUE if 
 # all listed variables are TRUE

cmake/SearchForStuff.cmake

@@ -16,6 +16,9 @@ detectOperatingSystem()
 SET(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS " ")
 SET(CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS " ")
 
+# Do not search Lib in /usr/lib64. Hope it is not overwritten in find_package or others macro
+SET(FIND_LIBRARY_USE_LIB64_PATHS FALSE)
+
 #-------------------------------------------------------------------------------
 #									FindStuff
 #-------------------------------------------------------------------------------