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

OS X in-tree build fixes

This commit is contained in:
Jack Andersen 2015-09-02 08:52:04 -10:00
parent 4bf4834b86
commit 1091f93536
7 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hecl/CMakeLists.txt
View File

@ -1,4 +1,4 @@
if(NOT HECL_SUBPORJECT) if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
cmake_minimum_required(VERSION 3.0) cmake_minimum_required(VERSION 3.0)
project(hecl) project(hecl)
if(MSVC) if(MSVC)

3
hecl/driver/CMakeLists.txt
View File

@ -27,5 +27,4 @@ endif()
target_link_libraries(hecl target_link_libraries(hecl
${DATA_SPEC_LIBS} ${DATA_SPEC_LIBS}
HECLDatabase HECLBlender HECLCommon AthenaCore NOD HECLDatabase HECLBlender HECLCommon AthenaCore NOD
LogVisor AthenaLibYaml png squish blowfish z lzo2 ${PLAT_LIBS} LogVisor AthenaLibYaml ${PNG_LIB} squish blowfish ${ZLIB_LIBRARIES} ${LZO_LIB} ${PLAT_LIBS})
)

2
hecl/extern/Athena vendored

@ -1 +1 @@
Subproject commit 4a4962424dc8c87c68dc9696c4c13a7e8d09d9a7 Subproject commit a16fd798383763b7bb5802b8c4d89ac5d45987e9

2
hecl/extern/CMakeLists.txt vendored
View File

@ -1,5 +1,5 @@
add_subdirectory(libSquish) add_subdirectory(libSquish)
add_subdirectory(blowfish) add_subdirectory(blowfish)
add_subdirectory(LogVisor) add_subdirectory(LogVisor)
add_subdirectory(Athena EXCLUDE_FROM_ALL) add_subdirectory(Athena)
add_subdirectory(libpng) add_subdirectory(libpng)

2
hecl/extern/LogVisor vendored

@ -1 +1 @@
Subproject commit 317e75c22e31746947bd1b3700cd72d53c97c837 Subproject commit 7be764c387951cabfc86d52f48bd3dab54127aeb

2
hecl/extern/libSquish vendored

@ -1 +1 @@
Subproject commit 41ec8243053b3f2ac51c359292666380a223108a Subproject commit b3bbfee51d3f01debbb6b09cbf80897c31f135c1

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

@ -30,5 +30,9 @@ add_library(png
pngwtran.c pngwtran.c
pngwutil.c) pngwutil.c)
set(PNG_LIB png CACHE PATH "PNG library" FORCE)
set(LIBPNG_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR} CACHE PATH "PNG include path" FORCE) set(LIBPNG_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR} CACHE PATH "PNG include path" FORCE)
else()
find_path(LIBPNG_INCLUDE_DIR png.h)
endif() endif()