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

[cmake] 

* Add missing file
* Use a default option for FORCE_INTERNAL_SOUNDTOUCH instead of a hardcoded one
* Some cleaning


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3156 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
gregory.hainaut 2010-06-04 20:35:02 +00:00
parent f219b79ad4
commit 86a7a85b99
4 changed files with 32 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
CMakeLists.txt
View File

@ -1,30 +1,39 @@
# Project Name
project(Pcsx2)
# need cmake version >=2.6
cmake_minimum_required(VERSION 2.6)
# set module path
set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
# include some generic functions
include(Pcsx2Utils)
# Detect current OS
detectOperatingSystem()
# These lines remove some defaults options that can cause some failure later.
# In particular, it remove the build option -rdynamic on pcsx2
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 (UNIX)
if (CMAKE_SIZEOF_VOID_P MATCHES "8" AND EXISTS "/usr/lib32")
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")
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 (UNIX)
# set module path
set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
endif(CMAKE_SIZEOF_VOID_P MATCHES "8" AND EXISTS "/usr/lib32")
endif(Linux)
#-------------------------------------------------------------------------------
# include modules
include(Pcsx2Utils)
# Include specific module
# BuildParameters Must be done before SearchForStuff
include(BuildParameters)
# SearchForStuff be done before SelectPcsx2Plugins

20
cmake/BuildParameters.cmake
View File

@ -12,10 +12,10 @@
#-------------------------------------------------------------------------------
# if no build type is set, use Devel as default
#-------------------------------------------------------------------------------
if(CMAKE_BUILD_TYPE STREQUAL "")
if(NOT DEFINED CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE Devel)
message(STATUS "BuildType set to ${CMAKE_BUILD_TYPE} by default")
endif(CMAKE_BUILD_TYPE STREQUAL "")
endif(NOT DEFINED CMAKE_BUILD_TYPE)
#-------------------------------------------------------------------------------
#-------------------------------------------------------------------------------
@ -31,13 +31,9 @@ if(NOT DEFINED CMAKE_BUILD_STRIP)
endif(CMAKE_BUILD_TYPE STREQUAL "Release")
endif(NOT DEFINED CMAKE_BUILD_STRIP)
#-------------------------------------------------------------------------------
# There have been issues in the past with sound quality depending on the version
# of Soundtouch, so for the moment, we'll use the internal version.
set(FORCE_INTERNAL_SOUNDTOUCH TRUE)
#-------------------------------------------------------------------------------
# Select library system vs 3rdparty
#-------------------------------------------------------------------------------
if(FORCE_INTERNAL_ALL)
set(FORCE_INTERNAL_A52 TRUE)
set(FORCE_INTERNAL_BZIP2 TRUE)
@ -54,7 +50,11 @@ if(NOT DEFINED FORCE_INTERNAL_BZIP2)
endif(NOT DEFINED FORCE_INTERNAL_BZIP2)
if(NOT DEFINED FORCE_INTERNAL_SOUNDTOUCH)
set(FORCE_INTERNAL_SOUNDTOUCH FALSE)
set(FORCE_INTERNAL_SOUNDTOUCH TRUE)
message(STATUS "Use internal version of Soundtouch by default.
Note: There have been issues in the past with sound quality depending on the version of Soundtouch
Use -DFORCE_INTERNAL_SOUNDTOUCH=FALSE at your own risk")
# set(FORCE_INTERNAL_SOUNDTOUCH FALSE)
endif(NOT DEFINED FORCE_INTERNAL_SOUNDTOUCH)
if(NOT DEFINED FORCE_INTERNAL_ZLIB)

18
cmake/SearchForStuff.cmake
View File

@ -1,21 +1,3 @@
# Search for additional software.
#-------------------------------------------------------------------------------
# Minmal required version of libraries
#-------------------------------------------------------------------------------
set(minimal_wxWidgets_version 2.8.0)
set(minimal_GTK2_version 2.10)
set(minimal_SDL_version 1.2)
# to set the proper dependencies and decide which plugins should be build we
# need to know on which OS we are currenty working/running
detectOperatingSystem()
# These lines remove some defaults options that can cause some failure later.
# In particular, it remove the build option -rdynamic
SET(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS " ")
SET(CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS " ")
#-------------------------------------------------------------------------------
# Search all libraries on the system
#-------------------------------------------------------------------------------

2
pcsx2/CMakeLists.txt
View File

@ -121,6 +121,7 @@ set(pcsx2Sources
COP0.cpp
COP2.cpp
Counters.cpp
DataBase_Loader.cpp
Dump.cpp
Elfheader.cpp
FiFo.cpp
@ -330,6 +331,7 @@ set(pcsx2GuiSources
gui/Panels/BiosSelectorPanel.cpp
gui/Panels/CpuPanel.cpp
gui/Panels/DirPickerPanel.cpp
gui/Panels/GameDatabasePanel.cpp
gui/Panels/GameFixesPanel.cpp
gui/Panels/GSWindowPanel.cpp
gui/Panels/LogOptionsPanels.cpp