diff options
| author | briaguya <70942617+briaguya-ai@users.noreply.github.com> | 2024-05-01 22:25:33 -0400 |
|---|---|---|
| committer | Adam Bird <archez39@me.com> | 2024-05-02 22:28:56 -0400 |
| commit | 15b7b3c8a799c861993de122795fa4931a329727 (patch) | |
| tree | 3579e9fc27dc625004fc2c507747e6725eb89e48 /ZAPD/CMakeLists.txt | |
| parent | d7e991526585d12a26ac6e17e16541bcdf668cba (diff) | |
detangle utils (#21)
(cherry picked from commit 222cb8a23bd0fa8b901b1654ac5d6cc2ecb25a2e)
Diffstat (limited to 'ZAPD/CMakeLists.txt')
| -rw-r--r-- | ZAPD/CMakeLists.txt | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/ZAPD/CMakeLists.txt b/ZAPD/CMakeLists.txt index 12be637..800fc20 100644 --- a/ZAPD/CMakeLists.txt +++ b/ZAPD/CMakeLists.txt @@ -234,6 +234,12 @@ set(Source_Files__Z64__ZRoom__Commands )
source_group("Source Files\\Z64\\ZRoom\\Commands" FILES ${Source_Files__Z64__ZRoom__Commands})
+file(GLOB Source_Files__Utils RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "Utils/*.c" "Utils/*.cpp")
+source_group("Source Files\\Utils" FILES ${Source_Files__Utils})
+
+file(GLOB Header_Files__Utils RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "Utils/*.h")
+source_group("Header Files\\Utils" FILES ${Header_Files__Utils})
+
set(ALL_FILES
${Header_Files}
${Header_Files__Libraries}
@@ -242,6 +248,7 @@ set(ALL_FILES ${Header_Files__Z64}
${Header_Files__Z64__ZRoom}
${Header_Files__Z64__ZRoom__Commands}
+ ${Header_Files__Utils}
${Resource_Files}
${Source_Files}
${Source_Files__Libraries__libgfxd}
@@ -249,6 +256,7 @@ set(ALL_FILES ${Source_Files__Z64}
${Source_Files__Z64__ZRoom}
${Source_Files__Z64__ZRoom__Commands}
+ ${Source_Files__Utils}
${any__any}
)
@@ -339,10 +347,8 @@ endif() find_package(PNG REQUIRED)
target_include_directories(${PROJECT_NAME} PRIVATE
- ${CMAKE_CURRENT_SOURCE_DIR}/../../libultraship/extern/ZAPDUtils
${CMAKE_CURRENT_SOURCE_DIR}/../../libultraship/src/resource
${CMAKE_CURRENT_SOURCE_DIR}/../../libultraship/include
- ${CMAKE_CURRENT_SOURCE_DIR}/../../ZAPDTR/lib/tinyxml2
${CMAKE_CURRENT_SOURCE_DIR}/../../ZAPDTR/lib/libgfxd
${PNG_PNG_INCLUDE_DIR}/
.
@@ -438,7 +444,6 @@ endif() ################################################################################
add_dependencies(${PROJECT_NAME}
OTRExporter
- ZAPDUtils
libultraship
)
@@ -446,7 +451,6 @@ if (CMAKE_SYSTEM_NAME STREQUAL "Windows") if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64")
set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
set(ADDITIONAL_LIBRARY_DEPENDENCIES
- "ZAPDUtils;"
"-WHOLEARCHIVE:$<TARGET_LINKER_FILE_DIR:OTRExporter>/$<TARGET_LINKER_FILE_NAME:OTRExporter>"
"libultraship;"
storm
@@ -457,7 +461,6 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin") set(THREADS_PREFER_PTHREAD_FLAG ON)
find_package(Threads REQUIRED)
set(ADDITIONAL_LIBRARY_DEPENDENCIES
- "ZAPDUtils;"
-Wl,-force_load $<TARGET_LINKER_FILE_DIR:OTRExporter>/$<TARGET_LINKER_FILE_NAME:OTRExporter>
"libultraship;"
PNG::PNG
@@ -468,7 +471,6 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "NintendoSwitch") set(THREADS_PREFER_PTHREAD_FLAG ON)
find_package(Threads REQUIRED)
set(ADDITIONAL_LIBRARY_DEPENDENCIES
- "ZAPDUtils;"
-Wl,--whole-archive $<TARGET_LINKER_FILE_DIR:OTRExporter>/$<TARGET_LINKER_FILE_NAME:OTRExporter> -Wl,--no-whole-archive
"libultraship;"
PNG::PNG
@@ -476,7 +478,6 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "NintendoSwitch") )
elseif(CMAKE_SYSTEM_NAME STREQUAL "CafeOS")
set(ADDITIONAL_LIBRARY_DEPENDENCIES
- "ZAPDUtils;"
"libultraship;"
PNG::PNG
)
@@ -484,7 +485,6 @@ else() set(THREADS_PREFER_PTHREAD_FLAG ON)
find_package(Threads REQUIRED)
set(ADDITIONAL_LIBRARY_DEPENDENCIES
- "ZAPDUtils;"
-Wl,--whole-archive $<TARGET_LINKER_FILE_DIR:OTRExporter>/$<TARGET_LINKER_FILE_NAME:OTRExporter> -Wl,--no-whole-archive
"libultraship;"
PNG::PNG
|