libretro/ppsspp
1
0
Fork 0
mirror of https://github.com/libretro/ppsspp.git synced 2024-11-24 16:49:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into win32-gl-ui

Browse Source 
Conflicts:
	Qt/Native.pro
This commit is contained in:
Henrik Rydgard 2013-03-29 23:12:37 +01:00
commit f02e682021
3 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
CMakeLists.txt
View File

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

2
Qt/Native.pro
View File

@ -17,7 +17,7 @@ x86:!mobile_platform: {
HEADERS += ../native/base/backtrace.h
}
# EtcPack
# RG_ETC
SOURCES += ../native/ext/rg_etc1/rg_etc1.cpp
HEADERS += ../native/ext/rg_etc1/rg_etc1.h

2
Windows/WndMainWindow.cpp
View File

@ -560,7 +560,7 @@ namespace MainWindow
mojs ^= 1;
//SetSkinMode(mojs);
}
break;
return 0;
case WM_DROPFILES:
{
HDROP hdrop = (HDROP)wParam;