lisyarus/psemek
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Packaging fixes

Browse source
This commit is contained in:
Nikita Lisitsa 2023-07-18 20:40:53 +03:00
parent b33ef168ea
commit 2e569b2cd3
3 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
libs/audio/source/track_wav.cpp
View file

@ -1,10 +1,20 @@
#include <psemek/audio/track.hpp> #include <psemek/audio/track.hpp>
#include <psemek/audio/constants.hpp> #include <psemek/audio/constants.hpp>
#include <psemek/audio/detail/resampler.hpp> #include <psemek/audio/detail/resampler.hpp>
#include <psemek/audio/audio_file/AudioFile.h>
#include <psemek/util/to_string.hpp> #include <psemek/util/to_string.hpp>
#include <psemek/util/at_scope_exit.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 namespace psemek::audio
{ {

2
libs/sdl2/source/resource.cpp
View file

@ -1,11 +1,13 @@
#include <psemek/app/resource.hpp> #include <psemek/app/resource.hpp>
#include <psemek/io/file_stream.hpp> #include <psemek/io/file_stream.hpp>
#include <psemek/log/log.hpp>
namespace psemek::app namespace psemek::app
{ {
std::unique_ptr<io::istream> open_resource(std::filesystem::path const & relative_path) 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); return std::make_unique<io::file_istream>(app::resource_root() / relative_path);
} }

4
package/CMakeLists.txt
View file

@ -4,7 +4,7 @@ set(PSEMEK_PACKAGE_VERSION_SUFFIX "" CACHE STRING "Packaging version suffix")
if(PSEMEK_PACKAGE_MODE) if(PSEMEK_PACKAGE_MODE)
if(WIN32) if(WIN32)
set(PSEMEK_PACKAGE_SUFFIX_RAW win) set(PSEMEK_PACKAGE_SUFFIX_RAW windows)
elseif(APPLE) elseif(APPLE)
set(PSEMEK_PACKAGE_SUFFIX_RAW mac) set(PSEMEK_PACKAGE_SUFFIX_RAW mac)
elseif(ANDROID) elseif(ANDROID)
@ -167,6 +167,8 @@ function(psemek_package_files target)
COMMAND ${PSEMEK_COPY_FILES} ${ARGN} COMMAND ${PSEMEK_COPY_FILES} ${ARGN}
) )
else() else()
psemek_package_output_path(${target} _OUTPUT_PATH)
add_custom_command(TARGET ${target} POST_BUILD add_custom_command(TARGET ${target} POST_BUILD
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR} WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
COMMAND zip -v "${_OUTPUT_PATH}" -r ${ARGN} COMMAND zip -v "${_OUTPUT_PATH}" -r ${ARGN}