diff --git a/Makefile b/Makefile index 96b7e5f..fc85bf8 100644 --- a/Makefile +++ b/Makefile @@ -1,18 +1,15 @@ executable = jaildoctors_dilemma +source = source/*.cpp source/common/*.cpp windows: @echo off if not exist bin\ (mkdir bin) - g++ source/*.cpp source/utils/*.cpp -std=c++11 -Wall -O2 -lmingw32 -lSDL2main -lSDL2 -ffunction-sections -fdata-sections -Wl,--gc-sections -static-libstdc++ -o bin/$(executable).exe + g++ $(source) -std=c++11 -Wall -O2 -lmingw32 -lSDL2main -lSDL2 -ffunction-sections -fdata-sections -Wl,--gc-sections -static-libstdc++ -Wl,-subsystem,windows -o bin/$(executable).exe strip -s -R .comment -R .gnu.version bin/$(executable).exe --strip-unneeded macos: mkdir -p bin - g++ source/*.cpp source/utils/*.cpp -std=c++11 -Wall -O2 -lSDL2 -o bin/$(executable)_macos + g++ $(source) -std=c++11 -Wall -O2 -lSDL2 -ffunction-sections -fdata-sections -o bin/$(executable)_macos linux: mkdir -p bin - g++ source/*.cpp source/utils/*.cpp -std=c++11 -Wall -Os -lSDL2 -ffunction-sections -fdata-sections -Wl,--gc-sections -o bin/$(executable)_linux - strip -s -R .comment -R .gnu.version bin/$(executable)_linux --strip-unneeded -opendingux: - mkdir -p bin - /opt/gcw0-toolchain/usr/bin/mipsel-linux-gcc -D GCWZERO -O2 -std=c++11 -I/opt/gcw0-toolchain/usr/mipsel-gcw0-linux-uclibc/sysroot/usr/include/SDL2 -D_GNU_SOURCE=1 -D_REENTRANT -lSDL2 -lSDL2_mixer -lstdc++ source/*.cpp -o bin/$(executable)_opendingux - /opt/gcw0-toolchain/usr/bin/mksquashfs ./default.gcw0.desktop ./icon.png ./bin ./data ./media coffee_crisis.opk -all-root -noappend -no-exports -no-xattrs \ No newline at end of file + g++ $(source) -std=c++11 -Wall -Os -lSDL2 -ffunction-sections -fdata-sections -Wl,--gc-sections -o bin/$(executable)_linux + strip -s -R .comment -R .gnu.version bin/$(executable)_linux --strip-unneeded \ No newline at end of file diff --git a/source/utils/animatedsprite.cpp b/source/common/animatedsprite.cpp similarity index 100% rename from source/utils/animatedsprite.cpp rename to source/common/animatedsprite.cpp diff --git a/source/utils/animatedsprite.h b/source/common/animatedsprite.h similarity index 100% rename from source/utils/animatedsprite.h rename to source/common/animatedsprite.h diff --git a/source/utils/asset.cpp b/source/common/asset.cpp similarity index 100% rename from source/utils/asset.cpp rename to source/common/asset.cpp diff --git a/source/utils/asset.h b/source/common/asset.h similarity index 100% rename from source/utils/asset.h rename to source/common/asset.h diff --git a/source/utils/debug.cpp b/source/common/debug.cpp similarity index 100% rename from source/utils/debug.cpp rename to source/common/debug.cpp diff --git a/source/utils/debug.h b/source/common/debug.h similarity index 100% rename from source/utils/debug.h rename to source/common/debug.h diff --git a/source/utils/input.cpp b/source/common/input.cpp similarity index 100% rename from source/utils/input.cpp rename to source/common/input.cpp diff --git a/source/utils/input.h b/source/common/input.h similarity index 100% rename from source/utils/input.h rename to source/common/input.h diff --git a/source/utils/jail_audio.cpp b/source/common/jail_audio.cpp similarity index 100% rename from source/utils/jail_audio.cpp rename to source/common/jail_audio.cpp diff --git a/source/utils/jail_audio.h b/source/common/jail_audio.h similarity index 100% rename from source/utils/jail_audio.h rename to source/common/jail_audio.h diff --git a/source/utils/ltexture.cpp b/source/common/ltexture.cpp similarity index 100% rename from source/utils/ltexture.cpp rename to source/common/ltexture.cpp diff --git a/source/utils/ltexture.h b/source/common/ltexture.h similarity index 100% rename from source/utils/ltexture.h rename to source/common/ltexture.h diff --git a/source/utils/menu.cpp b/source/common/menu.cpp similarity index 100% rename from source/utils/menu.cpp rename to source/common/menu.cpp diff --git a/source/utils/menu.h b/source/common/menu.h similarity index 100% rename from source/utils/menu.h rename to source/common/menu.h diff --git a/source/utils/movingsprite.cpp b/source/common/movingsprite.cpp similarity index 100% rename from source/utils/movingsprite.cpp rename to source/common/movingsprite.cpp diff --git a/source/utils/movingsprite.h b/source/common/movingsprite.h similarity index 100% rename from source/utils/movingsprite.h rename to source/common/movingsprite.h diff --git a/source/utils/screen.cpp b/source/common/screen.cpp similarity index 100% rename from source/utils/screen.cpp rename to source/common/screen.cpp diff --git a/source/utils/screen.h b/source/common/screen.h similarity index 100% rename from source/utils/screen.h rename to source/common/screen.h diff --git a/source/utils/sprite.cpp b/source/common/sprite.cpp similarity index 100% rename from source/utils/sprite.cpp rename to source/common/sprite.cpp diff --git a/source/utils/sprite.h b/source/common/sprite.h similarity index 100% rename from source/utils/sprite.h rename to source/common/sprite.h diff --git a/source/utils/stb_image.h b/source/common/stb_image.h similarity index 100% rename from source/utils/stb_image.h rename to source/common/stb_image.h diff --git a/source/utils/stb_vorbis.c b/source/common/stb_vorbis.c similarity index 100% rename from source/utils/stb_vorbis.c rename to source/common/stb_vorbis.c diff --git a/source/utils/text.cpp b/source/common/text.cpp similarity index 100% rename from source/utils/text.cpp rename to source/common/text.cpp diff --git a/source/utils/text.h b/source/common/text.h similarity index 100% rename from source/utils/text.h rename to source/common/text.h diff --git a/source/utils/utils.cpp b/source/common/utils.cpp similarity index 100% rename from source/utils/utils.cpp rename to source/common/utils.cpp diff --git a/source/utils/utils.h b/source/common/utils.h similarity index 100% rename from source/utils/utils.h rename to source/common/utils.h diff --git a/source/const.h b/source/const.h index 8d96fac..6055566 100644 --- a/source/const.h +++ b/source/const.h @@ -2,7 +2,7 @@ #include #include -#include "utils/utils.h" +#include "common/utils.h" #ifndef CONST_H #define CONST_H diff --git a/source/credits.h b/source/credits.h index 8a05bb5..d0150fd 100644 --- a/source/credits.h +++ b/source/credits.h @@ -2,12 +2,12 @@ #include #include "const.h" -#include "utils/asset.h" -#include "utils/jail_audio.h" -#include "utils/screen.h" -#include "utils/sprite.h" -#include "utils/text.h" -#include "utils/utils.h" +#include "common/asset.h" +#include "common/jail_audio.h" +#include "common/screen.h" +#include "common/sprite.h" +#include "common/text.h" +#include "common/utils.h" #include #ifndef CREDITS_H diff --git a/source/demo.h b/source/demo.h index b7728df..34508b0 100644 --- a/source/demo.h +++ b/source/demo.h @@ -6,14 +6,14 @@ #include "room_tracker.h" #include "room.h" #include "scoreboard.h" -#include "utils/animatedsprite.h" -#include "utils/asset.h" -#include "utils/debug.h" -#include "utils/input.h" -#include "utils/screen.h" -#include "utils/sprite.h" -#include "utils/text.h" -#include "utils/utils.h" +#include "common/animatedsprite.h" +#include "common/asset.h" +#include "common/debug.h" +#include "common/input.h" +#include "common/screen.h" +#include "common/sprite.h" +#include "common/text.h" +#include "common/utils.h" #ifndef DEMO_H #define DEMO_H diff --git a/source/director.cpp b/source/director.cpp index 5339bcd..4fbf66c 100644 --- a/source/director.cpp +++ b/source/director.cpp @@ -1,5 +1,5 @@ #include "director.h" -#include "utils/utils.h" +#include "common/utils.h" #include #include diff --git a/source/director.h b/source/director.h index 1a47713..6533c7c 100644 --- a/source/director.h +++ b/source/director.h @@ -7,14 +7,14 @@ #include "intro.h" #include "logo.h" #include "title.h" -#include "utils/asset.h" -#include "utils/debug.h" -#include "utils/input.h" -#include "utils/jail_audio.h" -#include "utils/movingsprite.h" -#include "utils/sprite.h" -#include "utils/text.h" -#include "utils/utils.h" +#include "common/asset.h" +#include "common/debug.h" +#include "common/input.h" +#include "common/jail_audio.h" +#include "common/movingsprite.h" +#include "common/sprite.h" +#include "common/text.h" +#include "common/utils.h" #ifndef DIRECTOR_H #define DIRECTOR_H diff --git a/source/enemy.h b/source/enemy.h index 2078d39..425ff1a 100644 --- a/source/enemy.h +++ b/source/enemy.h @@ -1,8 +1,8 @@ #pragma once #include -#include "utils/animatedsprite.h" -#include "utils/asset.h" -#include "utils/utils.h" +#include "common/animatedsprite.h" +#include "common/asset.h" +#include "common/utils.h" #include #ifndef ENEMY_H diff --git a/source/game.h b/source/game.h index 0ff4682..58f478e 100644 --- a/source/game.h +++ b/source/game.h @@ -8,15 +8,15 @@ #include "room.h" #include "scoreboard.h" #include "test.h" -#include "utils/animatedsprite.h" -#include "utils/asset.h" -#include "utils/debug.h" -#include "utils/input.h" -#include "utils/jail_audio.h" -#include "utils/screen.h" -#include "utils/sprite.h" -#include "utils/text.h" -#include "utils/utils.h" +#include "common/animatedsprite.h" +#include "common/asset.h" +#include "common/debug.h" +#include "common/input.h" +#include "common/jail_audio.h" +#include "common/screen.h" +#include "common/sprite.h" +#include "common/text.h" +#include "common/utils.h" #ifndef GAME_H #define GAME_H diff --git a/source/intro.h b/source/intro.h index 692c225..cb7cb66 100644 --- a/source/intro.h +++ b/source/intro.h @@ -2,15 +2,15 @@ #include #include "const.h" -#include "utils/asset.h" -#include "utils/jail_audio.h" -#include "utils/screen.h" -#include "utils/sprite.h" -#include "utils/utils.h" +#include "common/asset.h" +#include "common/jail_audio.h" +#include "common/screen.h" +#include "common/sprite.h" +#include "common/utils.h" #include #include -#include "utils/text.h" +#include "common/text.h" #ifndef INTRO_H #define INTRO_H diff --git a/source/item.h b/source/item.h index 90d72ee..925dea0 100644 --- a/source/item.h +++ b/source/item.h @@ -1,9 +1,9 @@ #pragma once #include -#include "utils/asset.h" -#include "utils/sprite.h" -#include "utils/utils.h" +#include "common/asset.h" +#include "common/sprite.h" +#include "common/utils.h" #include #ifndef ITEM_H diff --git a/source/item_tracker.h b/source/item_tracker.h index 7843b16..4cb5b71 100644 --- a/source/item_tracker.h +++ b/source/item_tracker.h @@ -1,6 +1,6 @@ #pragma once #include -#include "utils/utils.h" +#include "common/utils.h" #include #include diff --git a/source/logo.h b/source/logo.h index ef28c1a..8cc95ee 100644 --- a/source/logo.h +++ b/source/logo.h @@ -2,11 +2,11 @@ #include #include "const.h" -#include "utils/asset.h" -#include "utils/jail_audio.h" -#include "utils/screen.h" -#include "utils/sprite.h" -#include "utils/utils.h" +#include "common/asset.h" +#include "common/jail_audio.h" +#include "common/screen.h" +#include "common/sprite.h" +#include "common/utils.h" #include #ifndef LOGO_H diff --git a/source/player.h b/source/player.h index 763f8b8..94277b4 100644 --- a/source/player.h +++ b/source/player.h @@ -3,11 +3,11 @@ #include #include "const.h" #include "room.h" -#include "utils/animatedsprite.h" -#include "utils/asset.h" -#include "utils/debug.h" -#include "utils/input.h" -#include "utils/utils.h" +#include "common/animatedsprite.h" +#include "common/asset.h" +#include "common/debug.h" +#include "common/input.h" +#include "common/utils.h" #include #include diff --git a/source/room.h b/source/room.h index 64522d5..efd42d8 100644 --- a/source/room.h +++ b/source/room.h @@ -5,12 +5,12 @@ #include "enemy.h" #include "item_tracker.h" #include "item.h" -#include "utils/asset.h" -#include "utils/debug.h" -#include "utils/jail_audio.h" -#include "utils/screen.h" -#include "utils/sprite.h" -#include "utils/utils.h" +#include "common/asset.h" +#include "common/debug.h" +#include "common/jail_audio.h" +#include "common/screen.h" +#include "common/sprite.h" +#include "common/utils.h" #include #include diff --git a/source/room_tracker.h b/source/room_tracker.h index 6685124..29db6ee 100644 --- a/source/room_tracker.h +++ b/source/room_tracker.h @@ -1,7 +1,7 @@ #pragma once #include -#include "utils/utils.h" +#include "common/utils.h" #include #include diff --git a/source/scoreboard.h b/source/scoreboard.h index be698d7..60a80ed 100644 --- a/source/scoreboard.h +++ b/source/scoreboard.h @@ -2,10 +2,10 @@ #include #include "const.h" -#include "utils/animatedsprite.h" -#include "utils/asset.h" -#include "utils/text.h" -#include "utils/utils.h" +#include "common/animatedsprite.h" +#include "common/asset.h" +#include "common/text.h" +#include "common/utils.h" #include #ifndef SCOREBOARD_H diff --git a/source/test.h b/source/test.h index a92297d..2ec9d8e 100644 --- a/source/test.h +++ b/source/test.h @@ -2,11 +2,11 @@ #include #include "const.h" -#include "utils/asset.h" -#include "utils/debug.h" -#include "utils/screen.h" -#include "utils/text.h" -#include "utils/utils.h" +#include "common/asset.h" +#include "common/debug.h" +#include "common/screen.h" +#include "common/text.h" +#include "common/utils.h" #include #include diff --git a/source/title.h b/source/title.h index b3f909e..0f57580 100644 --- a/source/title.h +++ b/source/title.h @@ -2,12 +2,12 @@ #include #include "const.h" -#include "utils/asset.h" -#include "utils/jail_audio.h" -#include "utils/screen.h" -#include "utils/sprite.h" -#include "utils/text.h" -#include "utils/utils.h" +#include "common/asset.h" +#include "common/jail_audio.h" +#include "common/screen.h" +#include "common/sprite.h" +#include "common/text.h" +#include "common/utils.h" #include #ifndef TITLE_H