This should simplify things tremendously.
# (Log is kept at end of this file)
#---------------------------------------------------------------------------
-
-TARGET = libAircraft.a
+ARLIBRARY = libAircraft.a
+TARGETS = $(ARLIBRARY)
CFILES = aircraft.c
-HFILES = aircraft.h
-OFILES = $(CFILES:.c=.o)
-
-
-include ../make.inc
-
-
-CFLAGS = $(FG_CFLAGS)
-
-
-#---------------------------------------------------------------------------
-# Primary Targets
-#---------------------------------------------------------------------------
-
-$(TARGET): $(OFILES) $(HFILES)
- $(AR) rv $(TARGET) $(OFILES)
- $(RANLIB) $(TARGET)
-
-all: $(TARGET)
+CXXFILES =
-clean:
- rm -f *.o $(TARGET) lib*.a *.os2 *~ core
+LDIRT = $(FG_ROOT_LIB)/$(ARLIBRARY)
+include $(FG_ROOT_SRC)/commondefs
-#---------------------------------------------------------------------------
-# Secondary Targets
-#---------------------------------------------------------------------------
-
-include depend
-
-aircraft.o:
- $(CC) $(CFLAGS) $(INCLUDES) -c aircraft.c -o $@
-
-
-#---------------------------------------------------------------------------
-# $Log$
-# Revision 1.9 1997/07/20 02:19:09 curt
-# First stab at a system to generate os2 makefiles automatically.
-#
-# Revision 1.8 1997/07/12 02:24:37 curt
-# Added ranlib.
-#
-# Revision 1.7 1997/06/27 21:38:02 curt
-# Working on Makefile structure.
-#
-# Revision 1.6 1997/06/27 20:03:32 curt
-# Working on Makefile structure.
-#
-# Revision 1.5 1997/06/26 19:08:28 curt
-# Restructuring make, adding automatic "make dep" support.
-#
-# Revision 1.4 1997/06/25 15:39:44 curt
-# Minor changes to compile with rsxnt/win32.
-#
-# Revision 1.3 1997/06/21 17:12:42 curt
-# Capitalized subdirectory names.
-#
-# Revision 1.2 1997/05/23 15:40:29 curt
-# Added GNU copyright headers.
-#
-# Revision 1.1 1997/05/16 15:58:23 curt
-# Initial revision.
-#
+include $(COMMONRULES)
#include <stdio.h>
-#include "aircraft.h"
-#include "../Include/constants.h"
+#include <Aircraft/aircraft.h>
+#include <Include/constants.h>
/* This is a record containing all the info for the aircraft currently
/* $Log$
-/* Revision 1.13 1997/12/15 23:54:30 curt
-/* Add xgl wrappers for debugging.
-/* Generate terrain normals on the fly.
+/* Revision 1.14 1998/01/19 19:26:56 curt
+/* Merged in make system changes from Bob Kuehne <rpk@sgi.com>
+/* This should simplify things tremendously.
/*
+ * Revision 1.13 1997/12/15 23:54:30 curt
+ * Add xgl wrappers for debugging.
+ * Generate terrain normals on the fly.
+ *
* Revision 1.12 1997/12/10 22:37:37 curt
* Prepended "fg" on the name of all global structures that didn't have it yet.
* i.e. "struct WEATHER {}" became "struct fgWEATHER {}"
#ifndef AIRCRAFT_H
#define AIRCRAFT_H
-#include "../Flight/flight.h"
-#include "../Controls/controls.h"
+#include <Flight/flight.h>
+#include <Controls/controls.h>
/* Define a structure containing all the parameters for an aircraft */
/* $Log$
-/* Revision 1.7 1997/12/10 22:37:38 curt
-/* Prepended "fg" on the name of all global structures that didn't have it yet.
-/* i.e. "struct WEATHER {}" became "struct fgWEATHER {}"
+/* Revision 1.8 1998/01/19 19:26:57 curt
+/* Merged in make system changes from Bob Kuehne <rpk@sgi.com>
+/* This should simplify things tremendously.
/*
+ * Revision 1.7 1997/12/10 22:37:38 curt
+ * Prepended "fg" on the name of all global structures that didn't have it yet.
+ * i.e. "struct WEATHER {}" became "struct fgWEATHER {}"
+ *
* Revision 1.6 1997/09/13 02:00:06 curt
* Mostly working on stars and generating sidereal time for accurate star
* placement.
# (Log is kept at end of this file)
#---------------------------------------------------------------------------
-
-TARGET = libAstro.a
+ARLIBRARY = libAstro.a
+TARGETS = $(ARLIBRARY)
CFILES = moon.c orbits.c planets.c sky.c stars.c sun.c
+CXXFILES =
-OFILES = $(CFILES:.c=.o)
-
-
-include ../make.inc
-
-
-CFLAGS = $(FG_CFLAGS)
-
-
-#---------------------------------------------------------------------------
-# Primary Targets
-#---------------------------------------------------------------------------
-
-$(TARGET): $(OFILES) $(HFILES)
- $(AR) rv $(TARGET) $(OFILES)
- $(RANLIB) $(TARGET)
-
-all: $(TARGET)
+LDIRT = $(FG_ROOT_LIB)/$(ARLIBRARY)
-clean:
- rm -f *.o $(TARGET) lib*.a *.os2 *~ core
+include $(FG_ROOT_SRC)/commondefs
-realclean: clean
-
-
-#---------------------------------------------------------------------------
-# Secondary Targets
-#---------------------------------------------------------------------------
-
-include depend
-
-moon.o:
- $(CC) $(CFLAGS) -c moon.c -o $@
-
-orbits.o:
- $(CC) $(CFLAGS) -c orbits.c -o $@
-
-planets.o:
- $(CC) $(CFLAGS) -c planets.c -o $@
-
-sky.c:
- $(CC) $(CFLAGS) -c sky.c -o $@
-
-stars.c:
- $(CC) $(CFLAGS) -c stars.c -o $@
-
-sun.o:
- $(CC) $(CFLAGS) -c sun.c -o $@
-
-
-
-#---------------------------------------------------------------------------
-# $Log$
-# Revision 1.1 1998/01/07 03:16:15 curt
-# Moved from .../Src/Scenery/ to .../Src/Astro/
-#
-# Revision 1.26 1997/12/19 16:45:01 curt
-# Working on scene rendering order and options.
-#
-# Revision 1.25 1997/12/17 23:13:45 curt
-# Began working on rendering the sky.
-#
-# Revision 1.24 1997/11/25 19:25:33 curt
-# Changes to integrate Durk's moon/sun code updates + clean up.
-#
-# Revision 1.23 1997/10/28 21:00:20 curt
-# Changing to new terrain format.
-#
-# Revision 1.22 1997/10/25 03:30:07 curt
-# Misc. tweaks.
-#
-# Revision 1.21 1997/10/25 03:18:26 curt
-# Incorporated sun, moon, and planet position and rendering code contributed
-# by Durk Talsma.
-#
-# Revision 1.20 1997/09/22 14:44:21 curt
-# Continuing to try to align stars correctly.
-#
-# Revision 1.19 1997/08/27 03:30:23 curt
-# Changed naming scheme of basic shared structures.
-#
-# Revision 1.18 1997/08/02 19:10:12 curt
-# Incorporated mesh2GL.c into mesh.c
-#
-# Revision 1.17 1997/07/23 21:52:23 curt
-# Put comments around the text after an #endif for increased portability.
-#
-# Revision 1.16 1997/07/20 02:19:11 curt
-# First stab at a system to generate os2 makefiles automatically.
-#
-# Revision 1.15 1997/07/12 02:24:47 curt
-# Added ranlib.
-#
-# Revision 1.14 1997/06/29 21:16:47 curt
-# More twiddling with the Scenery Management system.
-#
-# Revision 1.13 1997/06/27 21:38:10 curt
-# Working on Makefile structure.
-#
-# Revision 1.12 1997/06/27 20:03:37 curt
-# Working on Makefile structure.
-#
-# Revision 1.11 1997/06/26 22:14:57 curt
-# Beginning work on a scenery management system.
-#
-# Revision 1.10 1997/06/26 19:08:34 curt
-# Restructuring make, adding automatic "make dep" support.
-#
-# Revision 1.9 1997/06/25 15:39:48 curt
-# Minor changes to compile with rsxnt/win32.
-#
-# Revision 1.8 1997/06/21 17:58:07 curt
-# directory shuffling ...
-#
-# Revision 1.1 1997/06/21 17:39:28 curt
-# Moved to the ParseScn subdirectory.
-#
-# Revision 1.6 1997/06/21 17:12:55 curt
-# Capitalized subdirectory names.
-#
-# Revision 1.5 1997/05/31 19:16:29 curt
-# Elevator trim added.
-#
-# Revision 1.4 1997/05/27 17:48:50 curt
-# Added -f flag to flex to generate a "fast" scanner.
-#
-# Revision 1.3 1997/05/23 15:40:40 curt
-# Added GNU copyright headers.
-#
-# Revision 1.2 1997/05/17 00:17:01 curt
-# Cosmetic changes.
-#
-# Revision 1.1 1997/05/16 16:07:02 curt
-# Initial revision.
-#
+include $(COMMONRULES)
#include <math.h>
#include <GL/glut.h>
-#include "../XGL/xgl.h"
+#include <XGL/xgl.h>
-#include "orbits.h"
-#include "moon.h"
+#include <Astro/orbits.h>
+#include <Astro/moon.h>
-#include "../Aircraft/aircraft.h"
-#include "../Include/constants.h"
-#include "../Include/general.h"
-#include "../Main/views.h"
-#include "../Time/fg_time.h"
+#include <Aircraft/aircraft.h>
+#include <Include/constants.h>
+#include <Include/general.h>
+#include <Main/views.h>
+#include <Time/fg_time.h>
struct CelestialCoord moonPos;
/* $Log$
-/* Revision 1.2 1998/01/19 18:40:16 curt
-/* Tons of little changes to clean up the code and to remove fatal errors
-/* when building with the c++ compiler.
+/* Revision 1.3 1998/01/19 19:26:57 curt
+/* Merged in make system changes from Bob Kuehne <rpk@sgi.com>
+/* This should simplify things tremendously.
/*
+ * Revision 1.2 1998/01/19 18:40:16 curt
+ * Tons of little changes to clean up the code and to remove fatal errors
+ * when building with the c++ compiler.
+ *
* Revision 1.1 1998/01/07 03:16:16 curt
* Moved from .../Src/Scenery/ to .../Src/Astro/
*
#define _MOON_H_
-#include "orbits.h"
+#include <Astro/orbits.h>
-#include "../Time/fg_time.h"
+#include <Time/fg_time.h>
#include <math.h>
#define X .525731112119133606
/* $Log$
-/* Revision 1.2 1998/01/19 18:40:17 curt
-/* Tons of little changes to clean up the code and to remove fatal errors
-/* when building with the c++ compiler.
+/* Revision 1.3 1998/01/19 19:26:58 curt
+/* Merged in make system changes from Bob Kuehne <rpk@sgi.com>
+/* This should simplify things tremendously.
/*
+ * Revision 1.2 1998/01/19 18:40:17 curt
+ * Tons of little changes to clean up the code and to remove fatal errors
+ * when building with the c++ compiler.
+ *
* Revision 1.1 1998/01/07 03:16:16 curt
* Moved from .../Src/Scenery/ to .../Src/Astro/
*
#include <string.h>
-#include "orbits.h"
+#include <Astro/orbits.h>
-#include "../Include/general.h"
-#include "../Time/fg_time.h"
+#include <Include/general.h>
+#include <Time/fg_time.h>
struct OrbElements pltOrbElements[9];
/* $Log$
-/* Revision 1.1 1998/01/07 03:16:17 curt
-/* Moved from .../Src/Scenery/ to .../Src/Astro/
+/* Revision 1.2 1998/01/19 19:26:58 curt
+/* Merged in make system changes from Bob Kuehne <rpk@sgi.com>
+/* This should simplify things tremendously.
/*
+ * Revision 1.1 1998/01/07 03:16:17 curt
+ * Moved from .../Src/Scenery/ to .../Src/Astro/
+ *
* Revision 1.6 1997/12/30 20:47:52 curt
* Integrated new event manager with subsystem initializations.
*
#include <stdio.h>
#include <math.h>
-#include "../Time/fg_time.h"
+#include <Time/fg_time.h>
/* $Log$
-/* Revision 1.1 1998/01/07 03:16:17 curt
-/* Moved from .../Src/Scenery/ to .../Src/Astro/
+/* Revision 1.2 1998/01/19 19:26:58 curt
+/* Merged in make system changes from Bob Kuehne <rpk@sgi.com>
+/* This should simplify things tremendously.
/*
+ * Revision 1.1 1998/01/07 03:16:17 curt
+ * Moved from .../Src/Scenery/ to .../Src/Astro/
+ *
* Revision 1.2 1997/12/30 16:36:52 curt
* Merged in Durk's changes ...
*
**************************************************************************/
-#include "../Time/fg_time.h"
-#include "orbits.h"
-#include "planets.h"
-#include "sun.h"
+#include <Time/fg_time.h>
+#include <Astro/orbits.h>
+#include <Astro/planets.h>
+#include <Astro/sun.h>
struct CelestialCoord fgCalculatePlanet(struct OrbElements planet,
/* $Log$
-/* Revision 1.1 1998/01/07 03:16:18 curt
-/* Moved from .../Src/Scenery/ to .../Src/Astro/
+/* Revision 1.2 1998/01/19 19:26:59 curt
+/* Merged in make system changes from Bob Kuehne <rpk@sgi.com>
+/* This should simplify things tremendously.
/*
+ * Revision 1.1 1998/01/07 03:16:18 curt
+ * Moved from .../Src/Scenery/ to .../Src/Astro/
+ *
* Revision 1.4 1997/12/30 20:47:52 curt
* Integrated new event manager with subsystem initializations.
*
*/
#include <GL/glut.h>
-#include "../XGL/xgl.h"
+#include <XGL/xgl.h>
-#include "sky.h"
+#include <Astro/sky.h>
-#include "../Time/event.h"
-#include "../Time/fg_time.h"
+#include <Time/event.h>
+#include <Time/fg_time.h>
+
+#include <Aircraft/aircraft.h>
+#include <Flight/flight.h>
+#include <Include/constants.h>
+#include <Main/views.h>
+#include <Math/fg_random.h>
-#include "../Aircraft/aircraft.h"
-#include "../Flight/flight.h"
-#include "../Include/constants.h"
-#include "../Main/views.h"
-#include "../Math/fg_random.h"
/*
-#include "../Include/general.h"
+#include <Include/general.h>
*/
/* in meters of course */
/* $Log$
-/* Revision 1.2 1998/01/19 18:40:17 curt
-/* Tons of little changes to clean up the code and to remove fatal errors
-/* when building with the c++ compiler.
+/* Revision 1.3 1998/01/19 19:26:59 curt
+/* Merged in make system changes from Bob Kuehne <rpk@sgi.com>
+/* This should simplify things tremendously.
/*
+ * Revision 1.2 1998/01/19 18:40:17 curt
+ * Tons of little changes to clean up the code and to remove fatal errors
+ * when building with the c++ compiler.
+ *
* Revision 1.1 1998/01/07 03:16:19 curt
* Moved from .../Src/Scenery/ to .../Src/Astro/
*
#include <time.h>
#include <GL/glut.h>
-#include "../XGL/xgl.h"
+#include <XGL/xgl.h>
-#include "orbits.h"
-#include "planets.h"
-#include "stars.h"
+#include <Astro/orbits.h>
+#include <Astro/planets.h>
+#include <Astro/stars.h>
-#include "../Include/constants.h"
-#include "../Include/general.h"
-#include "../Aircraft/aircraft.h"
-#include "../Main/views.h"
-#include "../Time/fg_time.h"
+#include <Include/constants.h>
+#include <Include/general.h>
+#include <Aircraft/aircraft.h>
+#include <Main/views.h>
+#include <Time/fg_time.h>
#define EpochStart (631065600)
/* $Log$
-/* Revision 1.2 1998/01/19 18:40:18 curt
-/* Tons of little changes to clean up the code and to remove fatal errors
-/* when building with the c++ compiler.
+/* Revision 1.3 1998/01/19 19:26:59 curt
+/* Merged in make system changes from Bob Kuehne <rpk@sgi.com>
+/* This should simplify things tremendously.
/*
+ * Revision 1.2 1998/01/19 18:40:18 curt
+ * Tons of little changes to clean up the code and to remove fatal errors
+ * when building with the c++ compiler.
+ *
* Revision 1.1 1998/01/07 03:16:20 curt
* Moved from .../Src/Scenery/ to .../Src/Astro/
*
**************************************************************************/
#include <GL/glut.h>
-#include "../XGL/xgl.h"
+#include <XGL/xgl.h>
-#include "../Time/fg_time.h"
-#include "../Main/views.h"
-#include "orbits.h"
-#include "sun.h"
+#include <Time/fg_time.h>
+#include <Main/views.h>
+#include <Astro/orbits.h>
+#include <Astro/sun.h>
GLint sun_obj;
/* $Log$
-/* Revision 1.2 1998/01/19 18:40:18 curt
-/* Tons of little changes to clean up the code and to remove fatal errors
-/* when building with the c++ compiler.
+/* Revision 1.3 1998/01/19 19:27:00 curt
+/* Merged in make system changes from Bob Kuehne <rpk@sgi.com>
+/* This should simplify things tremendously.
/*
+ * Revision 1.2 1998/01/19 18:40:18 curt
+ * Tons of little changes to clean up the code and to remove fatal errors
+ * when building with the c++ compiler.
+ *
* Revision 1.1 1998/01/07 03:16:20 curt
* Moved from .../Src/Scenery/ to .../Src/Astro/
*
#---------------------------------------------------------------------------
# Makefile
#
-# Written by Curtis Olson, started July 1997.
+# Written by Curtis Olson, started May 1997.
#
# Copyright (C) 1997 Curtis L. Olson - curt@infoplane.com
#
# (Log is kept at end of this file)
#---------------------------------------------------------------------------
-
-TARGET = libCockpit.a
+ARLIBRARY = libCockpit.a
+TARGETS = $(ARLIBRARY)
CFILES = cockpit.c hud.c
-HFILES = cockpit.h hud.h
-OFILES = $(CFILES:.c=.o)
-
-
-include ../make.inc
-
-
-CFLAGS = $(FG_CFLAGS)
-
-
-#---------------------------------------------------------------------------
-# Primary Targets
-#---------------------------------------------------------------------------
-
-$(TARGET): $(OFILES)
- $(AR) rv $(TARGET) $(OFILES)
- $(RANLIB) $(TARGET)
+CXXFILES =
-all: $(TARGET)
+LDIRT = $(FG_ROOT_LIB)/$(ARLIBRARY)
-clean:
- rm -f *.o $(TARGET) lib*.a *.os2 *~ core
+include $(FG_ROOT_SRC)/commondefs
-
-#---------------------------------------------------------------------------
-# Secondary Targets
-#---------------------------------------------------------------------------
-
-include depend
-
-cockpit.o:
- $(CC) $(CFLAGS) -c cockpit.c -o $@
-
-hud.o:
- $(CC) $(CFLAGS) -c hud.c -o $@
-
-
-#---------------------------------------------------------------------------
-# $Log$
-# Revision 1.1 1997/08/29 18:03:19 curt
-# Initial revision.
-#
+include $(COMMONRULES)
#include <GL/glut.h>
#include <stdlib.h>
-#include "cockpit.h"
+#include <Cockpit/cockpit.h>
-#include "../Include/constants.h"
+#include <Include/constants.h>
-#include "../Aircraft/aircraft.h"
-#include "../Scenery/mesh.h"
-#include "../Scenery/scenery.h"
-#include "../Math/mat3.h"
-#include "../Math/polar.h"
-#include "../Time/fg_timer.h"
-#include "../Math/fg_random.h"
-#include "../Weather/weather.h"
+#include <Aircraft/aircraft.h>
+#include <Scenery/mesh.h>
+#include <Scenery/scenery.h>
+#include <Math/mat3.h>
+#include <Math/polar.h>
+#include <Time/fg_timer.h>
+#include <Math/fg_random.h>
+#include <Weather/weather.h>
// #define DEBUG
/* $Log$
-/* Revision 1.5 1998/01/19 18:40:19 curt
-/* Tons of little changes to clean up the code and to remove fatal errors
-/* when building with the c++ compiler.
+/* Revision 1.6 1998/01/19 19:27:01 curt
+/* Merged in make system changes from Bob Kuehne <rpk@sgi.com>
+/* This should simplify things tremendously.
/*
+ * Revision 1.5 1998/01/19 18:40:19 curt
+ * Tons of little changes to clean up the code and to remove fatal errors
+ * when building with the c++ compiler.
+ *
* Revision 1.4 1997/12/30 20:47:34 curt
* Integrated new event manager with subsystem initializations.
*
**************************************************************************/
-#include "hud.h"
+#include <Cockpit/hud.h>
// And in the future (near future i hope).
-// #include "panel.h"
+// #include <Cockpit/panel.h>
struct fgCOCKPIT {
int code;
/* $Log$
-/* Revision 1.3 1998/01/19 18:40:19 curt
-/* Tons of little changes to clean up the code and to remove fatal errors
-/* when building with the c++ compiler.
+/* Revision 1.4 1998/01/19 19:27:01 curt
+/* Merged in make system changes from Bob Kuehne <rpk@sgi.com>
+/* This should simplify things tremendously.
/*
+ * Revision 1.3 1998/01/19 18:40:19 curt
+ * Tons of little changes to clean up the code and to remove fatal errors
+ * when building with the c++ compiler.
+ *
* Revision 1.2 1997/12/10 22:37:39 curt
* Prepended "fg" on the name of all global structures that didn't have it yet.
* i.e. "struct WEATHER {}" became "struct fgWEATHER {}"
#define HUD_H
-#include "../Aircraft/aircraft.h"
-#include "../Flight/flight.h"
-#include "../Controls/controls.h"
+#include <Aircraft/aircraft.h>
+#include <Flight/flight.h>
+#include <Controls/controls.h>
/* Instrument types */
/* $Log$
-/* Revision 1.4 1998/01/19 18:40:21 curt
-/* Tons of little changes to clean up the code and to remove fatal errors
-/* when building with the c++ compiler.
+/* Revision 1.5 1998/01/19 19:27:01 curt
+/* Merged in make system changes from Bob Kuehne <rpk@sgi.com>
+/* This should simplify things tremendously.
/*
+ * Revision 1.4 1998/01/19 18:40:21 curt
+ * Tons of little changes to clean up the code and to remove fatal errors
+ * when building with the c++ compiler.
+ *
* Revision 1.3 1997/12/30 16:36:41 curt
* Merged in Durk's changes ...
*
# (Log is kept at end of this file)
#---------------------------------------------------------------------------
-
-TARGET = libControls.a
+ARLIBRARY = libControls.a
+TARGETS = $(ARLIBRARY)
CFILES = controls.c
-HFILES = controls.h
-OFILES = $(CFILES:.c=.o)
-
-
-include ../make.inc
-
-
-CFLAGS = $(FG_CFLAGS)
-
-
-#---------------------------------------------------------------------------
-# Primary Targets
-#---------------------------------------------------------------------------
-
-$(TARGET): $(OFILES)
- $(AR) rv $(TARGET) $(OFILES)
- $(RANLIB) $(TARGET)
-
-all: $(TARGET)
-
-clean:
- rm -f *.o $(TARGET) lib*.a *.os2 *~ core
-
-
-#---------------------------------------------------------------------------
-# Secondary Targets
-#---------------------------------------------------------------------------
+CXXFILES =
-include depend
+LDIRT = $(FG_ROOT_LIB)/$(ARLIBRARY)
-controls.o:
- $(CC) $(CFLAGS) $(INCLUDES) -c controls.c -o $@
+include $(FG_ROOT_SRC)/commondefs
-
-#---------------------------------------------------------------------------
-# $Log$
-# Revision 1.10 1997/07/20 02:19:10 curt
-# First stab at a system to generate os2 makefiles automatically.
-#
-# Revision 1.9 1997/07/12 02:24:45 curt
-# Added ranlib.
-#
-# Revision 1.8 1997/06/27 21:38:03 curt
-# Working on Makefile structure.
-#
-# Revision 1.7 1997/06/27 20:03:33 curt
-# Working on Makefile structure.
-#
-# Revision 1.6 1997/06/26 19:08:29 curt
-# Restructuring make, adding automatic "make dep" support.
-#
-# Revision 1.5 1997/06/25 15:39:46 curt
-# Minor changes to compile with rsxnt/win32.
-#
-# Revision 1.4 1997/06/21 17:12:47 curt
-# Capitalized subdirectory names.
-#
-# Revision 1.3 1997/05/31 19:16:27 curt
-# Elevator trim added.
-#
-# Revision 1.2 1997/05/23 15:40:32 curt
-# Added GNU copyright headers.
-#
-# Revision 1.1 1997/05/16 15:59:47 curt
-# Initial revision.
-#
+include $(COMMONRULES)
**************************************************************************/
-#include "controls.h"
-#include "../Aircraft/aircraft.h"
+#include <Controls/controls.h>
+#include <Aircraft/aircraft.h>
void fgControlsInit( void ) {
/* $Log$
-/* Revision 1.5 1998/01/19 18:40:22 curt
-/* Tons of little changes to clean up the code and to remove fatal errors
-/* when building with the c++ compiler.
+/* Revision 1.6 1998/01/19 19:27:02 curt
+/* Merged in make system changes from Bob Kuehne <rpk@sgi.com>
+/* This should simplify things tremendously.
/*
+ * Revision 1.5 1998/01/19 18:40:22 curt
+ * Tons of little changes to clean up the code and to remove fatal errors
+ * when building with the c++ compiler.
+ *
* Revision 1.4 1997/12/10 22:37:41 curt
* Prepended "fg" on the name of all global structures that didn't have it yet.
* i.e. "struct WEATHER {}" became "struct fgWEATHER {}"
-controls.o: controls.c controls.h ../Include/limits.h \
- ../Aircraft/aircraft.h ../Aircraft/../Flight/flight.h \
- ../Aircraft/../Flight/Slew/slew.h \
- ../Aircraft/../Flight/LaRCsim/ls_interface.h \
- ../Aircraft/../Flight/LaRCsim/../flight.h \
- ../Aircraft/../Controls/controls.h
+controls.o: controls.c /home/rpk/FlightGear/Src/Controls/controls.h \
+ /home/rpk/FlightGear/Src/Controls/../Include/limits.h \
+ /home/rpk/FlightGear/Src/Aircraft/aircraft.h \
+ /home/rpk/FlightGear/Src/Flight/flight.h \
+ /home/rpk/FlightGear/Src/Flight/Slew/slew.h \
+ /home/rpk/FlightGear/Src/Flight/LaRCsim/ls_interface.h \
+ /home/rpk/FlightGear/Src/Flight/LaRCsim/../flight.h
# (Log is kept at end of this file)
#---------------------------------------------------------------------------
-
-TARGET=libFlight.a
+ARLIBRARY = libFlight.a
+TARGETS = $(ARLIBRARY)
CFILES = flight.c
-OFILES = $(CFILES:.c=.o)
-
-
-include ../make.inc
-
-
-CFLAGS = $(FG_CFLAGS)
-
-
-#---------------------------------------------------------------------------
-# Primary Targets
-#---------------------------------------------------------------------------
-
-$(TARGET): $(OFILES)
- $(AR) rv $(TARGET) $(OFILES)
- $(RANLIB) $(TARGET)
-
-all: $(TARGET)
-
-clean:
- rm -f *.o $(TARGET) lib*.a *.os2 *~ core
-
-
-#---------------------------------------------------------------------------
-# Secondary Targets
-#---------------------------------------------------------------------------
+CXXFILES =
-include depend
+LDIRT = $(FG_ROOT_LIB)/$(ARLIBRARY)
-flight.o:
- $(CC) $(CFLAGS) $(INCLUDES) -c flight.c -o $@
+include $(FG_ROOT_SRC)/commondefs
-
-#---------------------------------------------------------------------------
-# $Log$
-# Revision 1.10 1997/07/20 02:19:10 curt
-# First stab at a system to generate os2 makefiles automatically.
-#
-# Revision 1.9 1997/07/12 02:24:46 curt
-# Added ranlib.
-#
-# Revision 1.8 1997/06/27 21:38:05 curt
-# Working on Makefile structure.
-#
-# Revision 1.7 1997/06/27 20:03:34 curt
-# Working on Makefile structure.
-#
-# Revision 1.6 1997/06/26 19:08:30 curt
-# Restructuring make, adding automatic "make dep" support.
-#
-# Revision 1.5 1997/06/25 15:39:46 curt
-# Minor changes to compile with rsxnt/win32.
-#
-# Revision 1.4 1997/06/21 17:12:48 curt
-# Capitalized subdirectory names.
-#
-# Revision 1.3 1997/05/29 02:32:25 curt
-# Starting to build generic flight model interface.
-#
-# Revision 1.2 1997/05/23 15:40:36 curt
-# Added GNU copyright headers.
-#
-# Revision 1.1 1997/05/16 16:04:44 curt
-# Initial revision.
-#
+include $(COMMONRULES)
**************************************************************************/
#include <stdio.h>
-#include "flight.h"
-#include "LaRCsim/ls_interface.h"
+#include <Flight/flight.h>
+#include <Flight/LaRCsim/ls_interface.h>
/* Initialize the flight model parameters */
/* $Log$
-/* Revision 1.7 1998/01/19 18:40:23 curt
-/* Tons of little changes to clean up the code and to remove fatal errors
-/* when building with the c++ compiler.
+/* Revision 1.8 1998/01/19 19:27:03 curt
+/* Merged in make system changes from Bob Kuehne <rpk@sgi.com>
+/* This should simplify things tremendously.
/*
+ * Revision 1.7 1998/01/19 18:40:23 curt
+ * Tons of little changes to clean up the code and to remove fatal errors
+ * when building with the c++ compiler.
+ *
* Revision 1.6 1998/01/19 18:35:43 curt
* Minor tweaks and fixes for cygwin32.
*
#define FLIGHT_H
-#include "Slew/slew.h"
-#include "LaRCsim/ls_interface.h"
+#include <Flight/Slew/slew.h>
+/* #include <Flight/LaRCsim/ls_interface.h> */
/* Define the various supported flight models (most not yet implemented) */
/* $Log$
-/* Revision 1.10 1997/12/10 22:37:43 curt
-/* Prepended "fg" on the name of all global structures that didn't have it yet.
-/* i.e. "struct WEATHER {}" became "struct fgWEATHER {}"
+/* Revision 1.11 1998/01/19 19:27:03 curt
+/* Merged in make system changes from Bob Kuehne <rpk@sgi.com>
+/* This should simplify things tremendously.
/*
+ * Revision 1.10 1997/12/10 22:37:43 curt
+ * Prepended "fg" on the name of all global structures that didn't have it yet.
+ * i.e. "struct WEATHER {}" became "struct fgWEATHER {}"
+ *
* Revision 1.9 1997/09/04 02:17:33 curt
* Shufflin' stuff.
*
#---------------------------------------------------------------------------
# Makefile
#
-# Written by Curtis Olson, started July 1997.
+# Written by Curtis Olson, started May 1997.
#
# Copyright (C) 1997 Curtis L. Olson - curt@infoplane.com
#
# (Log is kept at end of this file)
#---------------------------------------------------------------------------
-
-TARGET = libJoystick.a
+ARLIBRARY = libJoystick.a
+TARGETS = $(ARLIBRARY)
CFILES = joystick.c
-HFILES = joystick.h
-OFILES = $(CFILES:.c=.o)
-
-
-include ../make.inc
-
-
-CFLAGS = $(FG_CFLAGS)
-
-
-#---------------------------------------------------------------------------
-# Primary Targets
-#---------------------------------------------------------------------------
-
-$(TARGET): $(OFILES)
- $(AR) rv $(TARGET) $(OFILES)
- $(RANLIB) $(TARGET)
+CXXFILES =
-all: $(TARGET)
+LDIRT = $(FG_ROOT_LIB)/$(ARLIBRARY)
-clean:
- rm -f *.o $(TARGET) lib*.a *.os2 *~ core
+include $(FG_ROOT_SRC)/commondefs
-
-#---------------------------------------------------------------------------
-# Secondary Targets
-#---------------------------------------------------------------------------
-
-include depend
-
-joystick.o:
- $(CC) $(CFLAGS) -c joystick.c -o $@
-
-
-#---------------------------------------------------------------------------
-# $Log$
-# Revision 1.1 1997/08/29 18:06:53 curt
-# Initial revision.
-#
+include $(COMMONRULES)
-#---------------------------------------------------------------------------
-# Makefile
-#
-# Written by Curtis Olson, started May 1997.
-#
-# $Id$
-# (Log is kept at end of this file)
-#---------------------------------------------------------------------------
-
-
-TARGET = libLaRCsim.a
+ARLIBRARY = libLaRCsim.a
+TARGETS = $(ARLIBRARY)
LaRCsimFILES = atmos_62.c ls_accel.c ls_aux.c ls_geodesy.c ls_gravity.c \
- ls_step.c ls_model.c default_model_routines.c ls_init.c # ls_sync.c
-
+ ls_step.c ls_model.c default_model_routines.c ls_init.c # ls_sync.c
NavionFILES = navion_aero.c navion_engine.c navion_gear.c navion_init.c
-
InterfaceFILES = ls_interface.c
-
CFILES = $(LaRCsimFILES) $(NavionFILES) $(InterfaceFILES)
+CXXFILES =
-OFILES = $(CFILES:.c=.o)
-
-
-include ../../make.inc
-
-
-CFLAGS = $(FG_CFLAGS)
-
-LIBS = -lm
-
-
-#---------------------------------------------------------------------------
-# Primary Targets
-#---------------------------------------------------------------------------
-
-$(TARGET): $(OFILES)
- $(AR) rv $(TARGET) $(OFILES)
- $(RANLIB) $(TARGET)
-
-simtest: $(TARGET) LaRCsim.o
- $(CC) -o simtest LaRCsim.o libLaRCsim.a $(LIBS)
-
-all: $(TARGET)
-
-clean:
- rm -f *.o $(TARGET) lib*.a *.os2 *~ core
-
-
-#---------------------------------------------------------------------------
-# Secondary Targets
-#---------------------------------------------------------------------------
-
-include depend
-
-atmos_62.o:
- $(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@
-
-default_model_routines.o:
- $(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@
-
-ls_accel.o:
- $(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@
-
-ls_aux.o:
- $(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@
-
-ls_geodesy.o:
- $(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@
-
-ls_gravity.o:
- $(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@
-
-ls_init.o:
- $(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@
-
-ls_interface.o:
- $(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@
-
-ls_model.o:
- $(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@
-
-ls_step.o:
- $(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@
-
-navion_aero.o:
- $(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@
-
-navion_engine.o:
- $(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@
-
-navion_gear.o:
- $(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@
-
-navion_init.o:
- $(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@
+LDIRT = $(FG_ROOT_LIB)/$(ARLIBRARY)
+include $(FG_ROOT_SRC)/commondefs
-#---------------------------------------------------------------------------
-# $Log$
-# Revision 1.10 1997/07/20 02:19:10 curt
-# First stab at a system to generate os2 makefiles automatically.
-#
-# Revision 1.9 1997/07/18 23:41:23 curt
-# Tweaks for building with Cygnus Win32 compiler.
-#
-# Revision 1.8 1997/07/12 02:24:48 curt
-# Added ranlib.
-#
-# Revision 1.7 1997/07/07 20:59:48 curt
-# Working on scenery transformations to enable us to fly fluidly over the
-# poles with no discontinuity/distortion in scenery.
-#
-# Revision 1.6 1997/06/27 21:38:06 curt
-# Working on Makefile structure.
-#
-# Revision 1.5 1997/06/27 20:03:34 curt
-# Working on Makefile structure.
-#
-# Revision 1.4 1997/06/26 19:08:30 curt
-# Restructuring make, adding automatic "make dep" support.
-#
-# Revision 1.3 1997/06/21 17:12:50 curt
-# Capitalized subdirectory names.
-#
-# Revision 1.2 1997/06/17 16:52:02 curt
-# Timer interval stuff now uses gettimeofday() instead of ftime()
-#
-# Revision 1.1 1997/05/29 00:09:52 curt
-# Initial Flight Gear revision.
-#
-# Revision 1.1 1997/05/16 16:04:44 curt
-# Initial revision.
-#
+include $(COMMONRULES)
#include "ls_aux.h"
#include "ls_model.h"
#include "ls_init.h"
-#include "../flight.h"
-#include "../../Aircraft/aircraft.h"
+#include <Flight/flight.h>
+#include <Aircraft/aircraft.h>
/* global variable declarations */
/* Flight Gear Modification Log
*
* $Log$
+ * Revision 1.14 1998/01/19 19:27:04 curt
+ * Merged in make system changes from Bob Kuehne <rpk@sgi.com>
+ * This should simplify things tremendously.
+ *
* Revision 1.13 1998/01/19 18:40:26 curt
* Tons of little changes to clean up the code and to remove fatal errors
* when building with the c++ compiler.
**************************************************************************/
-#ifndef LS_INTERFACE_H
-#define LS_INTERFACE_H
+#ifndef _LS_INTERFACE_H
+#define _LS_INTERFACE_H
-#include "../flight.h"
+#include <Flight/flight.h>
/* reset flight params to a specific position */
int fgLaRCsim_2_Flight (struct fgFLIGHT *f);
-#endif /* LS_INTERFACE_H */
+#endif /* _LS_INTERFACE_H */
/* $Log$
-/* Revision 1.4 1998/01/19 18:40:27 curt
-/* Tons of little changes to clean up the code and to remove fatal errors
-/* when building with the c++ compiler.
+/* Revision 1.5 1998/01/19 19:27:05 curt
+/* Merged in make system changes from Bob Kuehne <rpk@sgi.com>
+/* This should simplify things tremendously.
/*
+ * Revision 1.4 1998/01/19 18:40:27 curt
+ * Tons of little changes to clean up the code and to remove fatal errors
+ * when building with the c++ compiler.
+ *
* Revision 1.3 1997/07/23 21:52:20 curt
* Put comments around the text after an #endif for increased portability.
*
DATE PURPOSE BY
--------------------------------------------------------------------------*/
+
+#ifndef _LS_TYPES_H
+#define _LS_TYPES_H
+
+
/* SCALAR type is used throughout equations of motion code - sets precision */
typedef double SCALAR;
#define DATA SCALAR
+
+#endif /* _LS_TYPES_H */
+
+
/* --------------------------- end of ls_types.h -------------------------*/
#endif
#include <GL/glut.h>
-#include "../XGL/xgl.h"
+#include <XGL/xgl.h>
#include <stdio.h>
-#include "GLUTkey.h"
-#include "views.h"
+#include <Main/GLUTkey.h>
+#include <Main/views.h>
-#include "../Include/constants.h"
+#include <Include/constants.h>
-#include "../Aircraft/aircraft.h"
-#include "../Weather/weather.h"
+#include <Aircraft/aircraft.h>
+#include <Weather/weather.h>
extern int show_hud; /* HUD state */
/* $Log$
-/* Revision 1.25 1998/01/05 18:44:34 curt
-/* Add an option to advance/decrease time from keyboard.
+/* Revision 1.26 1998/01/19 19:27:07 curt
+/* Merged in make system changes from Bob Kuehne <rpk@sgi.com>
+/* This should simplify things tremendously.
/*
+ * Revision 1.25 1998/01/05 18:44:34 curt
+ * Add an option to advance/decrease time from keyboard.
+ *
* Revision 1.24 1997/12/30 16:36:46 curt
* Merged in Durk's changes ...
*
#endif
#include <GL/glut.h>
-#include "../XGL/xgl.h"
+#include <XGL/xgl.h>
#include <stdio.h>
-#include "GLUTkey.h"
-#include "fg_init.h"
-#include "views.h"
-
-#include "../Include/constants.h"
-#include "../Include/general.h"
-
-#include "../Aircraft/aircraft.h"
-#include "../Astro/moon.h"
-#include "../Astro/sky.h"
-#include "../Astro/stars.h"
-#include "../Astro/sun.h"
-#include "../Cockpit/cockpit.h"
-#include "../Joystick/joystick.h"
-#include "../Math/fg_geodesy.h"
-#include "../Math/mat3.h"
-#include "../Math/polar.h"
-#include "../Scenery/mesh.h"
-#include "../Scenery/scenery.h"
-#include "../Scenery/tilemgr.h"
-#include "../Time/event.h"
-#include "../Time/fg_time.h"
-#include "../Time/fg_timer.h"
-#include "../Time/sunpos.h"
-#include "../Weather/weather.h"
+#include <Main/GLUTkey.h>
+#include <Main/fg_init.h>
+#include <Main/views.h>
+
+#include <Include/constants.h>
+#include <Include/general.h>
+
+#include <Aircraft/aircraft.h>
+#include <Astro/moon.h>
+#include <Astro/sky.h>
+#include <Astro/stars.h>
+#include <Astro/sun.h>
+#include <Cockpit/cockpit.h>
+#include <Joystick/joystick.h>
+#include <Math/fg_geodesy.h>
+#include <Math/mat3.h>
+#include <Math/polar.h>
+#include <Scenery/mesh.h>
+#include <Scenery/scenery.h>
+#include <Scenery/tilemgr.h>
+#include <Time/event.h>
+#include <Time/fg_time.h>
+#include <Time/fg_timer.h>
+#include <Time/sunpos.h>
+#include <Weather/weather.h>
/* This is a record containing global housekeeping information */
#ifdef NO_PRINTF
#include <stdarg.h>
- int printf (const char *format, ...) {
- }
+ int printf (const char *format, ...) {}
#endif
/* $Log$
-/* Revision 1.49 1998/01/19 18:40:31 curt
-/* Tons of little changes to clean up the code and to remove fatal errors
-/* when building with the c++ compiler.
+/* Revision 1.50 1998/01/19 19:27:07 curt
+/* Merged in make system changes from Bob Kuehne <rpk@sgi.com>
+/* This should simplify things tremendously.
/*
+ * Revision 1.49 1998/01/19 18:40:31 curt
+ * Tons of little changes to clean up the code and to remove fatal errors
+ * when building with the c++ compiler.
+ *
* Revision 1.48 1998/01/19 18:35:46 curt
* Minor tweaks and fixes for cygwin32.
*
# (Log is kept at end of this file)
#---------------------------------------------------------------------------
+TARGET = fg-$(FG_VERSION)
CFILES = fg_init.c views.c $(INTERFACE_FILES)
-OFILES = $(CFILES:.c=.o)
-AFILES = ../Aircraft/libAircraft.a ../Astro/libAstro.a ../Cockpit/libCockpit.a \
- ../Controls/libControls.a ../Flight/libFlight.a \
- ../Joystick/libJoystick.a ../Flight/LaRCsim/libLaRCsim.a \
- ../Flight/Slew/libSlew.a ../Scenery/libScenery.a \
- ../Time/libTime.a ../Weather/libWeather.a ../Math/libMath.a \
+FGLIBS = -lAircraft -lAstro -lCockpit -lControls -lFlight \
+ -lJoystick -lLaRCsim -lSlew -lScenery -lTime -lWeather -lMath \
+ -lc \
+ $(NULL)
-include ../make.inc
+LCDEFS = -DGLUT
+LLDFLAGS =
+LDLIBS = $(FGLIBS) $(FG_DEBUG_LIBS) \
+ $(INTERFACE_LIBS) $(GRAPHICS_LIBS) -lm -lfl
-CFLAGS = $(FG_CFLAGS) $(INTERFACE_FLAGS)
-LIBS = $(FG_DEBUG_LIBS) $(INTERFACE_LIBS) $(GRAPHICS_LIBS) -lm -lfl
-
-
-TARGET=fg-$(FG_VERSION)
-
+include $(FG_ROOT_SRC)/commondefs
#---------------------------------------------------------------------------
-# Primary Targets
+# Rule for TARGET
#---------------------------------------------------------------------------
-$(TARGET): $(OFILES) $(AFILES)
- $(CC) -o $(TARGET) $(OFILES) $(AFILES) $(LIBS)
- $(RM) -f fg$(FG_VERSION_MAJOR)
- $(LN) $(TARGET) fg$(FG_VERSION_MAJOR)
-
-all: $(TARGET)
-
-clean:
- rm -f *.o $(TARGET) $(TARGET).exe \
- fg$(FG_VERSION_MAJOR) fg$(FG_VERSION_MAJOR).exe \
- lib*.a *.os2 *~ core
-
-
-#---------------------------------------------------------------------------
-# Secondary Targets
-#---------------------------------------------------------------------------
-
-include depend
-
-GLUTmain.o:
- $(CC) $(CFLAGS) -c GLUTmain.c -o $@
-
-GLUTkey.o:
- $(CC) $(CFLAGS) -c GLUTkey.c -o $@
-
-GLTKkey.o:
- $(CC) $(CFLAGS) -c GLTKkey.c -o $@
-
-fg_init.o:
- $(CC) $(CFLAGS) -c fg_init.c -o $@
-
-views.o:
- $(CC) $(CFLAGS) -c views.c -o $@
+$(TARGET): $(OBJECTS)
+ $(CC) -o $(TARGET) $(OBJECTS) $(LDFLAGS) $(LDLIBS)
+ $(LN) -sf $(TARGET) fg$(FG_VERSION_MAJOR)
+include $(COMMONRULES)
#---------------------------------------------------------------------------
# $Log$
-# Revision 1.40 1998/01/07 03:18:57 curt
-# Moved astronomical stuff from .../Src/Scenery to .../Src/Astro/
+# Revision 1.41 1998/01/19 19:27:08 curt
+# Merged in make system changes from Bob Kuehne <rpk@sgi.com>
+# This should simplify things tremendously.
#
-# Revision 1.39 1997/12/17 23:13:35 curt
-# Began working on rendering a sky.
+# Revision 1.1 1998/01/07 03:16:15 curt
+# Moved from .../Src/Scenery/ to .../Src/Astro/
#
-# Revision 1.38 1997/12/15 23:54:47 curt
-# Add xgl wrappers for debugging.
-# Generate terrain normals on the fly.
+# Revision 1.26 1997/12/19 16:45:01 curt
+# Working on scene rendering order and options.
#
-# Revision 1.37 1997/12/12 21:41:26 curt
-# More light/material property tweaking ... still a ways off.
+# Revision 1.25 1997/12/17 23:13:45 curt
+# Began working on rendering the sky.
#
-# Revision 1.36 1997/12/10 01:19:47 curt
-# Tweaks for verion 0.15 release.
+# Revision 1.24 1997/11/25 19:25:33 curt
+# Changes to integrate Durk's moon/sun code updates + clean up.
#
-# Revision 1.35 1997/10/28 21:11:22 curt
-# Organizational changes.
+# Revision 1.23 1997/10/28 21:00:20 curt
+# Changing to new terrain format.
#
-# Revision 1.34 1997/10/25 03:24:21 curt
-# Incorporated sun, moon, and star positioning code contributed by Durk Talsma.
+# Revision 1.22 1997/10/25 03:30:07 curt
+# Misc. tweaks.
#
-# Revision 1.33 1997/09/04 02:17:35 curt
-# Shufflin' stuff.
+# Revision 1.21 1997/10/25 03:18:26 curt
+# Incorporated sun, moon, and planet position and rendering code contributed
+# by Durk Talsma.
#
-# Revision 1.32 1997/08/27 21:31:27 curt
-# Added views.[ch]
+# Revision 1.20 1997/09/22 14:44:21 curt
+# Continuing to try to align stars correctly.
#
-# Revision 1.31 1997/08/25 20:27:23 curt
-# Merged in initial HUD and Joystick code.
+# Revision 1.19 1997/08/27 03:30:23 curt
+# Changed naming scheme of basic shared structures.
#
-# Revision 1.30 1997/08/22 21:34:40 curt
-# Doing a bit of reorganizing and house cleaning.
+# Revision 1.18 1997/08/02 19:10:12 curt
+# Incorporated mesh2GL.c into mesh.c
#
-# Revision 1.29 1997/08/04 20:25:15 curt
-# Organizational tweaking.
+# Revision 1.17 1997/07/23 21:52:23 curt
+# Put comments around the text after an #endif for increased portability.
#
-# 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.
-#
-# Revision 1.26 1997/07/30 16:12:42 curt
-# Moved fg_random routines from Util/ to Math/
-#
-# Revision 1.25 1997/07/20 02:19:11 curt
+# Revision 1.16 1997/07/20 02:19:11 curt
# First stab at a system to generate os2 makefiles automatically.
#
-# Revision 1.24 1997/07/19 23:04:47 curt
-# Added an initial weather section.
-#
-# Revision 1.23 1997/07/19 22:34:03 curt
-# Moved PI definitions to ../constants.h
-# Moved random() stuff to ../Utils/ and renamed fg_random()
+# Revision 1.15 1997/07/12 02:24:47 curt
+# Added ranlib.
#
-# Revision 1.22 1997/07/18 23:41:25 curt
-# Tweaks for building with Cygnus Win32 compiler.
+# Revision 1.14 1997/06/29 21:16:47 curt
+# More twiddling with the Scenery Management system.
#
-# Revision 1.21 1997/07/05 20:43:34 curt
-# renamed mat3 directory to Math so we could add other math related routines.
-#
-# Revision 1.20 1997/06/29 21:19:17 curt
-# Working on scenery management system.
-#
-# Revision 1.19 1997/06/27 21:38:09 curt
+# Revision 1.13 1997/06/27 21:38:10 curt
# Working on Makefile structure.
#
-# Revision 1.18 1997/06/27 20:03:36 curt
+# Revision 1.12 1997/06/27 20:03:37 curt
# Working on Makefile structure.
#
-# Revision 1.17 1997/06/26 22:14:54 curt
+# Revision 1.11 1997/06/26 22:14:57 curt
# Beginning work on a scenery management system.
#
-# Revision 1.16 1997/06/26 19:08:33 curt
+# Revision 1.10 1997/06/26 19:08:34 curt
# Restructuring make, adding automatic "make dep" support.
#
-# Revision 1.15 1997/06/25 15:39:47 curt
+# Revision 1.9 1997/06/25 15:39:48 curt
# Minor changes to compile with rsxnt/win32.
#
-# Revision 1.14 1997/06/21 17:52:23 curt
-# Continue directory shuffling ... everything should be compilable/runnable
-# again.
+# Revision 1.8 1997/06/21 17:58:07 curt
+# directory shuffling ...
#
-# Revision 1.13 1997/06/21 17:12:54 curt
-# Capitalized subdirectory names.
+# Revision 1.1 1997/06/21 17:39:28 curt
+# Moved to the ParseScn subdirectory.
#
-# Revision 1.12 1997/06/16 19:32:51 curt
-# Starting to add general timer support.
+# Revision 1.6 1997/06/21 17:12:55 curt
+# Capitalized subdirectory names.
#
-# Revision 1.11 1997/05/31 19:16:25 curt
+# Revision 1.5 1997/05/31 19:16:29 curt
# Elevator trim added.
#
-# Revision 1.10 1997/05/31 04:13:53 curt
-# WE CAN NOW FLY!!!
+# Revision 1.4 1997/05/27 17:48:50 curt
+# Added -f flag to flex to generate a "fast" scanner.
#
-# Continuing work on the LaRCsim flight model integration.
-# Added some MSFS-like keyboard input handling.
-#
-# Revision 1.9 1997/05/30 23:26:19 curt
-# Added elevator/aileron controls.
-#
-# Revision 1.8 1997/05/30 19:27:02 curt
-# The LaRCsim flight model is starting to look like it is working.
-#
-# Revision 1.7 1997/05/29 22:39:50 curt
-# Working on incorporating the LaRCsim flight model.
-#
-# Revision 1.6 1997/05/29 02:33:23 curt
-# Updated to reflect changing interfaces in other "modules."
-#
-# Revision 1.5 1997/05/27 17:44:32 curt
-# Renamed & rearranged variables and routines. Added some initial simple
-# timer/alarm routines so the flight model can be updated on a regular interval.
-#
-# Revision 1.4 1997/05/23 15:40:26 curt
+# Revision 1.3 1997/05/23 15:40:40 curt
# Added GNU copyright headers.
-# Fog now works!
-#
-# Revision 1.3 1997/05/23 00:35:13 curt
-# Trying to get fog to work ...
#
-# Revision 1.2 1997/05/21 15:57:52 curt
-# Renamed due to added GLUT support.
+# Revision 1.2 1997/05/17 00:17:01 curt
+# Cosmetic changes.
#
-# Revision 1.1 1997/05/16 16:05:51 curt
+# Revision 1.1 1997/05/16 16:07:02 curt
# Initial revision.
#
#include <stdio.h>
#include <stdlib.h>
-#include "fg_init.h"
-#include "views.h"
-
-#include "../Include/constants.h"
-#include "../Include/general.h"
-
-#include "../Aircraft/aircraft.h"
-#include "../Astro/moon.h"
-#include "../Astro/sky.h"
-#include "../Astro/stars.h"
-#include "../Astro/sun.h"
-#include "../Cockpit/cockpit.h"
-#include "../Joystick/joystick.h"
-#include "../Math/fg_random.h"
-#include "../Scenery/mesh.h"
-#include "../Scenery/scenery.h"
-#include "../Scenery/tilemgr.h"
-#include "../Time/event.h"
-#include "../Time/fg_time.h"
-#include "../Time/sunpos.h"
-#include "../Weather/weather.h"
+#include <Main/fg_init.h>
+#include <Main/views.h>
+
+#include <Include/constants.h>
+#include <Include/general.h>
+
+#include <Aircraft/aircraft.h>
+#include <Astro/moon.h>
+#include <Astro/sky.h>
+#include <Astro/stars.h>
+#include <Astro/sun.h>
+#include <Cockpit/cockpit.h>
+#include <Joystick/joystick.h>
+#include <Math/fg_random.h>
+#include <Scenery/mesh.h>
+#include <Scenery/scenery.h>
+#include <Scenery/tilemgr.h>
+#include <Time/event.h>
+#include <Time/fg_time.h>
+#include <Time/sunpos.h>
+#include <Weather/weather.h>
extern int show_hud; /* HUD state */
/* $Log$
-/* Revision 1.31 1998/01/19 18:40:32 curt
-/* Tons of little changes to clean up the code and to remove fatal errors
-/* when building with the c++ compiler.
+/* Revision 1.32 1998/01/19 19:27:08 curt
+/* Merged in make system changes from Bob Kuehne <rpk@sgi.com>
+/* This should simplify things tremendously.
/*
+ * Revision 1.31 1998/01/19 18:40:32 curt
+ * Tons of little changes to clean up the code and to remove fatal errors
+ * when building with the c++ compiler.
+ *
* Revision 1.30 1998/01/13 00:23:09 curt
* Initial changes to support loading and management of scenery tiles. Note,
* there's still a fair amount of work left to be done.
**************************************************************************/
-#include "views.h"
+#include <Main/views.h>
-#include "../Include/constants.h"
+#include <Include/constants.h>
-#include "../Flight/flight.h"
-#include "../Math/mat3.h"
-#include "../Math/polar.h"
-#include "../Math/vector.h"
-#include "../Scenery/scenery.h"
-#include "../Time/fg_time.h"
+#include <Flight/flight.h>
+#include <Math/mat3.h>
+#include <Math/polar.h>
+#include <Math/vector.h>
+#include <Scenery/scenery.h>
+#include <Time/fg_time.h>
/* This is a record containing current view parameters */
/* $Log$
-/* Revision 1.9 1998/01/13 00:23:09 curt
-/* Initial changes to support loading and management of scenery tiles. Note,
-/* there's still a fair amount of work left to be done.
+/* Revision 1.10 1998/01/19 19:27:09 curt
+/* Merged in make system changes from Bob Kuehne <rpk@sgi.com>
+/* This should simplify things tremendously.
/*
+ * Revision 1.9 1998/01/13 00:23:09 curt
+ * Initial changes to support loading and management of scenery tiles. Note,
+ * there's still a fair amount of work left to be done.
+ *
* Revision 1.8 1997/12/30 22:22:33 curt
* Further integration of event manager.
*
#define VIEWS_H
-#include "../Include/types.h"
-#include "../Flight/flight.h"
-#include "../Math/mat3.h"
-#include "../Time/fg_time.h"
+#include <Include/types.h>
+#include <Flight/flight.h>
+#include <Math/mat3.h>
+#include <Time/fg_time.h>
/* Define a structure containing view information */
/* $Log$
-/* Revision 1.5 1997/12/22 04:14:32 curt
-/* Aligned sky with sun so dusk/dawn effects can be correct relative to the sun.
+/* Revision 1.6 1998/01/19 19:27:10 curt
+/* Merged in make system changes from Bob Kuehne <rpk@sgi.com>
+/* This should simplify things tremendously.
/*
+ * Revision 1.5 1997/12/22 04:14:32 curt
+ * Aligned sky with sun so dusk/dawn effects can be correct relative to the sun.
+ *
* Revision 1.4 1997/12/17 23:13:36 curt
* Began working on rendering a sky.
*
# (Log is kept at end of this file)
#---------------------------------------------------------------------------
-
-TARGET = libScenery.a
+ARLIBRARY = libScenery.a
+TARGETS = $(ARLIBRARY)
CFILES = common.c geometry.c mesh.c obj.c scenery.c tilemgr.c tileutils.c
+CXXFILES =
-OFILES = $(CFILES:.c=.o)
-
-
-include ../make.inc
-
-
-CFLAGS = $(FG_CFLAGS)
-
-
-#---------------------------------------------------------------------------
-# Primary Targets
-#---------------------------------------------------------------------------
-
-$(TARGET): $(OFILES) $(HFILES)
- $(AR) rv $(TARGET) $(OFILES)
- $(RANLIB) $(TARGET)
-
-all: $(TARGET)
+LDIRT = $(FG_ROOT_LIB)/$(ARLIBRARY)
-clean:
- rm -f *.o $(TARGET) lib*.a *.os2 *~ core
+include $(FG_ROOT_SRC)/commondefs
-realclean: clean
-
-
-#---------------------------------------------------------------------------
-# Secondary Targets
-#---------------------------------------------------------------------------
-
-include depend
-
-common.o:
- $(CC) $(CFLAGS) -c common.c -o $@
-
-geometry.o:
- $(CC) $(CFLAGS) -c geometry.c -o $@
-
-mesh.o:
- $(CC) $(CFLAGS) -c mesh.c -o $@
-
-obj.o:
- $(CC) $(CFLAGS) -c obj.c -o $@
-
-scenery.o:
- $(CC) $(CFLAGS) -c scenery.c -o $@
-
-tilemgr.o:
- $(CC) $(CFLAGS) -c tilemgr.c -o $@
-
-tileutils.o:
- $(CC) $(CFLAGS) -c tileutils.c -o $@
-
-
-#---------------------------------------------------------------------------
-# $Log$
-# Revision 1.28 1998/01/08 02:22:26 curt
-# Continue working on basic features.
-#
-# Revision 1.27 1998/01/07 03:22:28 curt
-# Moved astro stuff to .../Src/Astro/
-#
-# Revision 1.26 1997/12/19 16:45:01 curt
-# Working on scene rendering order and options.
-#
-# Revision 1.25 1997/12/17 23:13:45 curt
-# Began working on rendering the sky.
-#
-# Revision 1.24 1997/11/25 19:25:33 curt
-# Changes to integrate Durk's moon/sun code updates + clean up.
-#
-# Revision 1.23 1997/10/28 21:00:20 curt
-# Changing to new terrain format.
-#
-# Revision 1.22 1997/10/25 03:30:07 curt
-# Misc. tweaks.
-#
-# Revision 1.21 1997/10/25 03:18:26 curt
-# Incorporated sun, moon, and planet position and rendering code contributed
-# by Durk Talsma.
-#
-# Revision 1.20 1997/09/22 14:44:21 curt
-# Continuing to try to align stars correctly.
-#
-# Revision 1.19 1997/08/27 03:30:23 curt
-# Changed naming scheme of basic shared structures.
-#
-# Revision 1.18 1997/08/02 19:10:12 curt
-# Incorporated mesh2GL.c into mesh.c
-#
-# Revision 1.17 1997/07/23 21:52:23 curt
-# Put comments around the text after an #endif for increased portability.
-#
-# Revision 1.16 1997/07/20 02:19:11 curt
-# First stab at a system to generate os2 makefiles automatically.
-#
-# Revision 1.15 1997/07/12 02:24:47 curt
-# Added ranlib.
-#
-# Revision 1.14 1997/06/29 21:16:47 curt
-# More twiddling with the Scenery Management system.
-#
-# Revision 1.13 1997/06/27 21:38:10 curt
-# Working on Makefile structure.
-#
-# Revision 1.12 1997/06/27 20:03:37 curt
-# Working on Makefile structure.
-#
-# Revision 1.11 1997/06/26 22:14:57 curt
-# Beginning work on a scenery management system.
-#
-# Revision 1.10 1997/06/26 19:08:34 curt
-# Restructuring make, adding automatic "make dep" support.
-#
-# Revision 1.9 1997/06/25 15:39:48 curt
-# Minor changes to compile with rsxnt/win32.
-#
-# Revision 1.8 1997/06/21 17:58:07 curt
-# directory shuffling ...
-#
-# Revision 1.1 1997/06/21 17:39:28 curt
-# Moved to the ParseScn subdirectory.
-#
-# Revision 1.6 1997/06/21 17:12:55 curt
-# Capitalized subdirectory names.
-#
-# Revision 1.5 1997/05/31 19:16:29 curt
-# Elevator trim added.
-#
-# Revision 1.4 1997/05/27 17:48:50 curt
-# Added -f flag to flex to generate a "fast" scanner.
-#
-# Revision 1.3 1997/05/23 15:40:40 curt
-# Added GNU copyright headers.
-#
-# Revision 1.2 1997/05/17 00:17:01 curt
-# Cosmetic changes.
-#
-# Revision 1.1 1997/05/16 16:07:02 curt
-# Initial revision.
-#
+include $(COMMONRULES)
#include <string.h>
#endif
-#include "common.h"
+#include <Scenery/common.h>
/* strip the enclosing quotes from a string, works within the current
/* $Log$
-/* Revision 1.3 1998/01/06 01:20:23 curt
-/* Tweaks to help building with MSVC++
+/* Revision 1.4 1998/01/19 19:27:14 curt
+/* Merged in make system changes from Bob Kuehne <rpk@sgi.com>
+/* This should simplify things tremendously.
/*
+ * Revision 1.3 1998/01/06 01:20:23 curt
+ * Tweaks to help building with MSVC++
+ *
* Revision 1.2 1997/05/23 15:40:41 curt
* Added GNU copyright headers.
*
#include <stdlib.h>
#include <string.h>
-#include "geometry.h"
-#include "mesh.h"
+#include <Scenery/geometry.h>
+#include <Scenery/mesh.h>
static vrmlGeometryType;
/* $Log$
-/* Revision 1.6 1998/01/19 18:40:35 curt
-/* Tons of little changes to clean up the code and to remove fatal errors
-/* when building with the c++ compiler.
+/* Revision 1.7 1998/01/19 19:27:15 curt
+/* Merged in make system changes from Bob Kuehne <rpk@sgi.com>
+/* This should simplify things tremendously.
/*
+ * Revision 1.6 1998/01/19 18:40:35 curt
+ * Tons of little changes to clean up the code and to remove fatal errors
+ * when building with the c++ compiler.
+ *
* Revision 1.5 1998/01/06 01:20:23 curt
* Tweaks to help building with MSVC++
*
#include <GL/glut.h>
-#include "../Include/constants.h"
-#include "../Include/types.h"
-#include "../Math/fg_geodesy.h"
-#include "../Math/fg_random.h"
-#include "../Math/mat3.h"
-#include "../Math/polar.h"
+#include <Include/constants.h>
+#include <Include/types.h>
+#include <Math/fg_geodesy.h>
+#include <Math/fg_random.h>
+#include <Math/mat3.h>
+#include <Math/polar.h>
-#include "mesh.h"
-#include "common.h"
-#include "scenery.h"
+#include <Scenery/mesh.h>
+#include <Scenery/common.h>
+#include <Scenery/scenery.h>
/* Temporary hack until we get the scenery management system running */
/* $Log$
-/* Revision 1.26 1998/01/19 18:40:36 curt
-/* Tons of little changes to clean up the code and to remove fatal errors
-/* when building with the c++ compiler.
+/* Revision 1.27 1998/01/19 19:27:15 curt
+/* Merged in make system changes from Bob Kuehne <rpk@sgi.com>
+/* This should simplify things tremendously.
/*
+ * Revision 1.26 1998/01/19 18:40:36 curt
+ * Tons of little changes to clean up the code and to remove fatal errors
+ * when building with the c++ compiler.
+ *
* Revision 1.25 1998/01/07 03:31:27 curt
* Miscellaneous tweaks.
*
#include <stdio.h>
#include <string.h>
#include <GL/glut.h>
-#include "../XGL/xgl.h"
+#include <XGL/xgl.h>
-#include "obj.h"
-#include "scenery.h"
+#include <Scenery/obj.h>
+#include <Scenery/scenery.h>
-#include "../Math/mat3.h"
+#include <Math/mat3.h>
/* $Log$
-/* Revision 1.17 1998/01/13 00:23:10 curt
-/* Initial changes to support loading and management of scenery tiles. Note,
-/* there's still a fair amount of work left to be done.
+/* Revision 1.18 1998/01/19 19:27:16 curt
+/* Merged in make system changes from Bob Kuehne <rpk@sgi.com>
+/* This should simplify things tremendously.
/*
+ * Revision 1.17 1998/01/13 00:23:10 curt
+ * Initial changes to support loading and management of scenery tiles. Note,
+ * there's still a fair amount of work left to be done.
+ *
* Revision 1.16 1997/12/30 23:09:40 curt
* Worked on winding problem without luck, so back to calling glFrontFace()
* 3 times for each scenery area.
#include <GL/glut.h>
-#include "../Include/types.h"
+#include <Include/types.h>
/* Load a .obj file and generate the GL call list */
/* $Log$
-/* Revision 1.2 1998/01/13 00:23:10 curt
-/* Initial changes to support loading and management of scenery tiles. Note,
-/* there's still a fair amount of work left to be done.
+/* Revision 1.3 1998/01/19 19:27:17 curt
+/* Merged in make system changes from Bob Kuehne <rpk@sgi.com>
+/* This should simplify things tremendously.
/*
+ * Revision 1.2 1998/01/13 00:23:10 curt
+ * Initial changes to support loading and management of scenery tiles. Note,
+ * there's still a fair amount of work left to be done.
+ *
* Revision 1.1 1997/10/28 21:14:55 curt
* Initial revision.
*
#endif
#include <GL/glut.h>
-#include "../XGL/xgl.h"
+#include <XGL/xgl.h>
#include <stdio.h>
#include <string.h>
-#include "../Include/general.h"
+#include <Include/general.h>
-#include "obj.h"
-#include "scenery.h"
+#include <Scenery/obj.h>
+#include <Scenery/scenery.h>
/* Temporary hack until we get the scenery management system running */
/* $Log$
-/* Revision 1.32 1998/01/19 18:40:37 curt
-/* Tons of little changes to clean up the code and to remove fatal errors
-/* when building with the c++ compiler.
+/* Revision 1.33 1998/01/19 19:27:17 curt
+/* Merged in make system changes from Bob Kuehne <rpk@sgi.com>
+/* This should simplify things tremendously.
/*
+ * Revision 1.32 1998/01/19 18:40:37 curt
+ * Tons of little changes to clean up the code and to remove fatal errors
+ * when building with the c++ compiler.
+ *
* Revision 1.31 1998/01/13 00:23:11 curt
* Initial changes to support loading and management of scenery tiles. Note,
* there's still a fair amount of work left to be done.
#define SCENERY_H
-#include "../Include/types.h"
+#include <Include/types.h>
/* Define a structure containing global scenery parameters */
/* $Log$
-/* Revision 1.13 1998/01/19 18:40:38 curt
-/* Tons of little changes to clean up the code and to remove fatal errors
-/* when building with the c++ compiler.
+/* Revision 1.14 1998/01/19 19:27:17 curt
+/* Merged in make system changes from Bob Kuehne <rpk@sgi.com>
+/* This should simplify things tremendously.
/*
+ * Revision 1.13 1998/01/19 18:40:38 curt
+ * Tons of little changes to clean up the code and to remove fatal errors
+ * when building with the c++ compiler.
+ *
* Revision 1.12 1997/12/15 23:55:03 curt
* Add xgl wrappers for debugging.
* Generate terrain normals on the fly.
#endif
#include <GL/glut.h>
-#include "../XGL/xgl.h"
+#include <XGL/xgl.h>
-#include "scenery.h"
-#include "tileutils.h"
-#include "obj.h"
+#include <Scenery/scenery.h>
+#include <Scenery/tileutils.h>
+#include <Scenery/obj.h>
-#include "../Aircraft/aircraft.h"
-#include "../Include/constants.h"
-#include "../Include/general.h"
-#include "../Include/types.h"
+#include <Aircraft/aircraft.h>
+#include <Include/constants.h>
+#include <Include/general.h>
+#include <Include/types.h>
/* here's where we keep the array of closest (potentially viewable) tiles */
/* $Log$
-/* Revision 1.4 1998/01/19 18:40:38 curt
-/* Tons of little changes to clean up the code and to remove fatal errors
-/* when building with the c++ compiler.
+/* Revision 1.5 1998/01/19 19:27:18 curt
+/* Merged in make system changes from Bob Kuehne <rpk@sgi.com>
+/* This should simplify things tremendously.
/*
+ * Revision 1.4 1998/01/19 18:40:38 curt
+ * Tons of little changes to clean up the code and to remove fatal errors
+ * when building with the c++ compiler.
+ *
* Revision 1.3 1998/01/13 00:23:11 curt
* Initial changes to support loading and management of scenery tiles. Note,
* there's still a fair amount of work left to be done.
#include <math.h>
#include <stdio.h>
-#include "tileutils.h"
-#include "../Include/constants.h"
+#include <Scenery/tileutils.h>
+#include <Include/constants.h>
/* Generate the unique scenery tile index containing the specified
/* $Log$
-/* Revision 1.5 1998/01/14 02:19:04 curt
-/* Makde offset_bucket visible to outside.
+/* Revision 1.6 1998/01/19 19:27:18 curt
+/* Merged in make system changes from Bob Kuehne <rpk@sgi.com>
+/* This should simplify things tremendously.
/*
+ * Revision 1.5 1998/01/14 02:19:04 curt
+ * Makde offset_bucket visible to outside.
+ *
* Revision 1.4 1998/01/13 00:23:12 curt
* Initial changes to support loading and management of scenery tiles. Note,
* there's still a fair amount of work left to be done.
# (Log is kept at end of this file)
#---------------------------------------------------------------------------
-
-include make.inc
-
+include $(FG_ROOT_SRC)/commondefs
SUBSUBDIRS = Flight/LaRCsim Flight/Slew
SUBDIRS = Aircraft Astro Cockpit Controls Flight Joystick Math Scenery \
Time Weather XGL
MAIN = Main
-
+ORDEREDDIRS = $(SUBSUBDIRS) $(SUBDIRS) $(MAIN)
all:
- for dir in $(SUBSUBDIRS) $(SUBDIRS) $(MAIN); do \
+ for dir in $(ORDEREDDIRS); do \
( cd $$dir; $(MAKE) ) ; \
done
depend:
- for dir in $(SUBSUBDIRS) $(SUBDIRS) $(MAIN); do \
+ for dir in $(ORDEREDDIRS); do \
( echo "Making depend in $$dir"; \
cd $$dir; $(CC) -MM *.c > depend ) ; \
done
Makefile-os2:
cat Makefile | perl mkmfos2.pl > Makefile.os2; \
- for dir in $(SUBSUBDIRS) $(SUBDIRS) $(MAIN); do \
+ for dir in $(ORDEREDDIRS); do \
( echo "Making Makefile.os2 in $$dir"; \
cat $$dir/Makefile | perl mkmfos2.pl > $$dir/Makefile.os2; \
cat $$dir/depend | perl mkmfos2.pl > $$dir/depend.os2) ; \
clean:
-rm -f *.os2 *~
- for dir in $(SUBSUBDIRS) $(SUBDIRS) $(MAIN); do \
+ for dir in $(ORDEREDDIRS); do \
(cd $$dir; $(MAKE) clean) ; \
done
+clobber:
+ for dir in $(ORDEREDDIRS); do \
+ (cd $$dir; $(MAKE) clean) ; \
+ done
source-tar: clean
(cd ../..; \
#---------------------------------------------------------------------------
# $Log$
+# Revision 1.36 1998/01/19 19:26:51 curt
+# Merged in make system changes from Bob Kuehne <rpk@sgi.com>
+# This should simplify things tremendously.
+#
# Revision 1.35 1998/01/07 03:18:14 curt
# Created the Astro/ subdirctory for stuff high in the sky ...
#
--- /dev/null
+#---------------------------------------------------------------------------
+# Makefile
+#
+# Written by Curtis Olson, started May 1997.
+#
+# Copyright (C) 1997 Curtis L. Olson - curt@infoplane.com
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+#
+# $Id$
+# (Log is kept at end of this file)
+#---------------------------------------------------------------------------
+
+ARLIBRARY = __LIB_NAME_HERE__
+TARGETS = $(ARLIBRARY)
+
+CFILES = __C_SRC_HERE__
+CXXFILES = __CXX_SRC_HERE__
+
+LDIRT = $(FG_ROOT_LIB)/$(ARLIBRARY)
+
+include $(FG_ROOT_SRC)/commondefs
+
+include $(COMMONRULES)
--- /dev/null
+# emacs make tag: -*- Mode: Makefile -*-
+
+default: $(TARGETS)
+
+.SUFFIXES: .d .cxx .c .o
+
+$(ARLIBRARY): $(OBJECTS)
+ $(AR) rv $(ARLIBRARY) $(OBJECTS)
+ $(RANLIB) $(ARLIBRARY)
+ echo $(VPATH)
+ $(MV) $(ARLIBRARY) $(FG_ROOT_LIB)
+
+$(LDLIBTARGET): $(OBJECTS)
+ $(LD) -o $(LDLIBRARY) $(LDFLAGS) $(OBJECTS)
+ $(MV) $(LDLIBRARY) $(LDLIBTARGET)
+
+depend: $(DEPENDS)
+ cat $(DEPENDS) > $(MAKEDEPENDFILE)
+
+.cxx.d:
+ $(CPP) $(CPPFLAGS) $(CPPDEFS) -c $< -MD
+
+.cxx.o:
+ $(CPP) $(CPPFLAGS) $(CPPDEFS) -c $<
+
+.c.d:
+ $(CC) $(CFLAGS) $(CDEFS) -c $< -MD
+
+.c.o:
+ $(CC) $(CFLAGS) $(CDEFS) -c $<
+
+clean:
+ rm -f $(OBJECTS) $(TARGET) $(DIRT)
+
+clobber: clean
+ rm -f *.d *.o *.a *.os2 *~ core $(MAKEDEPENDFILE)
+
+#include $(MAKEDEPENDFILE)
+
+
--- /dev/null
+#!/bin/csh
+
+set GENMAKEBASE=${FG_ROOT_SRC}
+
+set ARLIBDIRS="Aircraft Astro Cockpit Controls Flight Flight/Slew Joystick Scenery Time Weather"
+set MUSTDOMANUALLY="Math Flight/LaRCsim XGL"
+
+set AR_PROTOMAKE=${GENMAKEBASE}/armake.proto
+
+echo $ARLIBDIRS
+
+foreach dir (${ARLIBDIRS})
+ cd $dir
+ set cfiles=`ls *.c | sed -e's%^M% %'`
+ set cxxfiles=`ls *.cxx`
+ sed \
+ -e "s%__LIB_NAME_HERE__%lib`basename ${dir}`.a%g" \
+ -e "s%__CXX_SRC_HERE__%${cxxfiles}%g" \
+ -e "s%__C_SRC_HERE__%${cfiles}%g" \
+ ${AR_PROTOMAKE} > Makefile
+ cd ${GENMAKEBASE}
+end
# (Log is kept at end of this file)
#---------------------------------------------------------------------------
-
-TARGET=libSlew.a
+ARLIBRARY = libSlew.a
+TARGETS = $(ARLIBRARY)
CFILES = slew.c
-OFILES = $(CFILES:.c=.o)
-
-
-include ../../make.inc
-
-
-CFLAGS = $(FG_CFLAGS)
-
-
-#---------------------------------------------------------------------------
-# Primary Targets
-#---------------------------------------------------------------------------
-
-$(TARGET): $(OFILES)
- $(AR) rv $(TARGET) $(OFILES)
- $(RANLIB) $(TARGET)
-
-all: $(TARGET)
-
-clean:
- rm -f *.o $(TARGET) lib*.a *.os2 *~ core
-
-
-#---------------------------------------------------------------------------
-# Secondary Targets
-#---------------------------------------------------------------------------
+CXXFILES =
-include depend
+LDIRT = $(FG_ROOT_LIB)/$(ARLIBRARY)
-slew.o:
- $(CC) $(CFLAGS) $(INCLUDES) -c slew.c -o $@
+include $(FG_ROOT_SRC)/commondefs
-
-#---------------------------------------------------------------------------
-# $Log$
-# Revision 1.8 1997/07/20 02:19:10 curt
-# First stab at a system to generate os2 makefiles automatically.
-#
-# Revision 1.7 1997/07/12 02:24:49 curt
-# Added ranlib.
-#
-# Revision 1.6 1997/06/27 21:38:07 curt
-# Working on Makefile structure.
-#
-# Revision 1.5 1997/06/27 20:03:36 curt
-# Working on Makefile structure.
-#
-# Revision 1.4 1997/06/26 19:08:31 curt
-# Restructuring make, adding automatic "make dep" support.
-#
-# Revision 1.3 1997/06/25 15:39:46 curt
-# Minor changes to compile with rsxnt/win32.
-#
-# Revision 1.2 1997/06/21 17:12:51 curt
-# Capitalized subdirectory names.
-#
-# Revision 1.1 1997/05/29 02:29:42 curt
-# Moved to their own directory.
-#
-# Revision 1.2 1997/05/23 15:40:36 curt
-# Added GNU copyright headers.
-#
-# Revision 1.1 1997/05/16 16:04:44 curt
-# Initial revision.
-#
+include $(COMMONRULES)
#include <math.h>
-#include "slew.h"
-#include "../flight.h"
-#include "../../Aircraft/aircraft.h"
-#include "../../Controls/controls.h"
-#include "../../Include/constants.h"
+#include <Flight/Slew/slew.h>
+#include <Flight/flight.h>
+#include <Aircraft/aircraft.h>
+#include <Controls/controls.h>
+#include <Include/constants.h>
#ifndef M_PI
/* $Log$
-/* Revision 1.8 1998/01/19 18:40:30 curt
-/* Tons of little changes to clean up the code and to remove fatal errors
-/* when building with the c++ compiler.
+/* Revision 1.9 1998/01/19 19:27:06 curt
+/* Merged in make system changes from Bob Kuehne <rpk@sgi.com>
+/* This should simplify things tremendously.
/*
+ * Revision 1.8 1998/01/19 18:40:30 curt
+ * Tons of little changes to clean up the code and to remove fatal errors
+ * when building with the c++ compiler.
+ *
* Revision 1.7 1997/12/15 23:54:42 curt
* Add xgl wrappers for debugging.
* Generate terrain normals on the fly.
# (Log is kept at end of this file)
#---------------------------------------------------------------------------
+ARLIBRARY = libTime.a
+TARGETS = $(ARLIBRARY)
-TARGET = libTime.a
+CFILES = event.c fg_time.c fg_timer.c scheduler.c sidereal.c sunpos.c test_event.c ttest.c
+CXXFILES =
-CFILES = event.c fg_time.c fg_timer.c sunpos.c
-OFILES = $(CFILES:.c=.o)
+LDIRT = $(FG_ROOT_LIB)/$(ARLIBRARY)
+include $(FG_ROOT_SRC)/commondefs
-include ../make.inc
-
-
-CFLAGS = $(FG_CFLAGS)
-
-
-#---------------------------------------------------------------------------
-# Primary Targets
-#---------------------------------------------------------------------------
-
-$(TARGET): $(OFILES)
- $(AR) rv $(TARGET) $(OFILES)
- $(RANLIB) $(TARGET)
-
-all: $(TARGET)
-
-clean:
- rm -f *.o $(TARGET) lib*.a *.os2 *~ core
-
-
-#---------------------------------------------------------------------------
-# Secondary Targets
-#---------------------------------------------------------------------------
-
-include depend
-
-event.o:
- $(CC) $(CFLAGS) -c event.c -o $@
-
-fg_time.o:
- $(CC) $(CFLAGS) -c fg_time.c -o $@
-
-fg_timer.o:
- $(CC) $(CFLAGS) -c fg_timer.c -o $@
-
-sunpos.o:
- $(CC) $(CFLAGS) -c sunpos.c -o $@
-
-
-#---------------------------------------------------------------------------
-# $Log$
-# Revision 1.14 1997/12/30 04:19:22 curt
-# Initial revision.
-#
-# Revision 1.13 1997/09/22 14:44:22 curt
-# Continuing to try to align stars correctly.
-#
-# Revision 1.12 1997/08/06 00:24:31 curt
-# Working on correct real time sun lighting.
-#
-# Revision 1.11 1997/08/01 15:28:44 curt
-# Added sunpos.c
-#
-# Revision 1.10 1997/07/31 22:52:40 curt
-# Working on redoing internal coordinate systems & scenery transformations.
-#
-# Revision 1.9 1997/07/20 02:19:12 curt
-# First stab at a system to generate os2 makefiles automatically.
-#
-# Revision 1.8 1997/07/14 16:26:05 curt
-# Testing/playing -- placed objects randomly across the entire terrain.
-#
-# Revision 1.7 1997/07/12 02:24:48 curt
-# Added ranlib.
-#
-# Revision 1.6 1997/06/27 21:38:13 curt
-# Working on Makefile structure.
-#
-# Revision 1.5 1997/06/27 20:03:40 curt
-# Working on Makefile structure.
-#
-# Revision 1.4 1997/06/26 19:08:37 curt
-# Restructuring make, adding automatic "make dep" support.
-#
-# Revision 1.3 1997/06/25 17:46:58 curt
-# Make itimer support optional.
-#
-# Revision 1.2 1997/06/21 17:12:55 curt
-# Capitalized subdirectory names.
-#
-# Revision 1.1 1997/06/16 19:24:19 curt
-# Initial revision.
-#
+include $(COMMONRULES)
#endif /* USE_FTIME */
-#include "event.h"
+#include <Time/event.h>
#define MAX_EVENTS 100 /* size of event table */
/* $Log$
-/* Revision 1.6 1998/01/19 18:40:39 curt
-/* Tons of little changes to clean up the code and to remove fatal errors
-/* when building with the c++ compiler.
+/* Revision 1.7 1998/01/19 19:27:19 curt
+/* Merged in make system changes from Bob Kuehne <rpk@sgi.com>
+/* This should simplify things tremendously.
/*
+ * Revision 1.6 1998/01/19 18:40:39 curt
+ * Tons of little changes to clean up the code and to remove fatal errors
+ * when building with the c++ compiler.
+ *
* Revision 1.5 1998/01/06 01:20:27 curt
* Tweaks to help building with MSVC++
*
# include <sys/time.h> /* for get/setitimer, gettimeofday, struct timeval */
#endif /* USE_FTIME */
-#include "fg_time.h"
-#include "../Include/constants.h"
-#include "../Flight/flight.h"
-#include "../Time/fg_time.h"
+#include <Time/fg_time.h>
+#include <Include/constants.h>
+#include <Flight/flight.h>
#define DEGHR(x) ((x)/15.)
/* $Log$
-/* Revision 1.28 1998/01/19 18:35:49 curt
-/* Minor tweaks and fixes for cygwin32.
+/* Revision 1.29 1998/01/19 19:27:20 curt
+/* Merged in make system changes from Bob Kuehne <rpk@sgi.com>
+/* This should simplify things tremendously.
/*
+ * Revision 1.28 1998/01/19 18:35:49 curt
+ * Minor tweaks and fixes for cygwin32.
+ *
* Revision 1.27 1998/01/13 00:23:13 curt
* Initial changes to support loading and management of scenery tiles. Note,
* there's still a fair amount of work left to be done.
#include <GL/glut.h>
#include <time.h>
-#include "../Include/types.h"
-#include "../Flight/flight.h"
+#include <Include/types.h>
+#include <Flight/flight.h>
/* Define a structure containing global time parameters */
/* $Log$
-/* Revision 1.12 1998/01/05 18:44:37 curt
-/* Add an option to advance/decrease time from keyboard.
+/* Revision 1.13 1998/01/19 19:27:20 curt
+/* Merged in make system changes from Bob Kuehne <rpk@sgi.com>
+/* This should simplify things tremendously.
/*
+ * Revision 1.12 1998/01/05 18:44:37 curt
+ * Add an option to advance/decrease time from keyboard.
+ *
* Revision 1.11 1997/12/19 23:35:07 curt
* Lot's of tweaking with sky rendering and lighting.
*
# include <sys/time.h> /* for get/setitimer, gettimeofday, struct timeval */
#endif /* USE_FTIME */
-#include "fg_timer.h"
+#include <Time/fg_timer.h>
unsigned long int fgSimTime;
/* $Log$
-/* Revision 1.8 1998/01/19 18:40:39 curt
-/* Tons of little changes to clean up the code and to remove fatal errors
-/* when building with the c++ compiler.
+/* Revision 1.9 1998/01/19 19:27:21 curt
+/* Merged in make system changes from Bob Kuehne <rpk@sgi.com>
+/* This should simplify things tremendously.
/*
+ * Revision 1.8 1998/01/19 18:40:39 curt
+ * Tons of little changes to clean up the code and to remove fatal errors
+ * when building with the c++ compiler.
+ *
* Revision 1.7 1997/12/30 13:06:58 curt
* A couple lighting tweaks ...
*
#include <stdio.h>
#include <time.h>
-#include "sunpos.h"
-#include "fg_time.h"
-#include "../Include/constants.h"
-#include "../Main/views.h"
-#include "../Math/fg_geodesy.h"
-#include "../Math/mat3.h"
-#include "../Math/polar.h"
+#include <Time/sunpos.h>
+#include <Time/fg_time.h>
+#include <Include/constants.h>
+#include <Main/views.h>
+#include <Math/fg_geodesy.h>
+#include <Math/mat3.h>
+#include <Math/polar.h>
#undef E
/* $Log$
-/* Revision 1.22 1998/01/19 18:40:40 curt
-/* Tons of little changes to clean up the code and to remove fatal errors
-/* when building with the c++ compiler.
+/* Revision 1.23 1998/01/19 19:27:21 curt
+/* Merged in make system changes from Bob Kuehne <rpk@sgi.com>
+/* This should simplify things tremendously.
/*
+ * Revision 1.22 1998/01/19 18:40:40 curt
+ * Tons of little changes to clean up the code and to remove fatal errors
+ * when building with the c++ compiler.
+ *
* Revision 1.21 1997/12/30 23:10:19 curt
* Calculate lighting parameters here.
*
#include <time.h>
-#include "../Include/types.h"
+#include <Include/types.h>
/* update the cur_time_params structure with the current sun position */
void fgUpdateSunPos( void );
#---------------------------------------------------------------------------
# Makefile
#
-# Written by Curtis Olson, started July 1997.
+# Written by Curtis Olson, started May 1997.
#
# Copyright (C) 1997 Curtis L. Olson - curt@infoplane.com
#
# (Log is kept at end of this file)
#---------------------------------------------------------------------------
-
-TARGET = libWeather.a
+ARLIBRARY = libWeather.a
+TARGETS = $(ARLIBRARY)
CFILES = weather.c
-HFILES = weather.h
-OFILES = $(CFILES:.c=.o)
-
-
-include ../make.inc
-
-
-CFLAGS = $(FG_CFLAGS)
-
-
-#---------------------------------------------------------------------------
-# Primary Targets
-#---------------------------------------------------------------------------
-
-$(TARGET): $(OFILES)
- $(AR) rv $(TARGET) $(OFILES)
- $(RANLIB) $(TARGET)
+CXXFILES =
-all: $(TARGET)
+LDIRT = $(FG_ROOT_LIB)/$(ARLIBRARY)
-clean:
- rm -f *.o $(TARGET) lib*.a *.os2 *~ core
+include $(FG_ROOT_SRC)/commondefs
-
-#---------------------------------------------------------------------------
-# Secondary Targets
-#---------------------------------------------------------------------------
-
-include depend
-
-weather.o:
- $(CC) $(CFLAGS) -c weather.c -o $@
-
-
-#---------------------------------------------------------------------------
-# $Log$
-# Revision 1.2 1997/07/20 02:19:12 curt
-# First stab at a system to generate os2 makefiles automatically.
-#
-# Revision 1.1 1997/07/19 23:03:57 curt
-# Initial revision.
-#
+include $(COMMONRULES)
**************************************************************************/
-#include "weather.h"
-#include "../Aircraft/aircraft.h"
-#include "../Math/fg_random.h"
+#include <Weather/weather.h>
+#include <Aircraft/aircraft.h>
+#include <Math/fg_random.h>
/* This is a record containing current weather info */
/* $Log$
-/* Revision 1.11 1998/01/19 18:40:41 curt
-/* Tons of little changes to clean up the code and to remove fatal errors
-/* when building with the c++ compiler.
+/* Revision 1.12 1998/01/19 19:27:22 curt
+/* Merged in make system changes from Bob Kuehne <rpk@sgi.com>
+/* This should simplify things tremendously.
/*
+ * Revision 1.11 1998/01/19 18:40:41 curt
+ * Tons of little changes to clean up the code and to remove fatal errors
+ * when building with the c++ compiler.
+ *
* Revision 1.10 1997/12/30 22:22:46 curt
* Further integration of event manager.
*
projects / flightgear.git / commitdiff