From ccc3af8937ba7e16aa5b8723e8173c3cb541b3a4 Mon Sep 17 00:00:00 2001 From: curt Date: Mon, 19 Jan 1998 19:26:51 +0000 Subject: [PATCH] Merged in make system changes from Bob Kuehne This should simplify things tremendously. --- Astro/Makefile | 141 +++--------------------------------------------- Astro/moon.c | 26 +++++---- Astro/moon.h | 14 +++-- Astro/orbits.c | 14 +++-- Astro/orbits.h | 10 ++-- Astro/planets.c | 16 +++--- Astro/sky.c | 31 ++++++----- Astro/stars.c | 28 +++++----- Astro/sun.c | 20 ++++--- 9 files changed, 102 insertions(+), 198 deletions(-) diff --git a/Astro/Makefile b/Astro/Makefile index 24e85c65..9e9a7a0c 100644 --- a/Astro/Makefile +++ b/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) - - -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) diff --git a/Astro/moon.c b/Astro/moon.c index 227743e9..4160b8d4 100644 --- a/Astro/moon.c +++ b/Astro/moon.c @@ -23,16 +23,16 @@ #include #include -#include "../XGL/xgl.h" +#include -#include "orbits.h" -#include "moon.h" +#include +#include -#include "../Aircraft/aircraft.h" -#include "../Include/constants.h" -#include "../Include/general.h" -#include "../Main/views.h" -#include "../Time/fg_time.h" +#include +#include +#include +#include
+#include