mirror of
https://github.com/AxioDL/metaforce.git
synced 2025-12-08 17:04:55 +00:00
Fix libPNG
This commit is contained in:
@@ -75,7 +75,7 @@ add_library(AssetNameMapNull
|
||||
get_target_property(HECL_INCLUDES hecl-full INCLUDE_DIRECTORIES)
|
||||
target_include_directories(RetroDataSpec PUBLIC ${LIBPNG_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR}
|
||||
${HECL_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_SOURCE_DIR})
|
||||
target_link_libraries(RetroDataSpec PUBLIC amuse zeus nod specter squish ${PNG_LIB} ${ZLIB_LIBRARIES} lzokay logvisor)
|
||||
target_link_libraries(RetroDataSpec PUBLIC amuse zeus nod specter squish ${PNG_LIBRARIES} ${ZLIB_LIBRARIES} lzokay logvisor)
|
||||
if(COMMAND add_sanitizers)
|
||||
add_sanitizers(RetroDataSpec)
|
||||
endif()
|
||||
|
||||
@@ -5,7 +5,7 @@ find_library(M_LIB m)
|
||||
if(NOT M_LIB)
|
||||
unset(M_LIB CACHE)
|
||||
endif()
|
||||
target_link_libraries(packbadge ${PNG_LIB} ${ZLIB_LIBRARIES} ${M_LIB})
|
||||
target_link_libraries(packbadge ${PNG_LIBRARIES} ${ZLIB_LIBRARIES} ${M_LIB})
|
||||
target_include_directories(packbadge PRIVATE ${LIBPNG_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR})
|
||||
|
||||
##################
|
||||
|
||||
@@ -4,7 +4,7 @@ find_library(M_LIB m)
|
||||
if(NOT M_LIB)
|
||||
unset(M_LIB CACHE)
|
||||
endif()
|
||||
target_link_libraries(packicons ${PNG_LIB} ${ZLIB_LIBRARIES} ${M_LIB})
|
||||
target_link_libraries(packicons ${PNG_LIBRARIES} ${ZLIB_LIBRARIES} ${M_LIB})
|
||||
target_include_directories(packicons PRIVATE ${LIBPNG_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR})
|
||||
|
||||
##################
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
add_executable(mkwmicon mkwmicon.c)
|
||||
target_include_directories(mkwmicon PRIVATE ${LIBPNG_INCLUDE_DIR})
|
||||
target_link_libraries(mkwmicon ${PNG_LIB} ${ZLIB_LIBRARIES})
|
||||
target_link_libraries(mkwmicon ${ZLIB_LIBRARIES} ${PNG_LIBRARIES})
|
||||
|
||||
macro(declare_wmicon_target)
|
||||
add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/Editor/platforms/freedesktop/mainicon_netwm.bin
|
||||
|
||||
2
amuse
2
amuse
Submodule amuse updated: 70380d8fbc...aa9ef6e866
2
hecl
2
hecl
Submodule hecl updated: 8b38a49a40...6c34f2c6f8
2
hecl-gui
2
hecl-gui
Submodule hecl-gui updated: a23a15988a...b676e497a6
Reference in New Issue
Block a user