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

Properly depend on zlib

This commit is contained in:
Henrique Gemignani Passos Lima 2022-03-15 01:48:08 +02:00
parent ec5f188063
commit 74c08aa486
No known key found for this signature in database
GPG Key ID: E224F951761145F8
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -332,10 +332,8 @@ if(USE_LD_GOLD)
endif() endif()
endif() endif()
if (NOT WIN32) find_package(ZLIB REQUIRED)
find_package(ZLIB REQUIRED) set(ZLIB_LIBRARIES ZLIB::ZLIB CACHE STRING "zlib libraries" FORCE)
set(ZLIB_LIBRARIES ZLIB::ZLIB CACHE STRING "zlib libraries" FORCE)
endif()
include(ExternalProject) include(ExternalProject)
ExternalProject_Add(bintoc ExternalProject_Add(bintoc

1
Runtime/CMakeLists.txt
View File

@ -149,6 +149,7 @@ endfunction()
set(RUNTIME_INCLUDES ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR}) set(RUNTIME_INCLUDES ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR})
set(RUNTIME_LIBRARIES amuse zeus nod NESEmulator libjpeg-turbo jbus kabufuda discord-rpc logvisor OptickCore imgui aurora SDL2-static set(RUNTIME_LIBRARIES amuse zeus nod NESEmulator libjpeg-turbo jbus kabufuda discord-rpc logvisor OptickCore imgui aurora SDL2-static
boo # TODO move audiodev boo # TODO move audiodev
${ZLIB_LIBRARIES}
) )
add_runtime_common_library(RuntimeCommon ${RUNTIME_SOURCES_A}) add_runtime_common_library(RuntimeCommon ${RUNTIME_SOURCES_A})

2
imgui/CMakeLists.txt
View File

@ -17,7 +17,7 @@ if (CMAKE_COMPILER_IS_GNUCXX)
# currently explicitly ignored for clang in imgui code, but not gcc (yet) # currently explicitly ignored for clang in imgui code, but not gcc (yet)
target_compile_options(imgui PRIVATE -Wno-deprecated-enum-enum-conversion) target_compile_options(imgui PRIVATE -Wno-deprecated-enum-enum-conversion)
endif() endif()
target_link_libraries(imgui PRIVATE aurora zeus logvisor) target_link_libraries(imgui PRIVATE aurora zeus logvisor ${ZLIB_LIBRARIES})
# Optional, replaces stb_freetype if available # Optional, replaces stb_freetype if available
find_package(Freetype) find_package(Freetype)