AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-08 11:44:55 +00:00
Code Issues Projects Releases Wiki Activity

Small fixes to workflows, bintoc/shaderc, CMakePresets

Browse Source
This commit is contained in:
Luke Street
2021-06-11 22:57:38 -04:00
parent 6716bb1c93
commit 7bb6b06e2d
5 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hecl/bintoc/CMakeLists.txt
View File

@@ -3,7 +3,7 @@ cmake_policy(VERSION 3.15...3.20)
project(bintoc LANGUAGES C)
add_executable(bintoc bintoc.c)
add_subdirectory(../../extern/athena/extern/zlib zlib)
add_subdirectory(../../extern/athena/extern/zlib zlib EXCLUDE_FROM_ALL)
target_link_libraries(bintoc PRIVATE ${ZLIB_LIBRARIES})
target_include_directories(bintoc PRIVATE ${ZLIB_INCLUDE_DIR})

6
hecl/shaderc/CMakeLists.txt
View File

@@ -73,8 +73,8 @@ endif ()
set(CMAKE_SKIP_INSTALL_ALL_DEPENDENCY true)
add_custom_target(atdna) # avoid building
add_subdirectory(../../extern/athena athena)
add_subdirectory(../../extern/boo boo)
add_subdirectory(../../extern/athena athena EXCLUDE_FROM_ALL)
add_subdirectory(../../extern/boo boo EXCLUDE_FROM_ALL)
add_library(hecl-compilers ../lib/Compilers.cpp ../lib/WideStringConvert.cpp)
get_target_property(BOO_INCLUDES boo INTERFACE_INCLUDE_DIRECTORIES)
@@ -96,4 +96,4 @@ if (NOT WIN32)
endif()
endif()
install(TARGETS shaderc DESTINATION bin)
install(TARGETS shaderc DESTINATION bin)