Fix sdl build on MACOS

Need to include sf_frotz.h before system headers for MACOS build

diff --git a/src/sdl/generic.c b/src/sdl/generic.c
index 670a81a9c129f9bcfdf662203896d1bd491d70ad..148eec981cf113b4df919304cc642d774bc4da1a 100644 (file)
--- a/src/sdl/generic.c
+++ b/src/sdl/generic.c
@@ -5,6 +5,8 @@
  * really be put somewhere so that they can be shared.  For now, this.
  */
 
+#include "../common/frotz.h"
+
 #include <stddef.h>
 #include <stdarg.h>
 #include <stdlib.h>
@@ -12,7 +14,6 @@
 #include <string.h>
 
 #include "../blorb/blorb.h"
-#include "../common/frotz.h"
 #include "generic.h"
 
 FILE *blorb_fp;

diff --git a/src/sdl/sf_fonts.c b/src/sdl/sf_fonts.c
index 2d236a5c4885b48e9328c317cfd555f0fed0beaf..63f85046957de7ac475acfacfa1bf6a715e7a272 100644 (file)
--- a/src/sdl/sf_fonts.c
+++ b/src/sdl/sf_fonts.c
@@ -1,9 +1,9 @@
+#include "sf_frotz.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include "sf_frotz.h"
-
 // font handling
 
 /*

diff --git a/src/sdl/sf_ftype.c b/src/sdl/sf_ftype.c
index b4d0a637b7fb5b136efcb8058cbe3e2e5faacf9c..537c4305b1491ed0cdd26184e4f0b8304275fa4a 100644 (file)
--- a/src/sdl/sf_ftype.c
+++ b/src/sdl/sf_ftype.c
@@ -1,3 +1,5 @@
+#include "sf_frotz.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -7,8 +9,6 @@
 #include <ft2build.h>
 #include FT_FREETYPE_H
 
-#include "sf_frotz.h"
-
 /////////////////////////////////////////////////////////////////
 
 static char * sf_searchfile( char *fn, int fnlen, char *buf, char *paths)

diff --git a/src/sdl/sf_images.c b/src/sdl/sf_images.c
index 358ae22f38cfc321cb34db197951ad167386743b..787bd944b293a9216221c976050cdcbb8d1a4a77 100644 (file)
--- a/src/sdl/sf_images.c
+++ b/src/sdl/sf_images.c
@@ -1,11 +1,11 @@
+#include "sf_frotz.h"
+
 #include <stdarg.h>
 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include "sf_frotz.h"
-
 #include <math.h>
 
 #include "png.h"

diff --git a/src/sdl/sf_osfdlg.c b/src/sdl/sf_osfdlg.c
index e4cc82a52fdebe42cd64b540a7a2c05a9e9b38a8..f78bb9c8070338b2678e85643d7540c318294f5b 100644 (file)
--- a/src/sdl/sf_osfdlg.c
+++ b/src/sdl/sf_osfdlg.c
@@ -1,3 +1,5 @@
+#include "sf_frotz.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -8,8 +10,6 @@
 
 #define STATIC static
 
-#include "sf_frotz.h"
-
 typedef struct {
   void *left, *right;
   char *value;

diff --git a/src/sdl/sf_resource.c b/src/sdl/sf_resource.c
index 35b97bd3659a8f8cfbe6c9dd798a537b03f22a0d..386cf31c224dbecddcba525b37d7cc1f0d0be4f3 100644 (file)
--- a/src/sdl/sf_resource.c
+++ b/src/sdl/sf_resource.c
@@ -1,3 +1,5 @@
+#include "sf_frotz.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -9,7 +11,6 @@
 
 #include <SDL.h>
 
-#include "sf_frotz.h"
 #include "../blorb/blorb.h"
 #include "../blorb/blorblow.h"
 

diff --git a/src/sdl/sf_sound.c b/src/sdl/sf_sound.c
index 955025274881a021a35fd80dd647dd2704d1464b..9ebf6f439b08710854005b13c4138f8ade671b12 100644 (file)
--- a/src/sdl/sf_sound.c
+++ b/src/sdl/sf_sound.c
@@ -1,3 +1,5 @@
+#include "sf_frotz.h"
+
 #include <stdarg.h>
 #include <unistd.h>
 #include <stdio.h>
@@ -5,7 +7,6 @@
 #include <string.h>
 #include <errno.h>
 
-#include "sf_frotz.h"
 #include "../blorb/blorblow.h"
 
 #include <SDL.h>

diff --git a/src/sdl/sf_util.c b/src/sdl/sf_util.c
index 997785075e264e51c3cff2358e6afec0dafe25fd..741c7fd4636e35970b693d947cc15e64760b637e 100644 (file)
--- a/src/sdl/sf_util.c
+++ b/src/sdl/sf_util.c
@@ -1,3 +1,5 @@
+#include "sf_frotz.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -12,8 +14,6 @@
 #include <io.h>
 #endif
 
-#include "sf_frotz.h"
-
 f_setup_t f_setup;
 
 typedef void (*CLEANFUNC)();

diff --git a/src/sdl/sf_video.c b/src/sdl/sf_video.c
index ba4fa3fa4777ed40a4a1d19d465c6f2a9b9ece2b..d10782aaf11fcb889004ef79e8d77932368f5cd1 100644 (file)
--- a/src/sdl/sf_video.c
+++ b/src/sdl/sf_video.c
@@ -1,3 +1,5 @@
+#include "sf_frotz.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -9,8 +11,6 @@
 
 #include "generic.h"
 
-#include "sf_frotz.h"
-
 static char banner[256];
 static int isfullscreen;
 static ulong *sbuffer = NULL;