From 21eeeef57fd1a8b90cb2f35f914a288d05f405d9 Mon Sep 17 00:00:00 2001 From: Bradley Bell Date: Fri, 11 Apr 2003 23:53:15 +0000 Subject: [PATCH] use different defines for os x --- ChangeLog | 4 ++++ arch/ogl/gr.c | 6 +++--- arch/ogl/ogl.c | 6 +++--- configure.ac | 5 +---- include/ogl_init.h | 2 +- include/pstypes.h | 4 ++-- main/state.c | 17 ++++++++--------- mem/mem.c | 6 +++--- 8 files changed, 25 insertions(+), 25 deletions(-) diff --git a/ChangeLog b/ChangeLog index 93367bf2..d37d36de 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2003-04-11 Bradley Bell + + * configure.ac: use different defines for os x + 2003-04-07 Bradley Bell * include/error.h, misc/error.c: put some old stuff back in, diff --git a/arch/ogl/gr.c b/arch/ogl/gr.c index 9af9a686..077f4493 100644 --- a/arch/ogl/gr.c +++ b/arch/ogl/gr.c @@ -1,4 +1,4 @@ -/* $Id: gr.c,v 1.12 2003-03-30 04:06:40 btb Exp $ */ +/* $Id: gr.c,v 1.13 2003-04-11 23:51:48 btb Exp $ */ /* * * OGL video functions. - Added 9/15/99 Matthew Mueller @@ -17,7 +17,7 @@ #include #endif -#ifdef __MACOSX__ +#if defined(__APPLE__) && defined(__MACH__) //#include #else //#include @@ -48,7 +48,7 @@ #define DECLARE_VARS #include "ogl_init.h" -#ifdef __MACOSX__ +#if defined(__APPLE__) && defined(__MACH__) #include #undef GL_ARB_multitexture // hack! #else diff --git a/arch/ogl/ogl.c b/arch/ogl/ogl.c index 7e643875..5fd4dc6c 100644 --- a/arch/ogl/ogl.c +++ b/arch/ogl/ogl.c @@ -1,4 +1,4 @@ -/* $Id: ogl.c,v 1.8 2003-01-15 21:36:12 btb Exp $ */ +/* $Id: ogl.c,v 1.9 2003-04-11 23:51:48 btb Exp $ */ /* * * Graphics support functions for OpenGL. @@ -15,7 +15,7 @@ #include #include #endif -#ifdef __MACOSX__ +#if defined(__APPLE__) && defined(__MACH__) #include #include #else @@ -56,7 +56,7 @@ #define M_PI 3.14159 #endif -#if defined(__WINDOWS__) || defined(__MINGW32__) || defined(__MACOSX__) || defined(__sun__) +#if defined(__WINDOWS__) || defined(__MINGW32__) || (defined(__APPLE__) && defined(__MACH__)) || defined(__sun__) #define cosf(a) cos(a) #define sinf(a) sin(a) #endif diff --git a/configure.ac b/configure.ac index 4f0d1293..1f9df9dd 100644 --- a/configure.ac +++ b/configure.ac @@ -69,9 +69,6 @@ else GL_LIBS="GL GLU" fi -if test x$MACOSX = xyes; then - AC_DEFINE(__MACOSX__,,[Define if building on MAC OS X]) -fi AM_CONDITIONAL(MACOSX, test x$MACOSX = xyes) dnl Set $prefix and $exec_prefix to $ac_default_prefix if they are not set @@ -306,7 +303,7 @@ AH_BOTTOM([ #define PIGGY_USE_PAGING 1 #define NEWDEMO 1 -#ifdef __MACOSX__ +#if defined(__APPLE__) && defined(__MACH__) #define __unix__ #endif diff --git a/include/ogl_init.h b/include/ogl_init.h index 1ca66312..393571fc 100644 --- a/include/ogl_init.h +++ b/include/ogl_init.h @@ -15,7 +15,7 @@ #include "loadgl.h" int ogl_init_load_library(void); #else -#ifdef __MACOSX__ +#if defined(__APPLE__) && defined(__MACH__) #include #else #include diff --git a/include/pstypes.h b/include/pstypes.h index 3afe109f..4b8a6caf 100644 --- a/include/pstypes.h +++ b/include/pstypes.h @@ -1,4 +1,4 @@ -/* $ Id: $ */ +/* $Id: pstypes.h,v 1.19 2003-04-11 23:51:48 btb Exp $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -46,7 +46,7 @@ typedef uint16_t u_int16_t; # include # define _MAX_PATH 1024 # define _MAX_DIR 256 -# ifdef __MACOSX__ +# if defined(__APPLE__) && defined(__MACH__) typedef unsigned long ulong; # endif # ifdef __sun__ diff --git a/main/state.c b/main/state.c index 3cad68a5..c084a8dc 100644 --- a/main/state.c +++ b/main/state.c @@ -1,4 +1,4 @@ -/* $ Id: $ */ +/* $Id: state.c,v 1.8 2003-04-11 23:51:48 btb Exp $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -8,14 +8,14 @@ IN USING, DISPLAYING, AND CREATING DERIVATIVE WORKS THEREOF, SO LONG AS SUCH USE, DISPLAY OR CREATION IS FOR NON-COMMERCIAL, ROYALTY OR REVENUE FREE PURPOSES. IN NO EVENT SHALL THE END-USER USE THE COMPUTER CODE CONTAINED HEREIN FOR REVENUE-BEARING PURPOSES. THE END-USER UNDERSTANDS -AND AGREES TO THE TERMS HEREIN AND ACCEPTS THE SAME BY USE OF THIS FILE. +AND AGREES TO THE TERMS HEREIN AND ACCEPTS THE SAME BY USE OF THIS FILE. COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. */ + /* * * Game save/restore functions * - * */ #ifdef HAVE_CONFIG_H @@ -26,7 +26,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "desw.h" #endif - #include #include #include @@ -38,7 +37,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #endif #ifdef OGL -#ifdef __MACOSX__ +#if defined(__APPLE__) && defined(__MACH__) #include #else #include @@ -62,7 +61,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "game.h" #include "screens.h" #include "newmenu.h" -#include "cfile.h" +#include "cfile.h" #include "fuelcen.h" #include "hash.h" #include "key.h" @@ -139,7 +138,7 @@ extern fix Fusion_next_sound_time; extern int Laser_rapid_fire; extern int Physics_cheat_flag; -extern int Lunacy; +extern int Lunacy; extern void do_lunacy_on(void); extern void do_lunacy_off(void); extern int First_secret_visit; @@ -1067,7 +1066,7 @@ int state_restore_all_sub(char *filename, int multi, int secret_restore) player restore_players[MAX_PLAYERS]; #endif fix old_gametime = GameTime; - + #if defined(MACINTOSH) && !defined(NDEBUG) if ( strncmp(filename, ":Players:", 9) ) Int3(); @@ -1100,7 +1099,7 @@ int state_restore_all_sub(char *filename, int multi, int secret_restore) fseek( fp, 768, SEEK_CUR ); // Read the Between levels flag... - fread( &between_levels, sizeof(int), 1, fp ); + fread( &between_levels, sizeof(int), 1, fp ); Assert(between_levels == 0); //between levels save ripped out diff --git a/mem/mem.c b/mem/mem.c index 53eed3a8..d5009925 100644 --- a/mem/mem.c +++ b/mem/mem.c @@ -1,4 +1,4 @@ -/* $ Id: $ */ +/* $Id: mem.c,v 1.11 2003-04-11 23:51:48 btb Exp $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -8,7 +8,7 @@ IN USING, DISPLAYING, AND CREATING DERIVATIVE WORKS THEREOF, SO LONG AS SUCH USE, DISPLAY OR CREATION IS FOR NON-COMMERCIAL, ROYALTY OR REVENUE FREE PURPOSES. IN NO EVENT SHALL THE END-USER USE THE COMPUTER CODE CONTAINED HEREIN FOR REVENUE-BEARING PURPOSES. THE END-USER UNDERSTANDS -AND AGREES TO THE TERMS HEREIN AND ACCEPTS THE SAME BY USE OF THIS FILE. +AND AGREES TO THE TERMS HEREIN AND ACCEPTS THE SAME BY USE OF THIS FILE. COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. */ @@ -34,7 +34,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include #include #include -#ifdef __MACOSX__ +#if defined(__APPLE__) && defined(__MACH__) #include #else #include -- 2.39.2