Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-10-07 19:03:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix atlas tool on linux

Browse Source
This commit is contained in:
iota97 2021-09-17 15:13:35 +02:00
parent cd05f3ad29
commit 3534df0d5e
3 changed files with 16 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ext/native/tools/.gitignore vendored
View File

@ -2,3 +2,8 @@ Release
Debug
build
*.VC*
Makefile
CMakeFiles
CMakeCache.txt
cmake_install.cmake
png17/

30
ext/native/tools/CMakeLists.txt
View File

@ -10,24 +10,21 @@ add_definitions(-fno-strict-aliasing)
#add_definitions(-fopenmp)
if(IOS)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libstdc++")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libstdc++ -DMAX_LOGLEVEL=-1")
elseif(APPLE)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++ -mmacosx-version-min=10.7")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++ -mmacosx-version-min=10.7 -DMAX_LOGLEVEL=-1")
endif()
if(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.7.0)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -DMAX_LOGLEVEL=-1")
else()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -DMAX_LOGLEVEL=-1")
endif()
# add_definitions(-fstrict-aliasing)
include_directories(..)
include_directories(../ext)
include_directories(../math/lin)
include_directories(../image)
include_directories(/usr/local/include)
include_directories(../..)
include_directories(../../..)
link_directories(/opt/local/lib)
@ -38,17 +35,10 @@ include_directories(/usr/local/include/freetype2)
include_directories(/opt/local/include/freetype2)
include_directories(/opt/local/include)
add_subdirectory(../base base)
add_subdirectory(../gfx gfx)
add_subdirectory(../file file)
add_subdirectory(../image image)
add_subdirectory(../math math)
add_subdirectory(../util util)
add_subdirectory(../ext/libpng17 png17)
add_subdirectory(../../libpng17 png17)
add_executable(build/atlastool atlastool.cpp ../../../Common/Data/Format/PNGLoad.cpp ../../../Common/Data/Encoding/Utf8.cpp ../../../Common/Data/Format/ZIMSave.cpp)
target_link_libraries(build/atlastool freetype util png17 z zstd)
add_executable(atlastool atlastool.cpp)
target_link_libraries(atlastool freetype util image png17 z file base)
add_executable(zimtool zimtool.cpp)
target_link_libraries(zimtool freetype image png17 z file base)
#add_executable(zimtool zimtool.cpp)
#target_link_libraries(zimtool freetype image png17 z file base)

2
ext/native/tools/b.sh
View File

@ -1,3 +1,3 @@
mkdir -p build
(cd build; cmake .. && make -j5; cd ..)
(cmake CMakeLists.txt && make -j5)
#cp build/atlastool /home/henrik/bin