Created common.h to aid with cross compiling.

build/linux/control

@@ -0,0 +1,11 @@
+Source: tbftss
+Package: tbftss
+Version: ${version}
+Section: games
+Priority: optional
+Installed-Size: ${size}
+Architecture: i386
+Depends: libsdl2-2.0-0, libsdl2-image-2.0-0, libsdl2-mixer-2.0-0, libsdl2-ttf-2.0-0
+Maintainer: stephenjsweeney@battleforthesolarsystem.com
+Description: 2D mission-based space shooter, based on the Battle for the Solar System space opera novel trilogy. 
+Homepage: www.battleforthesolarsystem.com/games/pw

src/battle/ai.h

@@ -18,10 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "SDL2/SDL.h"
+#include "../common.h"
-
-#include "../defs.h"
-#include "../structs.h"
 
 #define AI_EVADE		0
 #define AI_FALLBACK		1

src/battle/battle.h

@@ -18,10 +18,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "SDL2/SDL.h"
+#include "../common.h"
 
-#include "../defs.h"
-#include "../structs.h"
 #include "../json/cJSON.h"
 
 #define SHOW_BATTLE			0

src/battle/bullets.h

@@ -18,10 +18,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "SDL2/SDL.h"
+#include "../common.h"
 
-#include "../defs.h"
-#include "../structs.h"
 #include "../json/cJSON.h"
 
 #define TURN_SPEED 				2

src/battle/challenges.h

@@ -18,10 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "SDL2/SDL.h"
+#include "../common.h"
-
-#include "../defs.h"
-#include "../structs.h"
 
 extern Battle battle;
 extern Entity *player;

src/battle/effects.h

@@ -18,10 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "SDL2/SDL.h"
+#include "../common.h"
-
-#include "../defs.h"
-#include "../structs.h"
 
 extern void blitScaled(SDL_Texture *texture, int x, int y, int w, int h);
 extern SDL_Texture *getTexture(char *name);

src/battle/entities.h

@@ -18,10 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "SDL2/SDL.h"
+#include "../common.h"
-
-#include "../defs.h"
-#include "../structs.h"
 
 extern void blitRotated(SDL_Texture *t, int x, int y, int angle);
 extern void drawFighter(Entity *e);

src/battle/extractionPoint.h

@@ -18,10 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "SDL2/SDL.h"
+#include "../common.h"
-
-#include "../defs.h"
-#include "../structs.h"
 
 extern SDL_Texture *getTexture(char *filename);
 extern Entity *spawnEntity(void);

src/battle/fighters.h

@@ -18,10 +18,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "SDL2/SDL.h"
+#include "../common.h"
 
-#include "../defs.h"
-#include "../structs.h"
 #include "../json/cJSON.h"
 
 extern SDL_Texture *getTexture(char *filename);

src/battle/grid.h

@@ -18,9 +18,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "SDL2/SDL.h"
+#include "../common.h"
-
-#include "../defs.h"
-#include "../structs.h"
 
 extern Battle battle;

src/battle/hud.h

@@ -18,10 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "SDL2/SDL.h"
+#include "../common.h"
-
-#include "../defs.h"
-#include "../structs.h"
 
 #define MAX_HUD_MESSAGES	6
 

src/battle/items.h

@@ -18,10 +18,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "SDL2/SDL.h"
+#include "../common.h"
 
-#include "../defs.h"
-#include "../structs.h"
 #include "../json/cJSON.h"
 
 extern char *readFile(char *filename);

src/battle/messageBox.h

@@ -18,10 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "SDL2/SDL.h"
+#include "../common.h"
-
-#include "../defs.h"
-#include "../structs.h"
 
 extern void drawText(int x, int y, int size, int align, SDL_Color c, const char *format, ...);
 extern void limitTextWidth(int width);

src/battle/missionInfo.h

@@ -18,10 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "SDL2/SDL.h"
+#include "../common.h"
-
-#include "../defs.h"
-#include "../structs.h"
 
 extern void blit(SDL_Texture *texture, int x, int y, int center);
 extern void drawText(int x, int y, int size, int align, SDL_Color c, const char *format, ...);

src/battle/objectives.h

@@ -18,10 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "SDL2/SDL.h"
+#include "../common.h"
-
-#include "../defs.h"
-#include "../structs.h"
 
 extern void updateChallenges(void);
 extern void addHudMessage(SDL_Color c, char *format, ...);

src/battle/player.h

@@ -18,10 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "SDL2/SDL.h"
+#include "../common.h"
-
-#include "../defs.h"
-#include "../structs.h"
 
 #define MAX_SELECTABLE_PLAYERS	8
 #define MAX_SELECTABLE_TARGETS	8

src/battle/radar.h

@@ -18,10 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "SDL2/SDL.h"
+#include "../common.h"
-
-#include "../defs.h"
-#include "../structs.h"
 
 extern int getDistance(int x1, int y1, int x2, int y2);
 extern void blit(SDL_Texture *texture, int x, int y, int center);

src/battle/rope.h

@@ -18,10 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "SDL2/SDL.h"
+#include "../common.h"
-
-#include "../defs.h"
-#include "../structs.h"
 
 #define ROPE_DISTANCE	128
 

src/battle/script.h

@@ -18,10 +18,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "SDL2/SDL.h"
+#include "../common.h"
 
-#include "../defs.h"
-#include "../structs.h"
 #include "../json/cJSON.h"
 
 extern void completeMission(void);

src/battle/starfield.h

@@ -18,9 +18,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "SDL2/SDL.h"
+#include "../common.h"
-
-#include "../defs.h"
-#include "../structs.h"
 
 extern App app;

src/battle/waypoints.h

@@ -18,10 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "SDL2/SDL.h"
+#include "../common.h"
-
-#include "../defs.h"
-#include "../structs.h"
 
 extern SDL_Texture *getTexture(char *filename);
 extern int getDistance(int x1, int y1, int x2, int y2);

src/common.h

@@ -0,0 +1,9 @@
+#include "stdlib.h"
+#include "stdio.h"
+#include "string.h"
+#include "math.h"
+
+#include "SDL2/SDL.h"
+
+#include "defs.h"
+#include "structs.h"

src/draw/draw.h

@@ -18,10 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "SDL2/SDL.h"
+#include "../common.h"
-
-#include "../defs.h"
-#include "../structs.h"
 
 extern void drawText(int x, int y, int size, int align, SDL_Color c, const char *format, ...);
 extern void drawMouse(void);

src/draw/text.h

@@ -18,11 +18,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "SDL2/SDL.h"
+#include "../common.h"
-#include "SDL2/SDL_ttf.h"
 
-#include "../defs.h"
+#include "SDL2/SDL_ttf.h"
-#include "../structs.h"
 
 extern void blit(SDL_Texture *texture, int x, int y, int centered);
 extern char *getFileLocation(char *filename);

src/galaxy/galacticMap.h

@@ -18,10 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "SDL2/SDL.h"
+#include "../common.h"
-
-#include "../defs.h"
-#include "../structs.h"
 
 #define SHOW_GALAXY			0
 #define SHOW_STAR_SYSTEM	1

src/galaxy/mission.h

@@ -18,11 +18,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "SDL2/SDL.h"
+#include "../common.h"
+
 #include "time.h"
 
-#include "../defs.h"
-#include "../structs.h"
 #include "../json/cJSON.h"
 
 extern long lookup(char *name);

src/galaxy/starSystems.h

@@ -18,10 +18,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "SDL2/SDL.h"
+#include "../common.h"
 
-#include "../defs.h"
-#include "../structs.h"
 #include "../json/cJSON.h"
 
 extern char *readFile(char *filename);

src/galaxy/stats.h

@@ -18,10 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "SDL2/SDL.h"
+#include "../common.h"
-
-#include "../defs.h"
-#include "../structs.h"
 
 #define MAX_STAT_ITEMS 9
 

src/game/game.h

@@ -18,9 +18,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "SDL2/SDL.h"
+#include "../common.h"
-
-#include "../defs.h"
-#include "../structs.h"
 
 extern Game game;

src/game/title.h

@@ -18,10 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "SDL2/SDL.h"
+#include "../common.h"
-
-#include "../defs.h"
-#include "../structs.h"
 
 #define NUM_FIGHTERS 12
 

src/plat/unix/unixInit.h

@@ -23,9 +23,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <unistd.h>
 #include <errno.h>
 
-#include "SDL2/SDL.h"
+#include "../../common.h"
-
-#include "../../defs.h"
-#include "../../structs.h"
 
 extern App app;

src/system/init.h

@@ -18,15 +18,14 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "SDL2/SDL.h"
+#include "../common.h"
+
+#include "../json/cJSON.h"
+
 #include "SDL2/SDL_image.h"
 #include "SDL2/SDL_mixer.h"
 #include "SDL2/SDL_ttf.h"
 
-#include "../defs.h"
-#include "../structs.h"
-#include "../json/cJSON.h"
-
 extern int fileExists(char *filename);
 extern char *readFile(char *filename);
 extern int writeFile(char *filename, char *data);

src/system/input.h

@@ -18,10 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "SDL2/SDL.h"
+#include "../common.h"
-
-#include "../defs.h"
-#include "../structs.h"
 
 extern SDL_Texture *getTexture(char *filename);
 extern void blit(SDL_Texture *texture, int x, int y, int centered);

src/system/io.h

@@ -18,10 +18,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "SDL2/SDL.h"
+#include "../common.h"
+
 #include "sys/stat.h"
 
-#include "../defs.h"
-#include "../structs.h"
-
 extern App app;

src/system/load.h

@@ -18,10 +18,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "SDL2/SDL.h"
+#include "../common.h"
 
-#include "../defs.h"
-#include "../structs.h"
 #include "../json/cJSON.h"
 
 extern char *readFile(char *filename);

src/system/lookup.h

@@ -18,7 +18,4 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "SDL2/SDL.h"
+#include "../common.h"
-
-#include "../defs.h"
-#include "../structs.h"

src/system/options.h

@@ -18,11 +18,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "SDL2/SDL.h"
+#include "../common.h"
-#include "SDL2/SDL_mixer.h"
 
-#include "../defs.h"
+#include "SDL2/SDL_mixer.h"
-#include "../structs.h"
 
 extern void selectWidget(const char *name, const char *group);
 extern Widget *getWidget(const char *name, const char *group);

src/system/save.h

@@ -18,10 +18,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "SDL2/SDL.h"
+#include "../common.h"
 
-#include "../defs.h"
-#include "../structs.h"
 #include "../json/cJSON.h"
 
 extern int writeFile(char *filename, char *data);

src/system/sound.h

@@ -18,12 +18,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "SDL2/SDL.h"
+#include "../common.h"
-#include "SDL2/SDL_mixer.h"
 
-#include "../defs.h"
+#include "SDL2/SDL_mixer.h"
-#include "../structs.h"
-#include "../json/cJSON.h"
 
 #define MAX_BATTLE_SOUND_DISTANCE	1500
 

src/system/textures.h

@@ -18,10 +18,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "SDL2/SDL_image.h"
+#include "../common.h"
 
-#include "../defs.h"
+#include "SDL2/SDL_image.h"
-#include "../structs.h"
 
 extern char *getFileLocation(char *filename);
 

src/system/transition.h

@@ -18,10 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "SDL2/SDL.h"
+#include "../common.h"
-
-#include "../defs.h"
-#include "../structs.h"
 
 extern void prepareScene(void);
 extern void presentScene(void);

src/system/util.h

@@ -18,6 +18,4 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "SDL2/SDL.h"
+#include "../common.h"
-
-#include "../defs.h"

src/system/widgets.h

@@ -18,10 +18,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "SDL2/SDL.h"
+#include "../common.h"
 
-#include "../defs.h"
-#include "../structs.h"
 #include "../json/cJSON.h"
 
 extern void drawText(int x, int y, int size, int align, SDL_Color c, const char *format, ...);

src/test/testMission.h

@@ -18,10 +18,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "SDL2/SDL.h"
+#include "../common.h"
 
-#include "../defs.h"
-#include "../structs.h"
 #include "../json/cJSON.h"
 
 extern void initBattle(void);