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

Buildfix, bugfix

Browse source
This commit is contained in:
Henrik Rydgård 2012-10-28 11:47:26 +01:00
parent 60d3b5f601
commit ef01fc2121
3 changed files with 20 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
file/file_util.cpp
View file

@ -187,5 +187,10 @@ std::string getDir(const std::string &path)
{
if (cutpath[i] == '\\') cutpath[i] = '/';
}
#ifndef _WIN32
if (!cutpath.size()) {
return "/";
}
#endif
return cutpath;
}

33
tools/CMakeLists.txt
View file

@ -3,9 +3,6 @@ cmake_minimum_required(VERSION 2.6)
project (Tools)
find_package(PNG REQUIRED)
add_definitions(-g)
add_definitions(-O2)
add_definitions(-Wall)
add_definitions(-DSDL)
@ -14,12 +11,11 @@ add_definitions(-fno-strict-aliasing)
add_definitions(-fopenmp)
# add_definitions(-fstrict-aliasing)
include_directories(../native)
include_directories(../native/base)
include_directories(../native/math/lin)
include_directories(../native/image)
include_directories(../native/ext/libzip)
include_directories(../native/ext/etcpack)
include_directories(..)
include_directories(../math/lin)
include_directories(../image)
include_directories(../ext/libzip)
include_directories(../ext/etcpack)
include_directories(/usr/local/include)
include_directories(${PNG_INCLUDE_DIR})
@ -31,17 +27,18 @@ include_directories(/usr/include/freetype2)
include_directories(/usr/local/include/freetype2)
include_directories(/opt/local/include/freetype2)
add_subdirectory(../native/base base)
add_subdirectory(../native/gfx gfx)
add_subdirectory(../native/file file)
add_subdirectory(../native/image image)
add_subdirectory(../native/math math)
add_subdirectory(../native/ext/libzip libzip)
add_subdirectory(../native/ext/etcpack etcpack)
add_subdirectory(../base base)
add_subdirectory(../gfx gfx)
add_subdirectory(../file file)
add_subdirectory(../image image)
add_subdirectory(../math math)
add_subdirectory(../ext/libzip libzip)
add_subdirectory(../ext/etcpack etcpack)
add_subdirectory(../ext/stb_image stb_image)
add_executable(atlastool atlastool.cpp)
target_link_libraries(atlastool ${PNG_LIBRARY} freetype z image etcpack etcdec file zip gomp)
target_link_libraries(atlastool ${PNG_LIBRARY} freetype z image stb_image etcpack etcdec file zip gomp)
add_executable(zimtool zimtool.cpp)
target_link_libraries(zimtool ${PNG_LIBRARY} freetype z image etcpack etcdec file zip gomp)
target_link_libraries(zimtool ${PNG_LIBRARY} freetype z image stb_image etcpack etcdec file zip gomp)

0
tools/b.sh Normal file → Executable file
View file