Cambiado el nombre de la carpeta utils a common

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
+	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
+	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

source/const.h

@@ -2,7 +2,7 @@
 
 #include <SDL2/SDL.h>
 #include <string>
-#include "utils/utils.h"
+#include "common/utils.h"
 
 #ifndef CONST_H
 #define CONST_H

source/credits.h

@@ -2,12 +2,12 @@
 
 #include <SDL2/SDL.h>
 #include "const.h"
-#include "utils/asset.h"
+#include "common/asset.h"
-#include "utils/jail_audio.h"
+#include "common/jail_audio.h"
-#include "utils/screen.h"
+#include "common/screen.h"
-#include "utils/sprite.h"
+#include "common/sprite.h"
-#include "utils/text.h"
+#include "common/text.h"
-#include "utils/utils.h"
+#include "common/utils.h"
 #include <vector>
 
 #ifndef CREDITS_H

source/demo.h

@@ -6,14 +6,14 @@
 #include "room_tracker.h"
 #include "room.h"
 #include "scoreboard.h"
-#include "utils/animatedsprite.h"
+#include "common/animatedsprite.h"
-#include "utils/asset.h"
+#include "common/asset.h"
-#include "utils/debug.h"
+#include "common/debug.h"
-#include "utils/input.h"
+#include "common/input.h"
-#include "utils/screen.h"
+#include "common/screen.h"
-#include "utils/sprite.h"
+#include "common/sprite.h"
-#include "utils/text.h"
+#include "common/text.h"
-#include "utils/utils.h"
+#include "common/utils.h"
 
 #ifndef DEMO_H
 #define DEMO_H

source/director.cpp

@@ -1,5 +1,5 @@
 #include "director.h"
-#include "utils/utils.h"
+#include "common/utils.h"
 #include <iostream>
 #include <string>
 

source/director.h

@@ -7,14 +7,14 @@
 #include "intro.h"
 #include "logo.h"
 #include "title.h"
-#include "utils/asset.h"
+#include "common/asset.h"
-#include "utils/debug.h"
+#include "common/debug.h"
-#include "utils/input.h"
+#include "common/input.h"
-#include "utils/jail_audio.h"
+#include "common/jail_audio.h"
-#include "utils/movingsprite.h"
+#include "common/movingsprite.h"
-#include "utils/sprite.h"
+#include "common/sprite.h"
-#include "utils/text.h"
+#include "common/text.h"
-#include "utils/utils.h"
+#include "common/utils.h"
 
 #ifndef DIRECTOR_H
 #define DIRECTOR_H

source/enemy.h

@@ -1,8 +1,8 @@
 #pragma once
 #include <SDL2/SDL.h>
-#include "utils/animatedsprite.h"
+#include "common/animatedsprite.h"
-#include "utils/asset.h"
+#include "common/asset.h"
-#include "utils/utils.h"
+#include "common/utils.h"
 #include <string>
 
 #ifndef ENEMY_H

source/game.h

@@ -8,15 +8,15 @@
 #include "room.h"
 #include "scoreboard.h"
 #include "test.h"
-#include "utils/animatedsprite.h"
+#include "common/animatedsprite.h"
-#include "utils/asset.h"
+#include "common/asset.h"
-#include "utils/debug.h"
+#include "common/debug.h"
-#include "utils/input.h"
+#include "common/input.h"
-#include "utils/jail_audio.h"
+#include "common/jail_audio.h"
-#include "utils/screen.h"
+#include "common/screen.h"
-#include "utils/sprite.h"
+#include "common/sprite.h"
-#include "utils/text.h"
+#include "common/text.h"
-#include "utils/utils.h"
+#include "common/utils.h"
 
 #ifndef GAME_H
 #define GAME_H

source/intro.h

@@ -2,15 +2,15 @@
 
 #include <SDL2/SDL.h>
 #include "const.h"
-#include "utils/asset.h"
+#include "common/asset.h"
-#include "utils/jail_audio.h"
+#include "common/jail_audio.h"
-#include "utils/screen.h"
+#include "common/screen.h"
-#include "utils/sprite.h"
+#include "common/sprite.h"
-#include "utils/utils.h"
+#include "common/utils.h"
 #include <vector>
 
 #include <string>
-#include "utils/text.h"
+#include "common/text.h"
 
 #ifndef INTRO_H
 #define INTRO_H

source/item.h

@@ -1,9 +1,9 @@
 #pragma once
 
 #include <SDL2/SDL.h>
-#include "utils/asset.h"
+#include "common/asset.h"
-#include "utils/sprite.h"
+#include "common/sprite.h"
-#include "utils/utils.h"
+#include "common/utils.h"
 #include <string>
 
 #ifndef ITEM_H

source/item_tracker.h

@@ -1,6 +1,6 @@
 #pragma once
 #include <SDL2/SDL.h>
-#include "utils/utils.h"
+#include "common/utils.h"
 #include <string>
 #include <vector>
 

source/logo.h

@@ -2,11 +2,11 @@
 
 #include <SDL2/SDL.h>
 #include "const.h"
-#include "utils/asset.h"
+#include "common/asset.h"
-#include "utils/jail_audio.h"
+#include "common/jail_audio.h"
-#include "utils/screen.h"
+#include "common/screen.h"
-#include "utils/sprite.h"
+#include "common/sprite.h"
-#include "utils/utils.h"
+#include "common/utils.h"
 #include <vector>
 
 #ifndef LOGO_H

source/player.h

@@ -3,11 +3,11 @@
 #include <SDL2/SDL.h>
 #include "const.h"
 #include "room.h"
-#include "utils/animatedsprite.h"
+#include "common/animatedsprite.h"
-#include "utils/asset.h"
+#include "common/asset.h"
-#include "utils/debug.h"
+#include "common/debug.h"
-#include "utils/input.h"
+#include "common/input.h"
-#include "utils/utils.h"
+#include "common/utils.h"
 #include <string>
 #include <vector>
 

source/room.h

@@ -5,12 +5,12 @@
 #include "enemy.h"
 #include "item_tracker.h"
 #include "item.h"
-#include "utils/asset.h"
+#include "common/asset.h"
-#include "utils/debug.h"
+#include "common/debug.h"
-#include "utils/jail_audio.h"
+#include "common/jail_audio.h"
-#include "utils/screen.h"
+#include "common/screen.h"
-#include "utils/sprite.h"
+#include "common/sprite.h"
-#include "utils/utils.h"
+#include "common/utils.h"
 #include <string>
 #include <vector>
 

source/room_tracker.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <SDL2/SDL.h>
-#include "utils/utils.h"
+#include "common/utils.h"
 #include <string>
 #include <vector>
 

source/scoreboard.h

@@ -2,10 +2,10 @@
 
 #include <SDL2/SDL.h>
 #include "const.h"
-#include "utils/animatedsprite.h"
+#include "common/animatedsprite.h"
-#include "utils/asset.h"
+#include "common/asset.h"
-#include "utils/text.h"
+#include "common/text.h"
-#include "utils/utils.h"
+#include "common/utils.h"
 #include <string>
 
 #ifndef SCOREBOARD_H

source/test.h

@@ -2,11 +2,11 @@
 
 #include <SDL2/SDL.h>
 #include "const.h"
-#include "utils/asset.h"
+#include "common/asset.h"
-#include "utils/debug.h"
+#include "common/debug.h"
-#include "utils/screen.h"
+#include "common/screen.h"
-#include "utils/text.h"
+#include "common/text.h"
-#include "utils/utils.h"
+#include "common/utils.h"
 #include <string>
 #include <vector>
 

source/title.h

@@ -2,12 +2,12 @@
 
 #include <SDL2/SDL.h>
 #include "const.h"
-#include "utils/asset.h"
+#include "common/asset.h"
-#include "utils/jail_audio.h"
+#include "common/jail_audio.h"
-#include "utils/screen.h"
+#include "common/screen.h"
-#include "utils/sprite.h"
+#include "common/sprite.h"
-#include "utils/text.h"
+#include "common/text.h"
-#include "utils/utils.h"
+#include "common/utils.h"
 #include <vector>
 
 #ifndef TITLE_H