From 2a35aed68b1edaee7a7ebbf6e2d4be92d6ae9326 Mon Sep 17 00:00:00 2001 From: curt Date: Sat, 2 Aug 1997 18:45:00 +0000 Subject: [PATCH] Renamed GLmain.c GLUTmain.c --- Main/{GLmain.c => GLUTmain.c} | 10 +++++++--- Main/Makefile | 9 ++++++--- 2 files changed, 13 insertions(+), 6 deletions(-) rename Main/{GLmain.c => GLUTmain.c} (99%) diff --git a/Main/GLmain.c b/Main/GLUTmain.c similarity index 99% rename from Main/GLmain.c rename to Main/GLUTmain.c index 2f1ebbd39..2e51bcacc 100644 --- a/Main/GLmain.c +++ b/Main/GLUTmain.c @@ -489,8 +489,9 @@ int main( int argc, char *argv[] ) { /* Define initial window size */ glutInitWindowSize(640, 480); - /* Initialize the main window */ + /* Initialize windows */ glutCreateWindow("Flight Gear"); + #elif MESA_TK /* Define initial window size */ tkInitPosition(0, 0, 640, 480); @@ -655,9 +656,12 @@ int printf (const char *format, ...) { /* $Log$ -/* Revision 1.43 1997/08/02 16:23:47 curt -/* Misc. tweaks. +/* Revision 1.1 1997/08/02 18:45:00 curt +/* Renamed GLmain.c GLUTmain.c /* + * Revision 1.43 1997/08/02 16:23:47 curt + * Misc. tweaks. + * * Revision 1.42 1997/08/01 19:43:33 curt * Making progress with coordinate system overhaul. * diff --git a/Main/Makefile b/Main/Makefile index bfee17cee..1e44ab2cf 100644 --- a/Main/Makefile +++ b/Main/Makefile @@ -26,7 +26,7 @@ TARGET=fg0 -CFILES = GLmain.c $(INTERFACE_FILES) mesh2GL.c +CFILES = GLUTmain.c $(INTERFACE_FILES) mesh2GL.c OFILES = $(CFILES:.c=.o) AFILES = ../Aircraft/libAircraft.a ../Controls/libControls.a \ ../Flight/libFlight.a ../Flight/LaRCsim/libLaRCsim.a \ @@ -61,8 +61,8 @@ clean: include depend -GLmain.o: - $(CC) $(CFLAGS) -c GLmain.c -o $@ +GLUTmain.o: + $(CC) $(CFLAGS) -c GLUTmain.c -o $@ GLUTkey.o: $(CC) $(CFLAGS) -c GLUTkey.c -o $@ @@ -76,6 +76,9 @@ mesh2GL.o: #--------------------------------------------------------------------------- # $Log$ +# Revision 1.28 1997/08/02 18:45:01 curt +# Renamed GLmain.c GLUTmain.c +# # Revision 1.27 1997/07/31 22:52:39 curt # Working on redoing internal coordinate systems & scenery transformations. # -- 2.39.2