fly/flightgear
1
0
Fork 0
Code Activity

renamed mat3 directory to Math so we could add other math related routines.

Browse source
This commit is contained in:
curt 1997-07-05 20:43:27 +00:00
parent 78b2574624
commit 37a2b12501
6 changed files with 29 additions and 18 deletions

9
Main/GLmain.c
View file

@ -40,7 +40,7 @@
#include "../Aircraft/aircraft.h" #include "../Aircraft/aircraft.h"
#include "../Scenery/scenery.h" #include "../Scenery/scenery.h"
#include "../mat3/mat3.h" #include "../Math/mat3.h"
#include "../Timer/fg_timer.h" #include "../Timer/fg_timer.h"
@ -580,9 +580,12 @@ int main( int argc, char *argv[] ) {
/* $Log$ /* $Log$
/* Revision 1.25 1997/06/29 21:19:17 curt /* Revision 1.26 1997/07/05 20:43:34 curt
/* Working on scenery management system. /* renamed mat3 directory to Math so we could add other math related routines.
/* /*
* Revision 1.25 1997/06/29 21:19:17 curt
* Working on scenery management system.
*
* Revision 1.24 1997/06/26 22:14:53 curt * Revision 1.24 1997/06/26 22:14:53 curt
* Beginning work on a scenery management system. * Beginning work on a scenery management system.
* *

5
Main/Makefile
View file

@ -30,7 +30,7 @@ CFILES = GLmain.c $(INTERFACE_FILES) mesh2GL.c
OFILES = $(CFILES:.c=.o) OFILES = $(CFILES:.c=.o)
AFILES = ../Aircraft/libAircraft.a ../Controls/libControls.a \ AFILES = ../Aircraft/libAircraft.a ../Controls/libControls.a \
../Flight/libFlight.a ../Flight/LaRCsim/libLaRCsim.a \ ../Flight/libFlight.a ../Flight/LaRCsim/libLaRCsim.a \
../Flight/Slew/libSlew.a ../mat3/libmat3.a \ ../Flight/Slew/libSlew.a ../Math/libMath.a \
../Scenery/libScenery.a \ ../Scenery/libScenery.a \
../Timer/libTimer.a ../Timer/libTimer.a
@ -76,6 +76,9 @@ mesh2GL.o:
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
# $Log$ # $Log$
# 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 # Revision 1.20 1997/06/29 21:19:17 curt
# Working on scenery management system. # Working on scenery management system.
# #

4
Main/depend
View file

@ -17,5 +17,5 @@ GLmain.o: GLmain.c ../Aircraft/aircraft.h \
../Aircraft/../Flight/LaRCsim/../flight.h \ ../Aircraft/../Flight/LaRCsim/../flight.h \
../Aircraft/../Controls/controls.h \ ../Aircraft/../Controls/controls.h \
../Aircraft/../Controls/../limits.h ../Scenery/scenery.h \ ../Aircraft/../Controls/../limits.h ../Scenery/scenery.h \
../mat3/mat3.h ../Timer/fg_timer.h ../Math/mat3.h ../Timer/fg_timer.h
mesh2GL.o: mesh2GL.c ../Scenery/mesh.h ../mat3/mat3.h mesh2GL.o: mesh2GL.c ../Scenery/mesh.h ../Math/mat3.h

9
Main/mesh2GL.c
View file

@ -27,7 +27,7 @@
#include <GL/glut.h> #include <GL/glut.h>
#include "../Scenery/mesh.h" #include "../Scenery/mesh.h"
#include "../mat3/mat3.h" #include "../Math/mat3.h"
/* walk through mesh and make ogl calls */ /* walk through mesh and make ogl calls */
@ -105,9 +105,12 @@ GLint mesh2GL(struct mesh *m) {
/* $Log$ /* $Log$
/* Revision 1.23 1997/07/03 00:51:14 curt /* Revision 1.24 1997/07/05 20:43:35 curt
/* Playing with terrain color. /* renamed mat3 directory to Math so we could add other math related routines.
/* /*
* Revision 1.23 1997/07/03 00:51:14 curt
* Playing with terrain color.
*
* Revision 1.22 1997/06/29 21:19:17 curt * Revision 1.22 1997/06/29 21:19:17 curt
* Working on scenery management system. * Working on scenery management system.
* *

5
Simulator/Makefile
View file

@ -28,7 +28,7 @@ include make.inc
SUBSUBDIRS = Flight/LaRCsim Flight/Slew SUBSUBDIRS = Flight/LaRCsim Flight/Slew
SUBDIRS = Aircraft Controls Flight mat3 Scenery Timer SUBDIRS = Aircraft Controls Flight Math Scenery Timer
MAIN = OpenGL MAIN = OpenGL
@ -58,6 +58,9 @@ tar: clean
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
# $Log$ # $Log$
# Revision 1.15 1997/07/05 20:43:27 curt
# renamed mat3 directory to Math so we could add other math related routines.
#
# Revision 1.14 1997/06/29 21:19:16 curt # Revision 1.14 1997/06/29 21:19:16 curt
# Working on scenery management system. # Working on scenery management system.
# #

15
Simulator/Makefile.Win32
View file

@ -27,20 +27,18 @@
include make.inc include make.inc
SUBSUBDIRS = Flight/LaRCsim Flight/Slew Scenery/ParseScn Scenery/ParseVRML SUBSUBDIRS = Flight/LaRCsim Flight/Slew
SUBDIRS = Aircraft Controls Flight mat3 Scenery Timer SUBDIRS = Aircraft Controls Flight Math Scenery Timer
MAIN = OpenGL MAIN = OpenGL
all: all:
$(MAKE) -C Flight/LaRCsim $(MAKE) -C Flight/LaRCsim
$(MAKE) -C Flight/Slew $(MAKE) -C Flight/Slew
$(MAKE) -C Scenery/ParseScn
$(MAKE) -C Scenery/ParseVRML
$(MAKE) -C Aircraft $(MAKE) -C Aircraft
$(MAKE) -C Controls $(MAKE) -C Controls
$(MAKE) -C Flight $(MAKE) -C Flight
$(MAKE) -C mat3 $(MAKE) -C Math
$(MAKE) -C Scenery $(MAKE) -C Scenery
$(MAKE) -C Timer $(MAKE) -C Timer
$(MAKE) -C OpenGL $(MAKE) -C OpenGL
@ -55,12 +53,10 @@ clean:
-rm -f *~ -rm -f *~
$(MAKE) -C Flight/LaRCsim clean $(MAKE) -C Flight/LaRCsim clean
$(MAKE) -C Flight/Slew clean $(MAKE) -C Flight/Slew clean
$(MAKE) -C Scenery/ParseScn clean
$(MAKE) -C Scenery/ParseVRML clean
$(MAKE) -C Aircraft clean $(MAKE) -C Aircraft clean
$(MAKE) -C Controls clean $(MAKE) -C Controls clean
$(MAKE) -C Flight clean $(MAKE) -C Flight clean
$(MAKE) -C mat3 clean $(MAKE) -C Math clean
$(MAKE) -C Scenery clean $(MAKE) -C Scenery clean
$(MAKE) -C Timer clean $(MAKE) -C Timer clean
$(MAKE) -C OpenGL clean $(MAKE) -C OpenGL clean
@ -73,6 +69,9 @@ tar: clean
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
# $Log$ # $Log$
# Revision 1.2 1997/07/05 20:43:27 curt
# renamed mat3 directory to Math so we could add other math related routines.
#
# Revision 1.1 1997/07/04 00:17:21 curt # Revision 1.1 1997/07/04 00:17:21 curt
# Initial revision. # Initial revision.
# #