Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-11-23 13:30:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

CMakelist update

Browse Source
This commit is contained in:
Henrik Rydgard 2013-03-30 00:10:18 +01:00
parent 2b5d9fec5b
commit 9740d71a1f
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -313,7 +313,7 @@ add_library(snappy STATIC
) )
include_directories(ext/snappy) include_directories(ext/snappy)
add_library(rg_etc STATIC add_library(rg_etc1 STATIC
native/ext/rg_etc1/rg_etc1.cpp native/ext/rg_etc1/rg_etc1.cpp
native/ext/rg_etc1/rg_etc1.h) native/ext/rg_etc1/rg_etc1.h)
include_directories(native/ext/rg_etc1) include_directories(native/ext/rg_etc1)
@ -598,7 +598,7 @@ add_library(native STATIC
include_directories(native) include_directories(native)
# rapidxml is headers only so we can't make a lib specific for it # rapidxml is headers only so we can't make a lib specific for it
include_directories(native/ext/rapidxml) include_directories(native/ext/rapidxml)
target_link_libraries(native ${LIBZIP} rg_etc sha1 stb_image stb_vorbis #vjson target_link_libraries(native ${LIBZIP} rg_etc1 sha1 stb_image stb_vorbis #vjson
zlib snappy ${GLEW_LIBRARIES}) zlib snappy ${GLEW_LIBRARIES})
if(ANDROID) if(ANDROID)
target_link_libraries(native log) target_link_libraries(native log)

2
native

@ -1 +1 @@
Subproject commit 4f5a60d82b38dbb609084782211a272b9e4e53fb Subproject commit 4ffc4f0415c2b2efa79c900fa61da78d61411797