2010-06-22 Krzysztof Kosciuszkiewicz <[email protected]>

* V237 * Recent gcc versions deprecate -I- (used from win32 cross compilation). Work around this and change all includes to use <> instead of "".
raceintospace · Jun 22, 2010 · 1dc6a19 · 1dc6a19
1 parent a2c989e
commit 1dc6a19
Show file tree

Hide file tree

Showing 69 changed files with 249 additions and 242 deletions.
diff --git a/Buzz_inc.h b/Buzz_inc.h
@@ -15,10 +15,10 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
-#include "race.h"		// autoconf header
-#include "int_types.h"
-#include "pace.h"
-//#include "valgrind.h"
+#include <race.h>		// autoconf header
+#include <int_types.h>
+#include <pace.h>
+//#include <valgrind.h>
 
 #ifndef ui8
 typedef uint8_t ui8;
@@ -60,12 +60,12 @@ typedef int32_t i32;
 #include <sys/stat.h>
 
 // EMS Includes
-// #include "sv_lib.h"
+// #include <sv_lib.h>
 
 /* FIXME: non-portable. Used to get struct layout like in DOS days */
 #pragma pack(1)
 
-#include "data.h"     // main data structures
+#include <data.h>     // main data structures
 
 /* get the alignment back to defaults */
 /* #pragma pack() */
@@ -76,13 +76,13 @@ typedef int32_t i32;
  * code use the gamedata.c interfaces. */
 #define ALTERED_STRUCTURE_PACKING
 
-#include "proto.h"    // prototypes and general defines
-#include "music.h"    // defines for music names
+#include <proto.h>    // prototypes and general defines
+#include <music.h>    // defines for music names
 
-#include "endianness.h"
+#include <endianness.h>
 
-#include "macros.h"		// Collected Macros
+#include <macros.h>		// Collected Macros
 
-#include "fs.h"
+#include <fs.h>
 
 #define random brandom
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,10 @@
+2010-06-22	Krzysztof Kosciuszkiewicz <[email protected]>
+
+	* V237
+
+	* Recent gcc versions deprecate -I- (used from win32 cross compilation).
+	Work around this and change all includes to use <> instead of "".
+
 2010-04-14	Leon Baradat <[email protected]>
 
 	* V236

diff --git a/Makefile.in b/Makefile.in
@@ -1,8 +1,9 @@
 # @configure_input@
 
 CC=@CC@
+CROSS=@CROSS@
 LIBS=@LIBS@ @OGG_LIBS@ @VORBIS_LIBS@ @THEORA_LIBS@ @SDL_LIBS@
-CPPFLAGS=@CPPFLAGS@ @OGG_CFLAGS@ @VORBIS_CFLAGS@ @THEORA_CFLAGS@ \
+CPPFLAGS=@CPPFLAGS@ -I. @OGG_CFLAGS@ @VORBIS_CFLAGS@ @THEORA_CFLAGS@ \
 		 @SDL_CFLAGS@ -DCONFIG_DATADIR=\"${DATA_DIR}\"
 PACKAGE_TARNAME=@PACKAGE_TARNAME@
 VERSION=@PACKAGE_VERSION@

diff --git a/admin.c b/admin.c
@@ -27,11 +27,11 @@
  * 
  */
 
-#include "Buzz_inc.h"
-#include "externs.h"
-#include "av.h"
-#include "utils.h"
-#include "logging.h"
+#include <Buzz_inc.h>
+#include <externs.h>
+#include <av.h>
+#include <utils.h>
+#include <logging.h>
 
 #define MODEM_ERROR 4
 #define NOTSAME 2

diff --git a/aimast.c b/aimast.c
@@ -25,8 +25,8 @@
 /** \file aimast.c AI Master Routines
  */
 
-#include "Buzz_inc.h"
-#include "externs.h"
+#include <Buzz_inc.h>
+#include <externs.h>
 
 extern char Month[12][11];
 extern char AI[2];

diff --git a/aimis.c b/aimis.c
@@ -24,8 +24,8 @@
 //
 // AI Master Routines
 
-#include "Buzz_inc.h"
-#include "externs.h"
+#include <Buzz_inc.h>
+#include <externs.h>
 
 struct cStr {i16 cost,sf,i;} Mew[5];
 int whe[2],rck[2];

diff --git a/aipur.c b/aipur.c
@@ -25,8 +25,8 @@
 /** \file aipur.c AI Purchasing Routines
  */
 
-#include "Buzz_inc.h"
-#include "externs.h"
+#include <Buzz_inc.h>
+#include <externs.h>
 
 struct ManPool *Men;
 char AIsel[25],AIMaxSel,Obs[6]; //indexed 1 thru 5

diff --git a/ast0.c b/ast0.c
@@ -23,9 +23,9 @@
 // Programmed by Michael K McCarty
 //
 
-#include "gamedata.h"
-#include "Buzz_inc.h"
-#include "externs.h"
+#include <gamedata.h>
+#include <Buzz_inc.h>
+#include <externs.h>
 
 char MCol[110],sel[25],MaxSel;
 

diff --git a/ast1.c b/ast1.c
@@ -25,8 +25,8 @@
 /** \file ast1.c Astronaut Recruitment
  */
 
-#include "Buzz_inc.h"
-#include "externs.h"
+#include <Buzz_inc.h>
+#include <externs.h>
 
 extern char MCol[110],sel[30],MaxSel;
 extern struct ManPool *Men;

diff --git a/ast2.c b/ast2.c
@@ -23,8 +23,8 @@
 // Programmed by Michael K McCarty
 //
 
-#include "Buzz_inc.h"
-#include "externs.h"
+#include <Buzz_inc.h>
+#include <externs.h>
 
 int lenprogname;  // Variable to hold and manipulate length of program name
 

diff --git a/ast3.c b/ast3.c
@@ -25,8 +25,8 @@
 /** \file ast3.c Training and Hospital code
  */
 
-#include "Buzz_inc.h"
-#include "externs.h"
+#include <Buzz_inc.h>
+#include <externs.h>
 
 
 void DrawTrain(char plr,char lvl)

diff --git a/ast4.c b/ast4.c
@@ -23,9 +23,9 @@
 // Programmed by Michael K McCarty
 //
 
-#include "gamedata.h"
-#include "Buzz_inc.h"
-#include "externs.h"
+#include <gamedata.h>
+#include <Buzz_inc.h>
+#include <externs.h>
 
 #define Guy(a,b,c,d) (Data->P[a].Crew[b][c][d]-1)
 

diff --git a/budget.c b/budget.c
@@ -23,8 +23,8 @@
 // Programmed by Michael K McCarty
 //
 
-#include "Buzz_inc.h"
-#include "externs.h"
+#include <Buzz_inc.h>
+#include <externs.h>
 
 #define DELAYCNT 10
 

diff --git a/configure.in b/configure.in
@@ -2,7 +2,7 @@ dnl ===========================
 dnl === Initialize autoconf ===
 dnl ===========================
 
-AC_INIT(Race Into Space,0.4.7,[email protected],raceintospace)
+AC_INIT(Race Into Space,0.4.8,[email protected],raceintospace)
 
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -99,19 +99,24 @@ dnl Get the operating system and version number...
 uname=`uname`
 
 dnl cross-compile specific configuration
-case "$host" in
-i?86-mingw32msvc)
-	dnl Windows/CygWin configuration
-	AC_DEFINE([CONFIG_WIN32], 1,
-			  [Define to 1 if building for win32 platform.])
-	build_win=yes
-	;;
-*)
-	dnl Everyone else
-	dnl PROG_NAME=raceintospace
-	dnl LIBS="`sdl-config --libs` $LIBS"
-	;;
-esac
+cross=""
+if test "x$cross_compiling" = xyes ; then
+	cross="${host}-"
+	case "$host" in
+	i?86-mingw32msvc)
+		dnl Windows/CygWin configuration
+		AC_DEFINE([CONFIG_WIN32], 1,
+				  [Define to 1 if building for win32 platform.])
+		build_win=yes
+		;;
+	*)
+		dnl Everyone else
+		dnl PROG_NAME=raceintospace
+		dnl LIBS="`sdl-config --libs` $LIBS"
+		;;
+	esac
+fi
+AC_SUBST([CROSS], $cross)
 
 dnl XXX: this gives the build configuration, not host configuration!
 if test -z "$build_win" ; then

diff --git a/crew.c b/crew.c
@@ -15,8 +15,8 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
-#include "Buzz_inc.h"
-#include "externs.h"
+#include <Buzz_inc.h>
+#include <externs.h>
 
 extern struct mStr Mis;
 

diff --git a/endgame.c b/endgame.c
@@ -18,8 +18,8 @@
 /** \file endgame.c End Game Routines
  */
 
-#include "Buzz_inc.h"
-#include "externs.h"
+#include <Buzz_inc.h>
+#include <externs.h>
 
 #define NUM_LIGHTS 100
 #define FLY_TIME 20

diff --git a/endianness.c b/endianness.c
@@ -1,6 +1,6 @@
-#include "assert.h"
-#include "Buzz_inc.h"
-#include "externs.h"
+#include <assert.h>
+#include <Buzz_inc.h>
+#include <externs.h>
 
 // Need these functions to always exist
 uint32_t _Swap32bit(uint32_t value)

diff --git a/fs.c b/fs.c
@@ -21,11 +21,11 @@
  * 
  */
 
-#include "fs.h"
-#include "options.h"
-#include "pace.h"
-#include "utils.h"
-#include "logging.h"
+#include <fs.h>
+#include <options.h>
+#include <pace.h>
+#include <utils.h>
+#include <logging.h>
 #include <assert.h>
 #include <stdio.h>
 #include <string.h>

diff --git a/fs.h b/fs.h
@@ -1,7 +1,7 @@
 #ifndef _FS_H
 #define _FS_H
 
-#include "race.h"
+#include <race.h>
 #include <stdio.h>
 
 /** \file fs.h Definitions for filesystem

diff --git a/futbub.c b/futbub.c
@@ -23,8 +23,8 @@
  * It also draws the splines.
  */
 
-#include  "Buzz_inc.h"
-#include "externs.h"
+#include  <Buzz_inc.h>
+#include <externs.h>
 
 extern int SEG;
 int Bub_Num,Bub_Count;

diff --git a/future.c b/future.c
@@ -18,10 +18,10 @@
 /** \file future.c This is responsible for Future Mission planning screen.
  * 
  */
-#include "Buzz_inc.h"
-#include "externs.h"
+#include <Buzz_inc.h>
+#include <externs.h>
 #include <assert.h>
-#include "logging.h"
+#include <logging.h>
 
 LOG_DEFAULT_CATEGORY(future)
 

diff --git a/gamedata.c b/gamedata.c
@@ -1,7 +1,7 @@
-#include "race.h"
+#include <race.h>
 #include <stdio.h>
-#include "gamedata.h"
-#include "int_types.h"  /* auto-generated inttypes.h */
+#include <gamedata.h>
+#include <int_types.h>  /* auto-generated inttypes.h */
 
 /* Definitions for scalar types */
 

diff --git a/gamedata.h b/gamedata.h
@@ -7,9 +7,9 @@
 #undefined /* to make errors appear on all compilers */
 #endif
 
-#include "race.h"
+#include <race.h>
 #include <stdio.h>
-#include "int_types.h"  /* auto-generated inttypes.h */
+#include <int_types.h>  /* auto-generated inttypes.h */
 
 /** Routines for read/write access to LITTLE ENDIAN data in game files */
 extern size_t fread_uint8_t(uint8_t *dst, size_t nelem, FILE *file);

diff --git a/getport.c b/getport.c
@@ -1,4 +1,4 @@
-#include "Buzz_inc.h"
+#include <Buzz_inc.h>
 
 struct FHead {
    char Text[28];  // File Copyright Notice

diff --git a/gr.c b/gr.c
@@ -1,5 +1,5 @@
-#include "Buzz_inc.h"
-#include "externs.h"
+#include <Buzz_inc.h>
+#include <externs.h>
 #include <assert.h>
 
 #ifdef DEAD_CODE

diff --git a/gx.c b/gx.c
@@ -1,9 +1,9 @@
-#include "Buzz_inc.h"
+#include <Buzz_inc.h>
 #include <limits.h>
 #include <assert.h>
-#include "externs.h"
-#include "av.h"
-#include "utils.h"
+#include <externs.h>
+#include <av.h>
+#include <utils.h>
 #include <SDL.h>
 
 extern GXHEADER vhptr;

diff --git a/hardef.c b/hardef.c
@@ -25,8 +25,8 @@
 //
 // Museum Main Files
 
-#include "Buzz_inc.h"
-#include "externs.h"
+#include <Buzz_inc.h>
+#include <externs.h>
 
 extern GXHEADER but;
 extern char Option, MAIL;

diff --git a/intel.c b/intel.c
@@ -24,9 +24,9 @@
 //
 // Museum Main Files
 
-#include "gamedata.h"
-#include "Buzz_inc.h"
-#include "externs.h"
+#include <gamedata.h>
+#include <Buzz_inc.h>
+#include <externs.h>
 
 extern struct mStr Mis;