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

Fix the cmake build of zlib, and force use of the internal copies of a few of the libraries for the moment. (If the cmake build starts working properly, I'll probably reverse that, but for the moment I want them as similar as possible.) 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2946 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
arcum42 2010-05-04 20:28:34 +00:00
parent af13fec64a
commit dfb301c1ba
2 changed files with 41 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
3rdparty/zlib/CMakeLists.txt vendored
View File

@ -23,31 +23,35 @@ endif(CMAKE_BUILD_TYPE STREQUAL Release)
# variable with all sources of this library
set(zlibSources
adler32.c
compress.c
crc32.c
deflate.c
gzio.c
gzwrite.c
trees.c
crc32.c
gzlib.c
infback.c
inftrees.c
adler32.c
gzclose.c
gzread.c
inffast.c
inflate.c
inftrees.c
trees.c
uncompr.c
zutil.c)
# variable with all headers of this library
set(zlibHeaders
crc32.h
deflate.h
gzguts.h
inffast.h
inffixed.h
inflate.h
inftrees.h
trees.h
zconf.h
zlib.h
zutil.h)
zutil.h
deflate.h
inffixed.h
trees.h
crc32.h
inftrees.h )
# add library
add_library(${zlibName} STATIC ${zlibSources} ${zlibHeaders})

30
cmake/SearchForStuff.cmake
View File

@ -52,13 +52,13 @@ endif(wxWidgets_FOUND)
find_package(ZLIB)
# if we found zlib on the system, use it else use project one
if(ZLIB_FOUND)
# add zlib include directories
include_directories(${ZLIB_INCLUDE_DIRS})
else(ZLIB_FOUND)
#if(ZLIB_FOUND)
# # add zlib include directories
# include_directories(${ZLIB_INCLUDE_DIRS})
#else(ZLIB_FOUND)
# use project one
set(projectZLIB TRUE)
endif(ZLIB_FOUND)
#endif(ZLIB_FOUND)
#------------------------------------------------------------
@ -102,13 +102,13 @@ find_package(BZip2)
# if we found bzip2 on the system,
# use it else use project one
if(BZIP2_FOUND)
# add zlib include directories
include_directories(${BZIP2_INCLUDE_DIR})
else(BZIP2_FOUND)
#if(BZIP2_FOUND)
# # add zlib include directories
# include_directories(${BZIP2_INCLUDE_DIR})
#else(BZIP2_FOUND)
# use project one
set(projectBZip2 TRUE)
endif(BZIP2_FOUND)
#endif(BZIP2_FOUND)
#------------------------------------------------------------
@ -172,16 +172,16 @@ endif(SDL_FOUND)
#include(${PROJECT_SOURCE_DIR}/cmake/FindSoundTouch.cmake)
# found SoundTouch
if(SOUNDTOUCH_FOUND)
# add SoundTouch include directories
include_directories(${SOUNDTOUCH_INCLUDE_DIR})
else(SOUNDTOUCH_FOUND)
#if(SOUNDTOUCH_FOUND)
# # add SoundTouch include directories
# include_directories(${SOUNDTOUCH_INCLUDE_DIR})
#else(SOUNDTOUCH_FOUND)
# use project one
set(projectSoundTouch TRUE)
# found
set(SOUNDTOUCH_FOUND TRUE)
endif(SOUNDTOUCH_FOUND)
#endif(SOUNDTOUCH_FOUND)
#------------------------------------------------------------