Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-11-28 07:50:49 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #67 from mvdan/master

Browse Source 
Try getting native/tools to build
This commit is contained in:
Henrik Rydgård 2013-04-25 05:13:49 -07:00
commit a5cc57c2d1
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
base/CMakeLists.txt
View File

@ -1,7 +1,7 @@
set(SRCS set(SRCS
colorutil.cpp colorutil.cpp
timeutil.cpp timeutil.cpp
threadutil.cpp ../thread/threadutil.cpp
error_context.cpp error_context.cpp
display.cpp display.cpp
buffer.cpp) buffer.cpp)

9
tools/CMakeLists.txt
View File

@ -9,13 +9,14 @@ add_definitions(-DSDL)
add_definitions(-Wno-multichar) add_definitions(-Wno-multichar)
add_definitions(-fno-strict-aliasing) add_definitions(-fno-strict-aliasing)
add_definitions(-fopenmp) add_definitions(-fopenmp)
add_definitions(-std=c++11)
# add_definitions(-fstrict-aliasing) # add_definitions(-fstrict-aliasing)
include_directories(..) include_directories(..)
include_directories(../math/lin) include_directories(../math/lin)
include_directories(../image) include_directories(../image)
include_directories(../ext/libzip) include_directories(../ext/libzip)
include_directories(../ext/etcpack) include_directories(../ext/rg_etc1)
include_directories(/usr/local/include) include_directories(/usr/local/include)
include_directories(${PNG_INCLUDE_DIR}) include_directories(${PNG_INCLUDE_DIR})
@ -33,12 +34,12 @@ add_subdirectory(../file file)
add_subdirectory(../image image) add_subdirectory(../image image)
add_subdirectory(../math math) add_subdirectory(../math math)
add_subdirectory(../ext/libzip libzip) add_subdirectory(../ext/libzip libzip)
add_subdirectory(../ext/etcpack etcpack) add_subdirectory(../ext/rg_etc1 rg_etc1)
add_subdirectory(../ext/stb_image stb_image) add_subdirectory(../ext/stb_image stb_image)
add_executable(atlastool atlastool.cpp) add_executable(atlastool atlastool.cpp)
target_link_libraries(atlastool ${PNG_LIBRARY} freetype z image stb_image etcpack etcdec file zip gomp) target_link_libraries(atlastool ${PNG_LIBRARY} freetype z image stb_image rg_etc1 file zip gomp)
add_executable(zimtool zimtool.cpp) add_executable(zimtool zimtool.cpp)
target_link_libraries(zimtool ${PNG_LIBRARY} freetype z image stb_image etcpack etcdec file zip gomp) target_link_libraries(zimtool ${PNG_LIBRARY} freetype z image stb_image rg_etc1 file zip gomp)