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

Use PNG_INCLUDE_DIR & update submodules

This commit is contained in:
Luke Street 2020-06-13 17:24:09 -04:00
parent 20109bddc3
commit 74cbdfaaa4
7 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DataSpec/CMakeLists.txt
View File

@ -73,7 +73,7 @@ add_library(AssetNameMapNull
AssetNameMapNull.cpp) AssetNameMapNull.cpp)
get_target_property(HECL_INCLUDES hecl-full INCLUDE_DIRECTORIES) get_target_property(HECL_INCLUDES hecl-full INCLUDE_DIRECTORIES)
target_include_directories(RetroDataSpec PUBLIC ${LIBPNG_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} target_include_directories(RetroDataSpec PUBLIC ${PNG_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR}
${HECL_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_SOURCE_DIR}) ${HECL_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_SOURCE_DIR})
target_link_libraries(RetroDataSpec PUBLIC amuse zeus nod specter squish ${PNG_LIBRARIES} ${ZLIB_LIBRARIES} lzokay logvisor) target_link_libraries(RetroDataSpec PUBLIC amuse zeus nod specter squish ${PNG_LIBRARIES} ${ZLIB_LIBRARIES} lzokay logvisor)
if(COMMAND add_sanitizers) if(COMMAND add_sanitizers)

2
Editor/badging/CMakeLists.txt
View File

@ -6,7 +6,7 @@ if(NOT M_LIB)
unset(M_LIB CACHE) unset(M_LIB CACHE)
endif() endif()
target_link_libraries(packbadge ${PNG_LIBRARIES} ${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}) target_include_directories(packbadge PRIVATE ${PNG_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR})
################## ##################
# Package Export # # Package Export #

2
Editor/icons/CMakeLists.txt
View File

@ -5,7 +5,7 @@ if(NOT M_LIB)
unset(M_LIB CACHE) unset(M_LIB CACHE)
endif() endif()
target_link_libraries(packicons ${PNG_LIBRARIES} ${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}) target_include_directories(packicons PRIVATE ${PNG_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR})
################## ##################
# Package Export # # Package Export #

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

@ -1,6 +1,6 @@
add_executable(mkwmicon mkwmicon.c) add_executable(mkwmicon mkwmicon.c)
target_include_directories(mkwmicon PRIVATE ${LIBPNG_INCLUDE_DIR}) target_link_libraries(mkwmicon ${PNG_LIBRARIES} ${ZLIB_LIBRARIES})
target_link_libraries(mkwmicon ${ZLIB_LIBRARIES} ${PNG_LIBRARIES}) target_include_directories(mkwmicon ${PNG_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR})
macro(declare_wmicon_target) macro(declare_wmicon_target)
add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/Editor/platforms/freedesktop/mainicon_netwm.bin add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/Editor/platforms/freedesktop/mainicon_netwm.bin

2
amuse

@ -1 +1 @@
Subproject commit aa9ef6e8668b6108073c54ccd7db00d4d1e53c42 Subproject commit f172427991eb2138ad85e89b9482782834ed1d43

2
hecl

@ -1 +1 @@
Subproject commit 6c34f2c6f87356a45a9819f8623e1410b12ff117 Subproject commit c6adc70f63b80fd2767964f9969f7a5baf574e5b

2
hecl-gui

@ -1 +1 @@
Subproject commit b676e497a64b5293061135caf4d358959e03461a Subproject commit 6c4bf2c8677c1de90ff48bd881969a1818583c4b