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

Fix libPNG

This commit is contained in:
Phillip Stephens 2020-06-12 05:44:33 -07:00
parent b774d56810
commit 20109bddc3
Signed by: Antidote
GPG Key ID: F8BEE4C83DACA60D
7 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DataSpec/CMakeLists.txt
View File

@ -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()

2
Editor/badging/CMakeLists.txt
View File

@ -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})
##################

2
Editor/icons/CMakeLists.txt
View File

@ -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})
##################

2
Editor/platforms/freedesktop/CMakeLists.txt
View File

@ -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

@ -1 +1 @@
Subproject commit 70380d8fbcbc619ef815f64750817ca1052bb9f9
Subproject commit aa9ef6e8668b6108073c54ccd7db00d4d1e53c42

2
hecl

@ -1 +1 @@
Subproject commit 8b38a49a404a7d96a7556ae9b6250dfb6d143bba
Subproject commit 6c34f2c6f87356a45a9819f8623e1410b12ff117

2
hecl-gui

@ -1 +1 @@
Subproject commit a23a15988abd05a04dd7145c849d0ed9074c0c7f
Subproject commit b676e497a64b5293061135caf4d358959e03461a