diff --git a/.gitignore b/.gitignore index 49d5cc2..995830b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,9 @@ +.DS_Store .vscode/* *.exe arounders arounders_debug ./*.dll -release/* \ No newline at end of file +release/* +respak2 +*.dSYM/* \ No newline at end of file diff --git a/Makefile b/Makefile index cffd483..2ce7893 100644 --- a/Makefile +++ b/Makefile @@ -69,7 +69,7 @@ macos_release: mkdir -p Frameworks # Fem el paquetet - respak2 -p + ./respak2 -p # Copy folders cp data.jf2 "$(releaseFolder)/$(appName).app/Contents/Resources" @@ -94,12 +94,12 @@ macos_release: rm -f tmp.dmg # Build APPLE SILICON - clang++ $(source) -D MACOS_BUNDLE -D VERSION=\"$(version)\" -std=c++11 -Wall -Os -framework SDL2 -framework SDL2_mixer -F ./Frameworks -ffunction-sections -fdata-sections -o "$(releaseFolder)/$(appName).app/Contents/MacOS/$(executable)" -rpath @executable_path/../Frameworks/ -target arm64-apple-macos11 +#clang++ $(source) -D MACOS_BUNDLE -D VERSION=\"$(version)\" -std=c++11 -Wall -Os -framework SDL2 -framework SDL2_mixer -F ./Frameworks -ffunction-sections -fdata-sections -o "$(releaseFolder)/$(appName).app/Contents/MacOS/$(executable)" -rpath @executable_path/../Frameworks/ -target arm64-apple-macos11 # Build APPLE SILICON DMG - hdiutil create tmp.dmg -ov -volname "$(appName)" -fs HFS+ -srcfolder "$(releaseFolder)" - hdiutil convert tmp.dmg -format UDZO -o "$(macosAppleSiliconRelease)" - rm -f tmp.dmg +#hdiutil create tmp.dmg -ov -volname "$(appName)" -fs HFS+ -srcfolder "$(releaseFolder)" +#hdiutil convert tmp.dmg -format UDZO -o "$(macosAppleSiliconRelease)" +#rm -f tmp.dmg # Remove data rm -rdf Frameworks diff --git a/source/jgame.cpp b/source/jgame.cpp index 41c5f3b..59bdda6 100644 --- a/source/jgame.cpp +++ b/source/jgame.cpp @@ -4,6 +4,10 @@ #include #include +#ifdef MACOS_BUNDLE +#include +#endif + namespace game { bool windowHasFocus = true; @@ -41,6 +45,13 @@ namespace game int main(int argc, char *argv[]) { +#ifdef MACOS_BUNDLE + char res_file[255] = ""; + strcpy(res_file, dirname(argv[0])); + strcat(res_file, "/../Resources/data.jf2"); + file::setResourceFilename(res_file); +#endif + game::windowHasFocus = true; game::init(); input::init(draw::getZoom());