From 2e569b2cd378c65c37e77dbbfe0950c08d2bea64 Mon Sep 17 00:00:00 2001
From: lisyarus <lisyarus@gmail.com>
Date: Tue, 18 Jul 2023 20:40:53 +0300
Subject: [PATCH] Packaging fixes

---
 libs/audio/source/track_wav.cpp | 12 +++++++++++-
 libs/sdl2/source/resource.cpp   |  2 ++
 package/CMakeLists.txt          |  4 +++-
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/libs/audio/source/track_wav.cpp b/libs/audio/source/track_wav.cpp
index f2af4072..d3419cae 100644
--- a/libs/audio/source/track_wav.cpp
+++ b/libs/audio/source/track_wav.cpp
@@ -1,10 +1,20 @@
 #include <psemek/audio/track.hpp>
 #include <psemek/audio/constants.hpp>
 #include <psemek/audio/detail/resampler.hpp>
-#include <psemek/audio/audio_file/AudioFile.h>
 #include <psemek/util/to_string.hpp>
 #include <psemek/util/at_scope_exit.hpp>
 
+#ifdef __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wstrict-aliasing"
+#endif
+
+#include <psemek/audio/audio_file/AudioFile.h>
+
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif
+
 namespace psemek::audio
 {
 
diff --git a/libs/sdl2/source/resource.cpp b/libs/sdl2/source/resource.cpp
index 19a73aaa..5da4f61e 100644
--- a/libs/sdl2/source/resource.cpp
+++ b/libs/sdl2/source/resource.cpp
@@ -1,11 +1,13 @@
 #include <psemek/app/resource.hpp>
 #include <psemek/io/file_stream.hpp>
+#include <psemek/log/log.hpp>
 
 namespace psemek::app
 {
 
 	std::unique_ptr<io::istream> open_resource(std::filesystem::path const & relative_path)
 	{
+		log::info() << "Opening resource " << relative_path;
 		return std::make_unique<io::file_istream>(app::resource_root() / relative_path);
 	}
 
diff --git a/package/CMakeLists.txt b/package/CMakeLists.txt
index ac851340..ef83035c 100644
--- a/package/CMakeLists.txt
+++ b/package/CMakeLists.txt
@@ -4,7 +4,7 @@ set(PSEMEK_PACKAGE_VERSION_SUFFIX "" CACHE STRING "Packaging version suffix")
 
 if(PSEMEK_PACKAGE_MODE)
 	if(WIN32)
-		set(PSEMEK_PACKAGE_SUFFIX_RAW win)
+		set(PSEMEK_PACKAGE_SUFFIX_RAW windows)
 	elseif(APPLE)
 		set(PSEMEK_PACKAGE_SUFFIX_RAW mac)
 	elseif(ANDROID)
@@ -167,6 +167,8 @@ function(psemek_package_files target)
 					COMMAND ${PSEMEK_COPY_FILES} ${ARGN}
 				)
 			else()
+				psemek_package_output_path(${target} _OUTPUT_PATH)
+
 				add_custom_command(TARGET ${target} POST_BUILD
 					WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
 					COMMAND zip -v "${_OUTPUT_PATH}" -r ${ARGN}