Merged in make system changes from Bob Kuehne <rpk@sgi.com>
This should simplify things tremendously.
This commit is contained in:
curt
141
Astro/Makefile
141
Astro/Makefile
@@ -23,143 +23,14 @@
|
||||
# (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)
|
||||
LDIRT = $(FG_ROOT_LIB)/$(ARLIBRARY)
|
||||
|
||||
include $(FG_ROOT_SRC)/commondefs
|
||||
|
||||
include ../make.inc
|
||||
|
||||
|
||||
CFLAGS = $(FG_CFLAGS)
|
||||
|
||||
|
||||
#---------------------------------------------------------------------------
|
||||
# Primary Targets
|
||||
#---------------------------------------------------------------------------
|
||||
|
||||
$(TARGET): $(OFILES) $(HFILES)
|
||||
$(AR) rv $(TARGET) $(OFILES)
|
||||
$(RANLIB) $(TARGET)
|
||||
|
||||
all: $(TARGET)
|
||||
|
||||
clean:
|
||||
rm -f *.o $(TARGET) lib*.a *.os2 *~ core
|
||||
|
||||
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)
|
||||
|
||||
26
Astro/moon.c
26
Astro/moon.c
@@ -23,16 +23,16 @@
|
||||
|
||||
#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;
|
||||
|
||||
@@ -320,10 +320,14 @@ void fgMoonRender( void ) {
|
||||
|
||||
|
||||
/* $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/
|
||||
*
|
||||
|
||||
14
Astro/moon.h
14
Astro/moon.h
@@ -26,9 +26,9 @@
|
||||
#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
|
||||
@@ -51,10 +51,14 @@ extern struct OrbElements pltOrbElements[9];
|
||||
|
||||
|
||||
/* $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/
|
||||
*
|
||||
|
||||
@@ -25,10 +25,10 @@
|
||||
|
||||
#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];
|
||||
@@ -173,9 +173,13 @@ void fgSolarSystemUpdate(struct OrbElements *planet, struct fgTIME t)
|
||||
|
||||
|
||||
/* $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.
|
||||
*
|
||||
|
||||
@@ -30,7 +30,7 @@
|
||||
#include <stdio.h>
|
||||
#include <math.h>
|
||||
|
||||
#include "../Time/fg_time.h"
|
||||
#include <Time/fg_time.h>
|
||||
|
||||
|
||||
|
||||
@@ -81,9 +81,13 @@ void fgSolarSystemUpdate(struct OrbElements *planets, struct fgTIME t);
|
||||
|
||||
|
||||
/* $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 ...
|
||||
*
|
||||
|
||||
@@ -23,10 +23,10 @@
|
||||
**************************************************************************/
|
||||
|
||||
|
||||
#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,
|
||||
@@ -133,9 +133,13 @@ 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.
|
||||
*
|
||||
|
||||
31
Astro/sky.c
31
Astro/sky.c
@@ -36,20 +36,21 @@
|
||||
*/
|
||||
|
||||
#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 */
|
||||
@@ -329,10 +330,14 @@ void fgSkyRender( void ) {
|
||||
|
||||
|
||||
/* $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/
|
||||
*
|
||||
|
||||
@@ -34,17 +34,17 @@
|
||||
#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)
|
||||
@@ -276,10 +276,14 @@ void fgStarsRender( void ) {
|
||||
|
||||
|
||||
/* $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/
|
||||
*
|
||||
|
||||
20
Astro/sun.c
20
Astro/sun.c
@@ -23,12 +23,12 @@
|
||||
**************************************************************************/
|
||||
|
||||
#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;
|
||||
|
||||
@@ -190,10 +190,14 @@ void fgSunRender( void ) {
|
||||
|
||||
|
||||
/* $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/
|
||||
*
|
||||
|
||||
Reference in New Issue
Block a user