From 74cbdfaaa41d4d3d7fea8e623659cc78c5ef53b2 Mon Sep 17 00:00:00 2001
From: Luke Street <luke.street@encounterpc.com>
Date: Sat, 13 Jun 2020 17:24:09 -0400
Subject: [PATCH] Use PNG_INCLUDE_DIR & update submodules

---
 DataSpec/CMakeLists.txt                     | 2 +-
 Editor/badging/CMakeLists.txt               | 2 +-
 Editor/icons/CMakeLists.txt                 | 2 +-
 Editor/platforms/freedesktop/CMakeLists.txt | 4 ++--
 amuse                                       | 2 +-
 hecl                                        | 2 +-
 hecl-gui                                    | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/DataSpec/CMakeLists.txt b/DataSpec/CMakeLists.txt
index 0a60bd339..9fcef398b 100644
--- a/DataSpec/CMakeLists.txt
+++ b/DataSpec/CMakeLists.txt
@@ -73,7 +73,7 @@ add_library(AssetNameMapNull
         AssetNameMapNull.cpp)
 
 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})
 target_link_libraries(RetroDataSpec PUBLIC amuse zeus nod specter squish ${PNG_LIBRARIES} ${ZLIB_LIBRARIES} lzokay logvisor)
 if(COMMAND add_sanitizers)
diff --git a/Editor/badging/CMakeLists.txt b/Editor/badging/CMakeLists.txt
index beccfd13d..ec1e50d13 100644
--- a/Editor/badging/CMakeLists.txt
+++ b/Editor/badging/CMakeLists.txt
@@ -6,7 +6,7 @@ if(NOT M_LIB)
   unset(M_LIB CACHE)
 endif()
 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 #
diff --git a/Editor/icons/CMakeLists.txt b/Editor/icons/CMakeLists.txt
index f729afe89..ea25fcdab 100644
--- a/Editor/icons/CMakeLists.txt
+++ b/Editor/icons/CMakeLists.txt
@@ -5,7 +5,7 @@ if(NOT M_LIB)
   unset(M_LIB CACHE)
 endif()
 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 #
diff --git a/Editor/platforms/freedesktop/CMakeLists.txt b/Editor/platforms/freedesktop/CMakeLists.txt
index 60d7a635b..17ad9549b 100644
--- a/Editor/platforms/freedesktop/CMakeLists.txt
+++ b/Editor/platforms/freedesktop/CMakeLists.txt
@@ -1,6 +1,6 @@
 add_executable(mkwmicon mkwmicon.c)
-target_include_directories(mkwmicon PRIVATE ${LIBPNG_INCLUDE_DIR})
-target_link_libraries(mkwmicon ${ZLIB_LIBRARIES} ${PNG_LIBRARIES})
+target_link_libraries(mkwmicon ${PNG_LIBRARIES} ${ZLIB_LIBRARIES})
+target_include_directories(mkwmicon ${PNG_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR})
 
 macro(declare_wmicon_target)
 add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/Editor/platforms/freedesktop/mainicon_netwm.bin
diff --git a/amuse b/amuse
index aa9ef6e86..f17242799 160000
--- a/amuse
+++ b/amuse
@@ -1 +1 @@
-Subproject commit aa9ef6e8668b6108073c54ccd7db00d4d1e53c42
+Subproject commit f172427991eb2138ad85e89b9482782834ed1d43
diff --git a/hecl b/hecl
index 6c34f2c6f..c6adc70f6 160000
--- a/hecl
+++ b/hecl
@@ -1 +1 @@
-Subproject commit 6c34f2c6f87356a45a9819f8623e1410b12ff117
+Subproject commit c6adc70f63b80fd2767964f9969f7a5baf574e5b
diff --git a/hecl-gui b/hecl-gui
index b676e497a..6c4bf2c86 160000
--- a/hecl-gui
+++ b/hecl-gui
@@ -1 +1 @@
-Subproject commit b676e497a64b5293061135caf4d358959e03461a
+Subproject commit 6c4bf2c8677c1de90ff48bd881969a1818583c4b