mirror of https://github.com/AxioDL/metaforce.git
Properly depend on zlib
This commit is contained in:
parent
ec5f188063
commit
74c08aa486
|
@ -332,10 +332,8 @@ if(USE_LD_GOLD)
|
|||
endif()
|
||||
endif()
|
||||
|
||||
if (NOT WIN32)
|
||||
find_package(ZLIB REQUIRED)
|
||||
set(ZLIB_LIBRARIES ZLIB::ZLIB CACHE STRING "zlib libraries" FORCE)
|
||||
endif()
|
||||
find_package(ZLIB REQUIRED)
|
||||
set(ZLIB_LIBRARIES ZLIB::ZLIB CACHE STRING "zlib libraries" FORCE)
|
||||
|
||||
include(ExternalProject)
|
||||
ExternalProject_Add(bintoc
|
||||
|
|
|
@ -149,6 +149,7 @@ endfunction()
|
|||
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
|
||||
boo # TODO move audiodev
|
||||
${ZLIB_LIBRARIES}
|
||||
)
|
||||
|
||||
add_runtime_common_library(RuntimeCommon ${RUNTIME_SOURCES_A})
|
||||
|
|
|
@ -17,7 +17,7 @@ if (CMAKE_COMPILER_IS_GNUCXX)
|
|||
# currently explicitly ignored for clang in imgui code, but not gcc (yet)
|
||||
target_compile_options(imgui PRIVATE -Wno-deprecated-enum-enum-conversion)
|
||||
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
|
||||
find_package(Freetype)
|
||||
|
|
Loading…
Reference in New Issue