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

* First pcsx2 commit of, I hope, a long series ;) 

* Fix link with zlib 3rdparty


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3145 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
gregory.hainaut 2010-06-03 10:51:55 +00:00
parent 3b2d424f88
commit 00647fd299
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmake/SearchForStuff.cmake
View File

@ -66,6 +66,7 @@ if(ZLIB_FOUND AND NOT FORCE_INTERNAL_ZLIB)
else(ZLIB_FOUND AND NOT FORCE_INTERNAL_ZLIB) else(ZLIB_FOUND AND NOT FORCE_INTERNAL_ZLIB)
# use project one # use project one
set(projectZLIB TRUE) set(projectZLIB TRUE)
set(ZLIB_LIBRARIES zlib)
endif(ZLIB_FOUND AND NOT FORCE_INTERNAL_ZLIB) endif(ZLIB_FOUND AND NOT FORCE_INTERNAL_ZLIB)
#------------------------------------------------------------ #------------------------------------------------------------
@ -126,7 +127,7 @@ find_package(BZip2)
# if we found bzip2 on the system, # if we found bzip2 on the system,
# use it else use project one # use it else use project one
if(BZIP2_FOUND AND NOT FORCE_INTERNAL_BZIP2) if(BZIP2_FOUND AND NOT FORCE_INTERNAL_BZIP2)
# add zlib include directories # add bzip include directories
include_directories(${BZIP2_INCLUDE_DIR}) include_directories(${BZIP2_INCLUDE_DIR})
else(BZIP2_FOUND AND NOT FORCE_INTERNAL_BZIP2) else(BZIP2_FOUND AND NOT FORCE_INTERNAL_BZIP2)
# use project one # use project one