From: curt Date: Wed, 18 Feb 1998 15:07:02 +0000 (+0000) Subject: Tweaks to build with SGI OpenGL (and therefor hopefully other accelerated X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=c0954417a7cf13d2d7a554992d25eea4c250a6cc;p=flightgear.git Tweaks to build with SGI OpenGL (and therefor hopefully other accelerated drivers will work.) --- diff --git a/Main/fg_init.c b/Main/fg_init.c index 8b7c0fb4c..6b6619d90 100644 --- a/Main/fg_init.c +++ b/Main/fg_init.c @@ -205,16 +205,16 @@ int fgInitSubsystems( void ) { // FG_Altitude = FG_Runway_altitude + 3.758099; // Initial Position: Jim Brennon's Kingmont Observatory - // FG_Longitude = ( -121.1131666 ) * DEG_TO_RAD; - // FG_Latitude = ( 38.8293916 ) * DEG_TO_RAD; - // FG_Runway_altitude = 920.0; - // FG_Altitude = FG_Runway_altitude + 3.758099; + FG_Longitude = ( -121.1131666 ) * DEG_TO_RAD; + FG_Latitude = ( 38.8293916 ) * DEG_TO_RAD; + FG_Runway_altitude = 920.0 + 100; + FG_Altitude = FG_Runway_altitude + 3.758099; // Test Position - FG_Longitude = ( -111.18 ) * DEG_TO_RAD; - FG_Latitude = ( 33.70 ) * DEG_TO_RAD; - FG_Runway_altitude = 5000.0; - FG_Altitude = FG_Runway_altitude + 3.758099; + // FG_Longitude = ( -111.18 ) * DEG_TO_RAD; + // FG_Latitude = ( 33.70 ) * DEG_TO_RAD; + // FG_Runway_altitude = 5000.0; + // FG_Altitude = FG_Runway_altitude + 3.758099; // A random test position // FG_Longitude = ( 88128.00 / 3600.0 ) * DEG_TO_RAD; @@ -380,10 +380,14 @@ int fgInitSubsystems( void ) { /* $Log$ -/* Revision 1.45 1998/02/16 13:39:43 curt -/* Miscellaneous weekend tweaks. Fixed? a cache problem that caused whole -/* tiles to occasionally be missing. +/* Revision 1.46 1998/02/18 15:07:06 curt +/* Tweaks to build with SGI OpenGL (and therefor hopefully other accelerated +/* drivers will work.) /* + * Revision 1.45 1998/02/16 13:39:43 curt + * Miscellaneous weekend tweaks. Fixed? a cache problem that caused whole + * tiles to occasionally be missing. + * * Revision 1.44 1998/02/12 21:59:50 curt * Incorporated code changes contributed by Charlie Hotchkiss * diff --git a/Scenery/tilecache.h b/Scenery/tilecache.h index 3c6e9bb49..851af45eb 100644 --- a/Scenery/tilecache.h +++ b/Scenery/tilecache.h @@ -40,8 +40,8 @@ /* For best results ... i.e. to avoid tile load problems and blank areas * - * FG_TILE_CACHE_SIZE >= FG_LOCAL_X_Y + max(FG_LOCAL_X, FG_LOCAL_Y) + 1 */ -#define FG_TILE_CACHE_SIZE 36 + * FG_TILE_CACHE_SIZE >= FG_LOCAL_X_Y + 2*max(FG_LOCAL_X, FG_LOCAL_Y) + 1 */ +#define FG_TILE_CACHE_SIZE 100 /* Tile cache record */ @@ -79,10 +79,14 @@ void fgTileCacheEntryInfo( int index, GLint *display_list, /* $Log$ -/* Revision 1.5 1998/02/16 13:39:45 curt -/* Miscellaneous weekend tweaks. Fixed? a cache problem that caused whole -/* tiles to occasionally be missing. +/* Revision 1.6 1998/02/18 15:07:10 curt +/* Tweaks to build with SGI OpenGL (and therefor hopefully other accelerated +/* drivers will work.) /* + * Revision 1.5 1998/02/16 13:39:45 curt + * Miscellaneous weekend tweaks. Fixed? a cache problem that caused whole + * tiles to occasionally be missing. + * * Revision 1.4 1998/01/31 00:43:27 curt * Added MetroWorks patches from Carmen Volpe. * diff --git a/Simulator/Makefile b/Simulator/Makefile index e8836288d..9f27e9cd5 100644 --- a/Simulator/Makefile +++ b/Simulator/Makefile @@ -53,11 +53,14 @@ Makefile-os2: clean: -rm -f *.os2 *~ + -rm -f $(FG_ROOT_LIB)/stamp_libs for dir in $(ORDEREDDIRS); do \ (cd $$dir; $(MAKE) clean) ; \ done clobber: + -rm -f *.os2 *~ + -rm -f $(FG_ROOT_LIB)/stamp_libs for dir in $(ORDEREDDIRS); do \ (cd $$dir; $(MAKE) clobber) ; \ done @@ -65,12 +68,12 @@ clobber: source-tar: clean (cd ../..; \ $(TAR) cvzf source-$(FG_VERSION).tar.gz FlightGear/fgtop \ - FlightGear/COPYING FlightGear/Docs FlightGear/Src) + FlightGear/COPYING FlightGear/Docs FlightGear/Src FlightGear/Lib) source-zip: clean (cd ../..; \ zip -r source-$(FG_VERSION).zip FlightGear/fgtop \ - FlightGear/COPYING FlightGear/Docs FlightGear/Src) + FlightGear/COPYING FlightGear/Docs FlightGear/Src FlightGear/Lib) scenery-tar: (cd ../..; \ @@ -101,9 +104,23 @@ bin-zip: FlightGear/cygwin.dll FlightGear/COPYING FlightGear/Docs \ FlightGear/README FlightGear/Thanks) +new-bin-zip: + cp Main/fg$(FG_VERSION_MAJOR).exe Main/cygwin.dll README Thanks \ + runfg.bat ../Win32/*.dll .. + (cd ../..; \ + zip -r bin-$(FG_VERSION).zip FlightGear/fgtop \ + FlightGear/fg$(FG_VERSION_MAJOR).exe FlightGear/runfg.bat \ + FlightGear/cygwin.dll FlightGear/COPYING FlightGear/Docs \ + FlightGear/README FlightGear/Thanks FlightGear/glu.dll \ + FlightGear/glut.dll FlightGear/opengl.dll) + #--------------------------------------------------------------------------- # $Log$ +# Revision 1.42 1998/02/18 15:07:02 curt +# Tweaks to build with SGI OpenGL (and therefor hopefully other accelerated +# drivers will work.) +# # Revision 1.41 1998/02/09 22:56:28 curt # Removed "depend" files from cvs control. Other minor make tweaks. # diff --git a/Simulator/commondefs b/Simulator/commondefs index a4f86a96f..469f9bff2 100644 --- a/Simulator/commondefs +++ b/Simulator/commondefs @@ -5,7 +5,7 @@ #--------------------------------------------------------------------------- FG_VERSION_MAJOR = 0 -FG_VERSION_MINOR = 34 +FG_VERSION_MINOR = 35 FG_VERSION = $(FG_VERSION_MAJOR).$(FG_VERSION_MINOR) @@ -83,18 +83,18 @@ GLOBAL_CFLAGS = -Wall -DVERSION=\"$(FG_VERSION)\" #--------------------------------------------------------------------------- #--------------------------------------------------------------------------- -# Linux/Mesa with the GLUT toolkit +# Linux/Mesa # -INTERFACE_LIBS = -lglut -MESA_LIBS = -L/usr/lib/mesa -lMesatk -lMesaaux -lMesaGLU -lMesaGL -X11_LIBS = -L/usr/X11R6/lib -lXext -lXmu -lXi -lX11 -GRAPHICS_LIBS = $(MESA_LIBS) $(X11_LIBS) -FG_CFLAGS = $(GLOBAL_CFLAGS) $(FG_DEBUG_FLAGS) -EXT = +# INTERFACE_LIBS = -lglut +# MESA_LIBS = -L/usr/lib/mesa -lMesatk -lMesaaux -lMesaGLU -lMesaGL +# X11_LIBS = -L/usr/X11R6/lib -lXext -lXmu -lXi -lX11 +# GRAPHICS_LIBS = $(MESA_LIBS) $(X11_LIBS) +# FG_CFLAGS = $(GLOBAL_CFLAGS) $(FG_DEBUG_FLAGS) +# EXT = #--------------------------------------------------------------------------- #--------------------------------------------------------------------------- -# SGI IRIX with the GLUT toolkit +# SGI IRIX # (Surprisingly, this also works on our SunOS 4.x machine with the # way we have Mesa & Glut installed.) # @@ -106,7 +106,7 @@ EXT = #--------------------------------------------------------------------------- #--------------------------------------------------------------------------- -# Sun/Solaris with the GLUT toolkit +# Sun/Solaris # # VERSION=\"$(VERSION)\" # INTERFACE_LIBS = -lglut @@ -116,8 +116,26 @@ EXT = # TAR = gtar #--------------------------------------------------------------------------- +#--------------------------------------------------------------------------- +# Cygnus Win32 (gcc based) compiled against SGI's opengl and a dynamic GLUT +# +# -*- Experimental -*- +# +# May also work for compiling against IHV OpenGL drivers +# +INTERFACE_LIBS = -lglut +GRAPHICS_LIBS = -lglu -lopengl -luser32 -lgdi32 +FG_CFLAGS = $(GLOBAL_CFLAGS) $(FG_DEBUG_FLAGS) \ + -I$(FG_ROOT)/Win32/include \ + -DWIN32 -DUSE_RAND +LLDFLAGS = -L$(FG_ROOT)/Win32/lib +EXT = .exe +LN = cp +#--------------------------------------------------------------------------- + #--------------------------------------------------------------------------- # Cygnus Win32 (gcc based) with a static version of the GLUT toolkit +# with MSOpenGL95.exe ... # # INTERFACE_LIBS = ../Win32/libglut.a # GRAPHICS_LIBS = -lglu32 -lopengl32 -luser32 -lgdi32 diff --git a/Simulator/setup_env b/Simulator/setup_env index 48801ace2..6ec4e369b 100644 --- a/Simulator/setup_env +++ b/Simulator/setup_env @@ -1,2 +1,3 @@ +export FG_ROOT=~/projects/FlightGear export FG_ROOT_SRC=~/projects/FlightGear/Src export FG_ROOT_LIB=~/projects/FlightGear/Lib