AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/AxioDL/hecl

This commit is contained in:
Jack Andersen 2015-11-22 13:49:33 -10:00
parent ef8d3c32ab f1f2e9c924
commit 2c7df0b4de
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hecl/extern/libpng/CMakeLists.txt vendored
View File

@ -2,7 +2,7 @@ if(NOT WIN32 AND NOT APPLE)
find_library(PNG_LIB png)
endif()
if(WIN32 OR APPLE OR PNG_LIB STREQUAL PNG_LIB-NOTFOUND)
#if(WIN32 OR APPLE OR PNG_LIB STREQUAL PNG_LIB-NOTFOUND)
message(STATUS "Using HECL's built-in libpng")
include_directories(${ZLIB_INCLUDE_DIR})
add_library(png
@ -33,6 +33,6 @@ add_library(png
set(PNG_LIB png CACHE PATH "PNG library" FORCE)
set(LIBPNG_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR} CACHE PATH "PNG include path" FORCE)
else()
find_path(LIBPNG_INCLUDE_DIR png.h)
endif()
#else()
#find_path(LIBPNG_INCLUDE_DIR png.h)
#endif()

4
hecl/include/HECL/Runtime.hpp
View File

@ -25,6 +25,10 @@ class FileStoreManager
public:
FileStoreManager(const SystemString& domain);
const SystemString& getDomain() const {return m_domain;}
/**
* @brief Returns the full path to the file store, including domain
* @return Full path to store e.g /home/foo/.hecl/bar
*/
const SystemString& getStoreRoot() const {return m_storeRoot;}
};