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

Avoid duplicate athena/extern/zlib import

This commit is contained in:
Luke Street 2020-03-04 02:35:32 -05:00
parent 3d0451a496
commit e4a775f18e
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hecl/CMakeLists.txt
View File

@ -46,6 +46,7 @@ endforeach()
configure_file(include/hecl/ApplicationReps.hpp.in ${CMAKE_CURRENT_BINARY_DIR}/ApplicationReps.hpp @ONLY) configure_file(include/hecl/ApplicationReps.hpp.in ${CMAKE_CURRENT_BINARY_DIR}/ApplicationReps.hpp @ONLY)
add_subdirectory(extern)
add_subdirectory(bintoc) add_subdirectory(bintoc)
if(NOT TARGET bintoc) if(NOT TARGET bintoc)
@ -53,8 +54,6 @@ if(NOT TARGET bintoc)
find_package(hecl-bintoc REQUIRED) find_package(hecl-bintoc REQUIRED)
endif() endif()
add_subdirectory(extern)
if(NOT TARGET atdna) if(NOT TARGET atdna)
# Import native atdna if cross-compiling # Import native atdna if cross-compiling
find_package(atdna REQUIRED) find_package(atdna REQUIRED)

1
hecl/bintoc/CMakeLists.txt
View File

@ -1,5 +1,4 @@
if(NOT CMAKE_CROSSCOMPILING) if(NOT CMAKE_CROSSCOMPILING)
add_subdirectory(../extern/athena/extern/zlib zlib)
add_executable(bintoc bintoc.c) add_executable(bintoc bintoc.c)
target_link_libraries(bintoc ${ZLIB_LIBRARIES}) target_link_libraries(bintoc ${ZLIB_LIBRARIES})
function(bintoc out in sym) function(bintoc out in sym)