include allegro_color and platform specific headers already in libsuperderpy.h, clean up

src/CMakeLists.txt

@@ -1,15 +1,15 @@
 SET(SRC_LIST
-	utils.c
+	character.c
-	maths.c
 	config.c
-	timeline.c
 	gamestate.c
+	internal.c
 	libsuperderpy.c
 	mainloop.c
-	character.c
+	maths.c
-	internal.c
-	tween.c
 	shader.c
+	timeline.c
+	tween.c
+	utils.c
 )
 if (EMSCRIPTEN)
 	list(APPEND SRC_LIST emscripten-audio-stream.c)

src/character.c

@@ -19,12 +19,6 @@
  */
 
 #include "internal.h"
-#include "utils.h"
-#include <allegro5/allegro_primitives.h>
-#include <allegro5/allegro_ttf.h>
-#include <math.h>
-#include <stdio.h>
-#include <string.h>
 
 SYMBOL_EXPORT void SelectSpritesheet(struct Game* game, struct Character* character, char* name) {
 	struct Spritesheet* tmp = character->spritesheets;

src/character.h

@@ -22,8 +22,6 @@
 #define LIBSUPERDERPY_CHARACTER_H
 
 #include "libsuperderpy.h"
-#include <allegro5/allegro.h>
-#include <allegro5/allegro_font.h>
 
 struct SpritesheetFrame {
 	char* file;

src/config.c

@@ -17,9 +17,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "config.h"
+
 #include "internal.h"
-#include <allegro5/allegro.h>
 
 SYMBOL_EXPORT void InitConfig(struct Game* game) {
 	const ALLEGRO_FILE_INTERFACE* iface = al_get_new_file_interface();

src/emscripten-audio-stream.c

@@ -19,7 +19,6 @@
  */
 
 #include "internal.h"
-#include "emscripten.h"
 
 #undef al_create_audio_stream
 #undef al_load_audio_stream

src/emscripten-audio-stream.h

@@ -23,7 +23,7 @@
 #ifndef LIBSUPERDERPY_EMSCRIPTEN_H
 #define LIBSUPERDERPY_EMSCRIPTEN_H
 
-#include <allegro5/allegro_audio.h>
+#include "libsuperderpy.h"
 
 typedef struct {
 	ALLEGRO_SAMPLE* sample;

src/gamestate.c

@@ -18,9 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "gamestate.h"
 #include "internal.h"
-#include "utils.h"
 
 static struct Gamestate* AddNewGamestate(struct Game* game, const char* name) {
 	struct Gamestate* tmp = game->_priv.gamestates;

src/gamestate.h

@@ -21,7 +21,6 @@
 #define LIBSUPERDERPY_GAMESTATE_H
 
 #include "libsuperderpy.h"
-#include <allegro5/allegro.h>
 
 struct Gamestate_API {
 	void (*Gamestate_Draw)(struct Game* game, void* data);

src/internal.c

@@ -19,11 +19,7 @@
 
 #include "internal.h"
 #include "3rdparty/valgrind.h"
-#include "libsuperderpy.h"
-#include <allegro5/allegro_ttf.h>
 #include <dlfcn.h>
-#include <math.h>
-#include <stdio.h>
 
 SYMBOL_INTERNAL void SimpleCompositor(struct Game* game, struct Gamestate* gamestates) {
 	struct Gamestate* tmp = gamestates;

src/internal.h

@@ -19,8 +19,6 @@
 #define LIBSUPERDERPY_INTERNAL_H
 
 #include "libsuperderpy.h"
-#include <allegro5/allegro.h>
-#include <allegro5/allegro_font.h>
 
 #if defined(_WIN32) || defined(__CYGWIN__)
 #define SYMBOL_INTERNAL

src/libsuperderpy.c

@@ -25,14 +25,10 @@
 #define ALLEGRO_UNSTABLE
 #endif
 
-#include "libsuperderpy.h"
 #include "internal.h"
 #include <dlfcn.h>
 #include <libgen.h>
 #include <locale.h>
-#include <math.h>
-#include <stdio.h>
-#include <sys/param.h>
 #include <unistd.h>
 #ifdef ALLEGRO_MACOSX
 #include <mach-o/dyld.h>

src/libsuperderpy.h

@@ -32,20 +32,33 @@ struct GamestateResources;
 #include <allegro5/allegro.h>
 #include <allegro5/allegro_acodec.h>
 #include <allegro5/allegro_audio.h>
+#include <allegro5/allegro_color.h>
 #include <allegro5/allegro_font.h>
 #include <allegro5/allegro_image.h>
 #include <allegro5/allegro_opengl.h>
 #include <allegro5/allegro_primitives.h>
 #include <allegro5/allegro_ttf.h>
 #include <allegro5/allegro_video.h>
-#ifdef ALLEGRO_ANDROID
+#include <math.h>
+#include <stdio.h>
+#include <string.h>
+#include <sys/param.h>
+
+#if defined(ALLEGRO_ANDROID)
 #define ALLEGRO_UNSTABLE
 #include <allegro5/allegro_android.h>
-#endif
+#elif defined(ALLEGRO_WINDOWS)
-#ifdef __EMSCRIPTEN__
+#include <allegro5/allegro_windows.h>
-#include "emscripten-audio-stream.h"
+#elif defined(ALLEGRO_WITH_XWINDOWS)
+#include <allegro5/allegro_x.h>
+#elif defined(ALLEGRO_MACOS)
+#include <allegro5/allegro_osx.h>
+#elif defined(ALLEGRO_IPHONE)
+#include <allegro5/allegro_iphone.h>
+#elif defined(__EMSCRIPTEN__)
 #include <emscripten.h>
 #endif
+
 #include "character.h"
 #include "config.h"
 #include "gamestate.h"
@@ -55,8 +68,9 @@ struct GamestateResources;
 #include "timeline.h"
 #include "tween.h"
 #include "utils.h"
-#include <math.h>
+#ifdef __EMSCRIPTEN__
-#include <sys/param.h>
+#include "emscripten-audio-stream.h"
+#endif
 
 #define LIBSUPERDERPY_BITMAP_HASHMAP_BUCKETS 16
 

src/mainloop.c

@@ -21,7 +21,6 @@
  */
 
 #include "internal.h"
-#include "libsuperderpy.h"
 
 static inline void HandleEvent(struct Game* game, ALLEGRO_EVENT* ev) {
 	switch (ev->type) {

src/maths.c

@@ -18,14 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "maths.h"
-#include "config.h"
 #include "internal.h"
-#include <allegro5/allegro_primitives.h>
-#include <allegro5/allegro_ttf.h>
-#include <math.h>
-#include <stdio.h>
-#include <string.h>
 
 SYMBOL_EXPORT double DotProduct(const double v[], const double u[], int n) {
 	float result = 0.0;

src/maths.h

@@ -22,8 +22,6 @@
 #define LIBSUPERDERPY_MATHS_H
 
 #include "libsuperderpy.h"
-#include <allegro5/allegro.h>
-#include <allegro5/allegro_font.h>
 
 double DotProduct(const double v[], const double u[], int n);
 double VectorLength(double x, double y, double z);

src/shader.c

@@ -17,10 +17,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "shader.h"
+
 #include "internal.h"
-#include <allegro5/allegro.h>
-#include <math.h>
 
 static ALLEGRO_USTR* GetShaderSource(struct Game* game, const char* filename) {
 	ALLEGRO_FILE* fp = al_fopen(filename, "r");

src/timeline.c

@@ -17,10 +17,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "timeline.h"
+
 #include "internal.h"
-#include "utils.h"
-#include <allegro5/allegro.h>
 
 static void DestroyArgs(struct TM_Arguments* args) {
 	struct TM_Arguments* pom;

src/tween.c

@@ -17,10 +17,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "tween.h"
+
 #include "internal.h"
-#include <allegro5/allegro.h>
-#include <math.h>
 
 // Easing formulas (c) 2011, Auerhaus Development, LLC
 // Originally licensed under WTFPL 2.0

src/utils.c

@@ -18,14 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "utils.h"
-#include "config.h"
 #include "internal.h"
-#include <allegro5/allegro_primitives.h>
-#include <allegro5/allegro_ttf.h>
-#include <math.h>
-#include <stdio.h>
-#include <string.h>
 #ifdef ALLEGRO_ANDROID
 #include <android/log.h>
 #endif

src/utils.h

@@ -22,8 +22,6 @@
 #define LIBSUPERDERPY_UTILS_H
 
 #include "libsuperderpy.h"
-#include <allegro5/allegro.h>
-#include <allegro5/allegro_font.h>
 
 #ifdef ALLEGRO_WINDOWS
 #define LIBRARY_EXTENSION ".dll"