lame attempt to speed compile

src/audio.cpp

@@ -2,9 +2,10 @@
 // Copyright Neil McGill, [email protected]
 //
 
-#include "my_main.hpp"
 #include <SDL_mixer.h>
 
+#include "my_main.hpp"
+
 uint8_t audio_init_done;
 
 void audio_fini(void)

src/c_plus_plus_serializer.hpp

@@ -3,7 +3,6 @@
 #ifndef C_PLUS_PLUS_SERIALIZER
 #define C_PLUS_PLUS_SERIALIZER
 #include <fstream>
-// REMOVED #include <iostream>
 #include <sstream>
 #include <vector>
 

src/config.hpp

@@ -1,3 +1,2 @@
-// REMOVED #include "my_cfg.hpp"
 #define HAVE_LIBUNWIND
 #define MYVER "0.0.1"

src/game_load.cpp

@@ -7,7 +7,6 @@
 #include "my_array_bounds_check.hpp"
 #include "my_sdl_proto.hpp"
 #include "my_serialize.hpp"
-// REMOVED #include "my_ui.hpp"
 #include "my_wid_error.hpp"
 #include "my_wid_popup.hpp"
 

src/game_seed.cpp

@@ -3,7 +3,6 @@
 //
 
 #include "my_game.hpp"
-// REMOVED #include "my_level.hpp"
 #include "my_random.hpp"
 #include "my_random_name.hpp"
 

src/main.cpp

@@ -22,6 +22,7 @@
 #include "my_gfx.hpp"
 #include "my_main.hpp"
 #include "my_music.hpp"
+#include "my_ptrcheck.hpp"
 #include "my_ramdisk.hpp"
 #include "my_random.hpp"
 #include "my_sdl_proto.hpp"

src/music.cpp

@@ -2,11 +2,12 @@
 // Copyright Neil McGill, [email protected]
 //
 
+#include <SDL_mixer.h>
+
 #include "my_file.hpp"
 #include "my_game.hpp"
 #include "my_music.hpp"
 #include "my_ptrcheck.hpp"
-#include <SDL_mixer.h>
 
 class music
 {

src/my_callstack.hpp

@@ -6,7 +6,6 @@
 #define _MY_CALLSTACK_HPP_
 
 #include "my_main.hpp"
-// REMOVED #include "my_sys.hpp"
 #include <string>
 
 #define CAT(A, B)  A##B

src/my_cfg.hpp

@@ -6,7 +6,6 @@
 #ifndef _MY_CONFIG_HPP_
 #define _MY_CONFIG_HPP_
 
-// REMOVED #include "cfg.hpp"
 
 #define ENABLE_ASSERT             // Abort on errors
 #define ENABLE_CRASH_HANDLER      // Intercept SEGV and other faults

src/my_font.hpp

@@ -6,7 +6,6 @@
 #ifndef _MY_FONT_HPP_
 #define _MY_FONT_HPP_
 
-// REMOVED #include "my_fwd.hpp"
 #include "my_tile.hpp"
 #include <array> // do not remove
 

src/my_game.hpp

@@ -7,7 +7,6 @@
 #define _MY_GAME_HPP_
 
 #include <SDL.h>
-#include <vector>
 
 #include "my_fwd.hpp"
 #include "my_game_defs.hpp"

src/my_hiscore.hpp

@@ -54,4 +54,4 @@ class HiScores
   const char *place_str(int score);
 };
 
-#endif // _MY_THING_HPP_
+#endif // _MY_HISCORE_HPP_

src/my_pixel.hpp

@@ -9,7 +9,6 @@
 #include <SDL.h>
 
 #include "my_color.hpp"
-// REMOVED #include "my_sys.hpp"
 
 #define pixel_ANYw(s, y)             ((y) * (s->pitch / s->format->BytesPerPixel))
 #define pixel_32bpp(s, x, y)         ((uint32_t *) s->pixels + (x) + pixel_ANYw(s, y))

src/my_ptrcheck.hpp

@@ -3,6 +3,8 @@
 #ifndef _MY__PTRCHECK_HPP__
 #define _MY__PTRCHECK_HPP__
 
+#include "my_source_loc.hpp"
+
 //
 // __FUNCTION__ is not a preprocessor directive so we can't convert it into a
 // string

src/my_sound.hpp

@@ -9,10 +9,6 @@
 #ifndef _MY_SOUND_HPP_
 #define _MY_SOUND_HPP_
 
-#include "my_ptrcheck.hpp"
-
-#include <SDL_mixer.h>
-
 class sound;
 using soundp = class sound *;
 
@@ -25,26 +21,6 @@ bool sound_play(const std::string &alias);
 bool sound_play_channel(int chan, const std::string &alias);
 void sound_halt(void);
 
-class sound
-{
-public:
-  sound(std::string alias) : alias(alias) {}
-
-  ~sound(void)
-  {
-    Mix_FreeChunk(chunk);
-    myfree(data);
-  }
-
-  std::string    alias;
-  Mix_Chunk     *chunk = {};
-  unsigned char *data  = {};
-  int            len   = {};
-  float          volume {};
-};
-
-extern std::map< std::string, class sound * > all_sound;
-
 enum {
   CHANNEL_MISC,
   CHANNEL_FOOTSTEPS,

src/my_sprintf.hpp

@@ -7,7 +7,6 @@
 #define _MY_SPRINTF_HPP_
 
 #include "my_main.hpp"
-// REMOVED #include <string>
 
 std::string string_sprintf(const char *format, ...) CHECK_FORMAT_STR(printf, 1, 2);
 std::string string_sprintf(const char *format, va_list args);

src/precompiled.hpp

@@ -1,5 +1,3 @@
-#include <SDL.h>
-#include <SDL_mixer.h>
 #include <array>
 #include <cstdint>
 #include <cstring>
@@ -33,6 +31,7 @@
 #include "my_audio.hpp"
 #include "my_callstack.hpp"
 #include "my_command.hpp"
+#include "my_cpp_template.hpp"
 #include "my_dir.hpp"
 #include "my_enum.hpp"
 #include "my_file.hpp"
@@ -47,7 +46,6 @@
 #include "my_sdl_proto.hpp"
 #include "my_sound.hpp"
 #include "my_thing.hpp"
-#include "my_thing_id.hpp"
 #include "my_tp.hpp"
 #include "my_tps.hpp"
 #include "my_wid_console.hpp"

src/sound.cpp

@@ -2,10 +2,31 @@
 // Copyright Neil McGill, [email protected]
 //
 
+#include <SDL_mixer.h>
+
 #include "my_file.hpp"
 #include "my_game.hpp"
+#include "my_ptrcheck.hpp"
 #include "my_sound.hpp"
 
+class sound
+{
+public:
+  sound(std::string alias) : alias(alias) {}
+
+  ~sound(void)
+  {
+    Mix_FreeChunk(chunk);
+    myfree(data);
+  }
+
+  std::string    alias;
+  Mix_Chunk     *chunk = {};
+  unsigned char *data  = {};
+  int            len   = {};
+  float          volume {};
+};
+
 std::map< std::string, class sound * > all_sound;
 
 bool sound_init_done;

src/tile_blit.cpp

@@ -3,7 +3,6 @@
 //
 
 #include "my_color_defs.hpp"
-// REMOVED #include "my_game.hpp"
 #include "my_random.hpp"
 #include "my_tile.hpp"
 

src/tp.cpp

@@ -5,7 +5,6 @@
 #include <inttypes.h>
 
 #include "my_ptrcheck.hpp"
-// REMOVED #include "my_string.hpp"
 #include "my_tp.hpp"
 #include "my_tps.hpp"
 #include "my_vector_bounds_check.hpp"