Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

png17 must be after image, no need of libzip here; fix freetype2 header.

Browse source
This commit is contained in:
sergiobenrocha2 2015-09-16 01:32:23 -03:00
parent 91ff535272
commit 1c869e4607
2 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ext/native/tools/CMakeLists.txt
View file

@ -27,12 +27,9 @@ include_directories(..)
include_directories(../ext)
include_directories(../math/lin)
include_directories(../image)
include_directories(../ext/libzip)
include_directories(../ext/rg_etc1)
include_directories(../ext/glew)
include_directories(/usr/local/include)
link_directories(/usr/X11R6/lib)
link_directories(/opt/local/lib)
# Horrible horrible hack
@ -47,14 +44,13 @@ add_subdirectory(../file file)
add_subdirectory(../image image)
add_subdirectory(../math math)
add_subdirectory(../util util)
add_subdirectory(../ext/libzip libzip)
add_subdirectory(../ext/rg_etc1 rg_etc1)
add_subdirectory(../ext/stb_image stb_image)
add_subdirectory(../ext/libpng17 png17)
add_executable(atlastool atlastool.cpp)
target_link_libraries(atlastool png17 freetype util image z stb_image rg_etc1 file zip base)
target_link_libraries(atlastool freetype util image png17 z stb_image rg_etc1 file base)
add_executable(zimtool zimtool.cpp)
target_link_libraries(zimtool png17 freetype image z stb_image rg_etc1 file zip base)
target_link_libraries(zimtool freetype image png17 z stb_image rg_etc1 file base)

2
ext/native/tools/atlastool.cpp
View file

@ -18,7 +18,7 @@
// Hackery for our broken path structure
#include <ftbitmap.h>
#else
#include <freetype/ftbitmap.h>
#include <freetype2/ftbitmap.h>
#endif
#include <set>
#include <map>