From: curt Date: Fri, 3 Apr 1998 22:09:02 +0000 (+0000) Subject: Converting to Gnu autoconf system. X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=74e16d77f8a9b07a591491f238e12db76eec20df;p=flightgear.git Converting to Gnu autoconf system. --- diff --git a/Main/GLUTkey.c b/Main/GLUTkey.c index 04636b491..820c2c857 100644 --- a/Main/GLUTkey.c +++ b/Main/GLUTkey.c @@ -1,5 +1,5 @@ /************************************************************************** - * tkglkey.c -- handle tkgl keyboard events + * GLUTkey.c -- handle GLUT keyboard events * * Written by Curtis Olson, started May 1997. * @@ -24,7 +24,9 @@ **************************************************************************/ -#ifdef WIN32 +#include + +#ifdef HAVE_WINDOWS_H # include #endif @@ -245,10 +247,13 @@ void GLUTspecialkey(int k, int x, int y) { /* $Log$ -/* Revision 1.29 1998/02/07 15:29:40 curt -/* Incorporated HUD changes and struct/typedef changes from Charlie Hotchkiss -/* +/* Revision 1.30 1998/04/03 22:09:02 curt +/* Converting to Gnu autoconf system. /* + * Revision 1.29 1998/02/07 15:29:40 curt + * Incorporated HUD changes and struct/typedef changes from Charlie Hotchkiss + * + * * Revision 1.28 1998/02/03 23:20:23 curt * Lots of little tweaks to fix various consistency problems discovered by * Solaris' CC. Fixed a bug in fg_debug.c with how the fgPrintf() wrapper diff --git a/Main/GLUTkey.h b/Main/GLUTkey.h index d9ede1b59..1c1c6c901 100644 --- a/Main/GLUTkey.h +++ b/Main/GLUTkey.h @@ -28,7 +28,9 @@ #define _GLUTKEY_H -#ifdef WIN32 +#include + +#ifdef HAVE_WINDOWS_H # include #endif @@ -44,10 +46,13 @@ void GLUTspecialkey(int k, int x, int y); /* $Log$ -/* Revision 1.7 1998/02/12 21:59:44 curt -/* Incorporated code changes contributed by Charlie Hotchkiss -/* +/* Revision 1.8 1998/04/03 22:09:02 curt +/* Converting to Gnu autoconf system. /* + * Revision 1.7 1998/02/12 21:59:44 curt + * Incorporated code changes contributed by Charlie Hotchkiss + * + * * Revision 1.6 1998/01/22 02:59:36 curt * Changed #ifdef FILE_H to #ifdef _FILE_H * diff --git a/Main/GLUTmain.c b/Main/GLUTmain.c index 238467027..f25fe77dd 100644 --- a/Main/GLUTmain.c +++ b/Main/GLUTmain.c @@ -24,7 +24,9 @@ **************************************************************************/ -#ifdef WIN32 +#include + +#ifdef HAVE_WINDOWS_H # include #endif @@ -32,9 +34,10 @@ #include #include -#ifdef __sun +#ifdef HAVE_STDLIB_H # include -#else +#endif +#ifdef HAVE_GETOPT_H # include #endif @@ -245,7 +248,7 @@ static void fgUpdateViewParams( void ) { /* Tell GL we are about to modify the projection parameters */ xglMatrixMode(GL_PROJECTION); xglLoadIdentity(); - gluPerspective(55.0, 2.0/win_ratio, 1.0, 100000.0); + gluPerspective(45.0, 2.0/win_ratio, 1.0, 100000.0); } else { @@ -253,7 +256,7 @@ static void fgUpdateViewParams( void ) { /* Tell GL we are about to modify the projection parameters */ xglMatrixMode(GL_PROJECTION); xglLoadIdentity(); - gluPerspective(55.0, 1.0/win_ratio, 10.0, 100000.0); + gluPerspective(45.0, 1.0/win_ratio, 10.0, 100000.0); } xglMatrixMode(GL_MODELVIEW); @@ -487,9 +490,9 @@ void fgUpdateTimeDepCalcs(int multi_loop) { void fgInitTimeDepCalcs( void ) { /* initialize timer */ -#ifdef USE_ITIMER +#ifdef HAVE_SETITIMER fgTimerInit( 1.0 / DEFAULT_TIMER_HZ, fgUpdateTimeDepCalcs ); -#endif USE_ITIMER +#endif HAVE_SETITIMER } @@ -811,9 +814,12 @@ extern "C" { #endif /* $Log$ -/* Revision 1.67 1998/03/23 21:24:37 curt -/* Source code formating tweaks. +/* Revision 1.68 1998/04/03 22:09:03 curt +/* Converting to Gnu autoconf system. /* + * Revision 1.67 1998/03/23 21:24:37 curt + * Source code formating tweaks. + * * Revision 1.66 1998/03/14 00:31:20 curt * Beginning initial terrain texturing experiments. * diff --git a/Main/Makefile b/Main/Makefile deleted file mode 100644 index f084a374b..000000000 --- a/Main/Makefile +++ /dev/null @@ -1,168 +0,0 @@ -#--------------------------------------------------------------------------- -# 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) -#--------------------------------------------------------------------------- - -TARGET = fg-$(FG_VERSION) - -CFILES = fg_debug.c fg_getopt.c fg_init.c views.c GLUTkey.c GLUTmain.c - -FGLIBS = -lAircraft -lAstro -lCockpit -lControls -lFlight \ - -lJoystick -lLaRCsim -lSlew -lScenery -lTime -lWeather -lMath \ - $(NULL) - - -LCDEFS = -DGLUT -LLDFLAGS = -LDLIBS = $(FGLIBS) $(FG_DEBUG_LIBS) $(INTERFACE_LIBS) $(GRAPHICS_LIBS) -lm - -include $(FG_ROOT_SRC)/commondefs - -#--------------------------------------------------------------------------- -# Rule for TARGET -#--------------------------------------------------------------------------- - -$(TARGET)$(EXT): $(OBJECTS) $(FG_ROOT_LIB)/stamp_libs - $(CC) -o $(TARGET)$(EXT) $(OBJECTS) $(LDFLAGS) $(LDLIBS) - $(RM) -f fg$(FG_VERSION_MAJOR)$(EXT) - $(LN) $(TARGET)$(EXT) fg$(FG_VERSION_MAJOR)$(EXT) - -include $(COMMONRULES) - -#--------------------------------------------------------------------------- -# $Log$ -# Revision 1.49 1998/03/09 22:46:18 curt -# Minor tweaks. -# -# Revision 1.48 1998/02/12 21:59:47 curt -# Incorporated code changes contributed by Charlie Hotchkiss -# -# -# Revision 1.47 1998/02/09 22:56:56 curt -# Removed "depend" files from cvs control. Other minor make tweaks. -# -# Revision 1.46 1998/02/03 23:20:24 curt -# Lots of little tweaks to fix various consistency problems discovered by -# Solaris' CC. Fixed a bug in fg_debug.c with how the fgPrintf() wrapper -# passed arguments along to the real printf(). Also incorporated HUD changes -# by Michele America. -# -# Revision 1.45 1998/01/27 00:47:57 curt -# Incorporated Paul Bleisch's new debug message -# system and commandline/config file processing code. -# -# Revision 1.44 1998/01/22 22:04:00 curt -# Tweaked extention stuff. -# -# Revision 1.43 1998/01/22 02:59:37 curt -# Changed #ifdef FILE_H to #ifdef _FILE_H -# -# Revision 1.42 1998/01/21 21:11:34 curt -# Misc. tweaks. -# -# Revision 1.41 1998/01/19 19:27:08 curt -# Merged in make system changes from Bob Kuehne -# This should simplify things tremendously. -# -# 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. -# diff --git a/Main/Makefile.am b/Main/Makefile.am new file mode 100644 index 000000000..447142795 --- /dev/null +++ b/Main/Makefile.am @@ -0,0 +1,28 @@ + +bindir = ${exec_prefix}/japhar/bin + +bin_PROGRAMS = fg +fg_SOURCES = \ + fg_debug.c \ + fg_getopt.c \ + fg_init.c \ + views.c \ + GLUTkey.c \ + GLUTmain.c + +# Need $(INTERFACE_LIBS) $(GRAPHICS_LIBS) +fg_LDADD = \ + $(top_builddir)/Src/Aircraft/libAircraft.la \ + $(top_builddir)/Src/Astro/libAstro.la \ + $(top_builddir)/Src/Cockpit/libCockpit.la \ + $(top_builddir)/Src/Controls/libControls.la \ + $(top_builddir)/Src/Flight/libFlight.la \ + $(top_builddir)/Src/Flight/LaRCsim/libLaRCsim.la \ + $(top_builddir)/Src/Flight/Slew/libSlew.la \ + $(top_builddir)/Src/Scenery/libScenery.la \ + $(top_builddir)/Src/Time/libTime.la \ + $(top_builddir)/Src/Weather/libWeather.la \ + $(top_builddir)/Src/Joystick/libJoystick.la \ + $(top_builddir)/Src/Math/libMath.la + +INCLUDES += -I.. -DGLUT diff --git a/Main/Makefile.in b/Main/Makefile.in new file mode 100644 index 000000000..82aa3b57b --- /dev/null +++ b/Main/Makefile.in @@ -0,0 +1,352 @@ +# Makefile.in generated automatically by automake 1.2h from Makefile.am + +# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + + +SHELL = /bin/sh + +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +VPATH = @srcdir@ +prefix = @prefix@ +exec_prefix = @exec_prefix@ +sbindir = @sbindir@ +libexecdir = @libexecdir@ +datadir = @datadir@ +sysconfdir = @sysconfdir@ +sharedstatedir = @sharedstatedir@ +localstatedir = @localstatedir@ +libdir = @libdir@ +infodir = @infodir@ +mandir = @mandir@ +includedir = @includedir@ +oldincludedir = /usr/include + +DISTDIR = + +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ + +top_builddir = ../.. + +ACLOCAL = @ACLOCAL@ +AUTOCONF = @AUTOCONF@ +AUTOMAKE = @AUTOMAKE@ +AUTOHEADER = @AUTOHEADER@ + +INSTALL = @INSTALL@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +transform = @program_transform_name@ + +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +host_alias = @host_alias@ +host_triplet = @host@ +CC = @CC@ +CXX = @CXX@ +LD = @LD@ +LIBTOOL = @LIBTOOL@ +LN_S = @LN_S@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +NM = @NM@ +PACKAGE = @PACKAGE@ +RANLIB = @RANLIB@ +VERSION = @VERSION@ + +bindir = ${exec_prefix}/japhar/bin + +bin_PROGRAMS = fg +fg_SOURCES = \ + fg_debug.c \ + fg_getopt.c \ + fg_init.c \ + views.c \ + GLUTkey.c \ + GLUTmain.c + +# Need $(INTERFACE_LIBS) $(GRAPHICS_LIBS) +fg_LDADD = \ + $(top_builddir)/Src/Aircraft/libAircraft.la \ + $(top_builddir)/Src/Astro/libAstro.la \ + $(top_builddir)/Src/Cockpit/libCockpit.la \ + $(top_builddir)/Src/Controls/libControls.la \ + $(top_builddir)/Src/Flight/libFlight.la \ + $(top_builddir)/Src/Flight/LaRCsim/libLaRCsim.la \ + $(top_builddir)/Src/Flight/Slew/libSlew.la \ + $(top_builddir)/Src/Scenery/libScenery.la \ + $(top_builddir)/Src/Time/libTime.la \ + $(top_builddir)/Src/Weather/libWeather.la \ + $(top_builddir)/Src/Joystick/libJoystick.la \ + $(top_builddir)/Src/Math/libMath.la +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = ../../Src/Include/config.h +CONFIG_CLEAN_FILES = +PROGRAMS = $(bin_PROGRAMS) + + +DEFS = @DEFS@ -I. -I$(srcdir) -I../../Src/Include +CPPFLAGS = @CPPFLAGS@ +LDFLAGS = @LDFLAGS@ +LIBS = @LIBS@ +X_CFLAGS = @X_CFLAGS@ +X_LIBS = @X_LIBS@ +X_EXTRA_LIBS = @X_EXTRA_LIBS@ +X_PRE_LIBS = @X_PRE_LIBS@ +fg_OBJECTS = fg_debug.o fg_getopt.o fg_init.o views.o GLUTkey.o \ +GLUTmain.o +fg_DEPENDENCIES = $(top_builddir)/Src/Aircraft/libAircraft.la \ +$(top_builddir)/Src/Astro/libAstro.la \ +$(top_builddir)/Src/Cockpit/libCockpit.la \ +$(top_builddir)/Src/Controls/libControls.la \ +$(top_builddir)/Src/Flight/libFlight.la \ +$(top_builddir)/Src/Flight/LaRCsim/libLaRCsim.la \ +$(top_builddir)/Src/Flight/Slew/libSlew.la \ +$(top_builddir)/Src/Scenery/libScenery.la \ +$(top_builddir)/Src/Time/libTime.la \ +$(top_builddir)/Src/Weather/libWeather.la \ +$(top_builddir)/Src/Joystick/libJoystick.la \ +$(top_builddir)/Src/Math/libMath.la +fg_LDFLAGS = +CFLAGS = @CFLAGS@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) +LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +DIST_COMMON = README Makefile.am Makefile.in + + +DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + +TAR = tar +GZIP = --best +DEP_FILES = .deps/GLUTkey.P .deps/GLUTmain.P .deps/fg_debug.P \ +.deps/fg_getopt.P .deps/fg_init.P .deps/views.P +SOURCES = $(fg_SOURCES) +OBJECTS = $(fg_OBJECTS) + +all: Makefile $(PROGRAMS) + +.SUFFIXES: +.SUFFIXES: .S .c .lo .o .s +$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && $(AUTOMAKE) --gnu Src/Main/Makefile + +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) + cd $(top_builddir) \ + && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status + + +mostlyclean-binPROGRAMS: + +clean-binPROGRAMS: + -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) + +distclean-binPROGRAMS: + +maintainer-clean-binPROGRAMS: + +install-binPROGRAMS: $(bin_PROGRAMS) + @$(NORMAL_INSTALL) + $(mkinstalldirs) $(DESTDIR)$(bindir) + @list='$(bin_PROGRAMS)'; for p in $$list; do \ + if test -f $$p; then \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \ + else :; fi; \ + done + +uninstall-binPROGRAMS: + @$(NORMAL_UNINSTALL) + list='$(bin_PROGRAMS)'; for p in $$list; do \ + rm -f $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \ + done + +.s.o: + $(COMPILE) -c $< + +.S.o: + $(COMPILE) -c $< + +mostlyclean-compile: + -rm -f *.o core *.core + +clean-compile: + +distclean-compile: + -rm -f *.tab.c + +maintainer-clean-compile: + +.s.lo: + $(LIBTOOL) --mode=compile $(COMPILE) -c $< + +.S.lo: + $(LIBTOOL) --mode=compile $(COMPILE) -c $< + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +distclean-libtool: + +maintainer-clean-libtool: + +fg: $(fg_OBJECTS) $(fg_DEPENDENCIES) + @rm -f fg + $(LINK) $(fg_LDFLAGS) $(fg_OBJECTS) $(fg_LDADD) $(LIBS) + +tags: TAGS + +ID: $(HEADERS) $(SOURCES) $(LISP) + here=`pwd` && cd $(srcdir) \ + && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ + || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) + +mostlyclean-tags: + +clean-tags: + +distclean-tags: + -rm -f TAGS ID + +maintainer-clean-tags: + +distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) + +subdir = Src/Main + +distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Src/Main/Makefile + @for file in $(DISTFILES); do \ + d=$(srcdir); \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file; \ + done + +DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) + +-include $(DEP_FILES) + +mostlyclean-depend: + +clean-depend: + +distclean-depend: + +maintainer-clean-depend: + -rm -rf .deps + +%.o: %.c + @echo '$(COMPILE) -c $<'; \ + $(COMPILE) -Wp,-MD,.deps/$(*F).P -c $< + +%.lo: %.c + @echo '$(LTCOMPILE) -c $<'; \ + $(LTCOMPILE) -Wp,-MD,.deps/$(*F).p -c $< + @-sed -e 's/^\([^:]*\)\.o:/\1.lo \1.o:/' \ + < .deps/$(*F).p > .deps/$(*F).P + @-rm -f .deps/$(*F).p +info: +dvi: +check: all + $(MAKE) +installcheck: +install-exec: install-binPROGRAMS + @$(NORMAL_INSTALL) + +install-data: + @$(NORMAL_INSTALL) + +install: install-exec install-data all + @: + +uninstall: uninstall-binPROGRAMS + +install-strip: + $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install +installdirs: + $(mkinstalldirs) $(DATADIR)$(bindir) + + +mostlyclean-generic: + -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) + +clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + +distclean-generic: + -rm -f Makefile $(DISTCLEANFILES) + -rm -f config.cache config.log stamp-h stamp-h[0-9]* + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) + -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) +mostlyclean: mostlyclean-binPROGRAMS mostlyclean-compile \ + mostlyclean-libtool mostlyclean-tags mostlyclean-depend \ + mostlyclean-generic + +clean: clean-binPROGRAMS clean-compile clean-libtool clean-tags \ + clean-depend clean-generic mostlyclean + +distclean: distclean-binPROGRAMS distclean-compile distclean-libtool \ + distclean-tags distclean-depend distclean-generic clean + -rm -f config.status + -rm -f libtool + +maintainer-clean: maintainer-clean-binPROGRAMS maintainer-clean-compile \ + maintainer-clean-libtool maintainer-clean-tags \ + maintainer-clean-depend maintainer-clean-generic \ + distclean + @echo "This command is intended for maintainers to use;" + @echo "it deletes files that may require special tools to rebuild." + +.PHONY: mostlyclean-binPROGRAMS distclean-binPROGRAMS clean-binPROGRAMS \ +maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \ +mostlyclean-compile distclean-compile clean-compile \ +maintainer-clean-compile mostlyclean-libtool distclean-libtool \ +clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ +distclean-tags clean-tags maintainer-clean-tags distdir \ +mostlyclean-depend distclean-depend clean-depend \ +maintainer-clean-depend info dvi installcheck install-exec install-data \ +install uninstall all installdirs mostlyclean-generic distclean-generic \ +clean-generic maintainer-clean-generic clean mostlyclean distclean \ +maintainer-clean + + +INCLUDES += -I.. -DGLUT + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/Main/fg_init.c b/Main/fg_init.c index 8c253efad..79e9505f3 100644 --- a/Main/fg_init.c +++ b/Main/fg_init.c @@ -135,7 +135,7 @@ int fgInitSubsystems( void ) { // Initial Position at (E81) Superior, AZ // FG_Longitude = ( -111.1270650 ) * DEG_TO_RAD; // FG_Latitude = ( 33.2778339 ) * DEG_TO_RAD; - // FG_Runway_altitude = (2646 + 1000); + // FG_Runway_altitude = (2646 + 100); // FG_Altitude = FG_Runway_altitude + 3.758099; // Initial Position at (TUS) Tucson, AZ @@ -144,23 +144,23 @@ int fgInitSubsystems( void ) { // FG_Runway_altitude = (2641 + 0); // FG_Altitude = FG_Runway_altitude + 3.758099; + // Initial Position at (SEZ) SEDONA airport + // FG_Longitude = (-111.7884614 + 0.01) * DEG_TO_RAD; + // FG_Latitude = ( 34.8486289 - 0.015) * DEG_TO_RAD; + // FG_Runway_altitude = (4827 + 450); + // FG_Altitude = FG_Runway_altitude + 3.758099; + // Initial Position at near Anchoraze, AK // FG_Longitude = ( -152.00 ) * DEG_TO_RAD; // FG_Latitude = ( 61.17 ) * DEG_TO_RAD; // FG_Runway_altitude = (0); // FG_Altitude = FG_Runway_altitude + 3.758099; - // Initial Position at (SEZ) SEDONA airport - // FG_Longitude = (-111.7884614 + 0.02) * DEG_TO_RAD; - // FG_Latitude = ( 34.8486289 - 0.04) * DEG_TO_RAD; - // FG_Runway_altitude = (4827 + 800); - // FG_Altitude = FG_Runway_altitude + 3.758099; - // Initial Position at (HSP) Hot Springs, VA - // FG_Longitude = (-79.8338964 + 0.02) * DEG_TO_RAD; - // FG_Latitude = ( 37.9514564 + 0.05) * DEG_TO_RAD; - // FG_Runway_altitude = (792 + 1500); - // FG_Altitude = FG_Runway_altitude + 3.758099; + FG_Longitude = (-79.8338964 + 0.01) * DEG_TO_RAD; + FG_Latitude = ( 37.9514564 + 0.008) * DEG_TO_RAD; + FG_Runway_altitude = (3792 + 1300); + FG_Altitude = FG_Runway_altitude + 3.758099; // Initial Position at (ANE) Anoka County airport // FG_Longitude = -93.2113889 * DEG_TO_RAD; @@ -178,7 +178,7 @@ int fgInitSubsystems( void ) { // Initial Position near where I used to live in Globe, AZ // FG_Longitude = ( -398757.6 / 3600.0 ) * DEG_TO_RAD; // FG_Latitude = ( 120160.0 / 3600.0 ) * DEG_TO_RAD; - // FG_Runway_altitude = 5000.0; + // FG_Runway_altitude = 4000.0; // FG_Altitude = FG_Runway_altitude + 3.758099; // Initial Position: 10125 Jewell St. NE @@ -200,9 +200,9 @@ int fgInitSubsystems( void ) { // FG_Altitude = FG_Runway_altitude + 3.758099; // Initial Position: Jim Brennon's Kingmont Observatory - // FG_Longitude = ( -121.1131666 ) * DEG_TO_RAD; - // FG_Latitude = ( 38.8293916 ) * DEG_TO_RAD; - // FG_Runway_altitude = 920.0 + 100; + // FG_Longitude = ( -121.1131667 ) * DEG_TO_RAD; + // FG_Latitude = ( 38.8293917 ) * DEG_TO_RAD; + // FG_Runway_altitude = 920.0; // FG_Altitude = FG_Runway_altitude + 3.758099; // probably interesting for european team members @@ -227,9 +227,9 @@ int fgInitSubsystems( void ) { // FG_Altitude = FG_Runway_altitude + 3.758099; // Test Position - // FG_Longitude = ( -110.4 ) * DEG_TO_RAD; - // FG_Latitude = ( 32.9375 ) * DEG_TO_RAD; - // FG_Runway_altitude = 6000.0; + // FG_Longitude = ( -139.5 ) * DEG_TO_RAD; + // FG_Latitude = ( -9.5 ) * DEG_TO_RAD; + // FG_Runway_altitude = 13000.0 * METER_TO_FEET; // FG_Altitude = FG_Runway_altitude + 3.758099; // A random test position @@ -249,7 +249,7 @@ int fgInitSubsystems( void ) { /* Initial Orientation */ FG_Phi = -2.658474E-06; FG_Theta = 7.401790E-03; - FG_Psi = 270.0 * DEG_TO_RAD; + FG_Psi = 260.0 * DEG_TO_RAD; /* Initial Angular B rates */ FG_P_body = 7.206685E-05; @@ -400,9 +400,12 @@ int fgInitSubsystems( void ) { /* $Log$ -/* Revision 1.52 1998/03/23 21:24:38 curt -/* Source code formating tweaks. +/* Revision 1.53 1998/04/03 22:09:06 curt +/* Converting to Gnu autoconf system. /* + * Revision 1.52 1998/03/23 21:24:38 curt + * Source code formating tweaks. + * * Revision 1.51 1998/03/14 00:31:22 curt * Beginning initial terrain texturing experiments. * diff --git a/Scenery/Makefile b/Scenery/Makefile deleted file mode 100644 index 1e2eb9174..000000000 --- a/Scenery/Makefile +++ /dev/null @@ -1,37 +0,0 @@ -#--------------------------------------------------------------------------- -# 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 = libScenery.a -TARGETS = $(ARLIBRARY) - -CFILES = bucketutils.c obj.c scenery.c texload.c tilecache.c tilemgr.c -CXXFILES = - -LDIRT = $(FG_ROOT_LIB)/$(ARLIBRARY) - -include $(FG_ROOT_SRC)/commondefs - -include $(COMMONRULES) diff --git a/Scenery/Makefile.am b/Scenery/Makefile.am new file mode 100644 index 000000000..8ab026acc --- /dev/null +++ b/Scenery/Makefile.am @@ -0,0 +1,12 @@ +libdir = ${exec_prefix}/lib + +lib_LTLIBRARIES = libScenery.la +libScenery_la_SOURCES = \ + bucketutils.c \ + obj.c \ + scenery.c \ + texload.c \ + tilecache.c \ + tilemgr.c + +INCLUDES += -I.. diff --git a/Scenery/Makefile.in b/Scenery/Makefile.in new file mode 100644 index 000000000..cae0ff258 --- /dev/null +++ b/Scenery/Makefile.in @@ -0,0 +1,326 @@ +# Makefile.in generated automatically by automake 1.2h from Makefile.am + +# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + + +SHELL = /bin/sh + +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +VPATH = @srcdir@ +prefix = @prefix@ +exec_prefix = @exec_prefix@ + +bindir = @bindir@ +sbindir = @sbindir@ +libexecdir = @libexecdir@ +datadir = @datadir@ +sysconfdir = @sysconfdir@ +sharedstatedir = @sharedstatedir@ +localstatedir = @localstatedir@ +infodir = @infodir@ +mandir = @mandir@ +includedir = @includedir@ +oldincludedir = /usr/include + +DISTDIR = + +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ + +top_builddir = ../.. + +ACLOCAL = @ACLOCAL@ +AUTOCONF = @AUTOCONF@ +AUTOMAKE = @AUTOMAKE@ +AUTOHEADER = @AUTOHEADER@ + +INSTALL = @INSTALL@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +transform = @program_transform_name@ + +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +host_alias = @host_alias@ +host_triplet = @host@ +CC = @CC@ +CXX = @CXX@ +LD = @LD@ +LIBTOOL = @LIBTOOL@ +LN_S = @LN_S@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +NM = @NM@ +PACKAGE = @PACKAGE@ +RANLIB = @RANLIB@ +VERSION = @VERSION@ + +libdir = ${exec_prefix}/lib + +lib_LTLIBRARIES = libScenery.la +libScenery_la_SOURCES = \ + bucketutils.c \ + obj.c \ + scenery.c \ + texload.c \ + tilecache.c \ + tilemgr.c +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = ../../Src/Include/config.h +CONFIG_CLEAN_FILES = +LTLIBRARIES = $(lib_LTLIBRARIES) + + +DEFS = @DEFS@ -I. -I$(srcdir) -I../../Src/Include +CPPFLAGS = @CPPFLAGS@ +LDFLAGS = @LDFLAGS@ +LIBS = @LIBS@ +X_CFLAGS = @X_CFLAGS@ +X_LIBS = @X_LIBS@ +X_EXTRA_LIBS = @X_EXTRA_LIBS@ +X_PRE_LIBS = @X_PRE_LIBS@ +libScenery_la_LDFLAGS = +libScenery_la_LIBADD = +libScenery_la_OBJECTS = bucketutils.lo obj.lo scenery.lo texload.lo \ +tilecache.lo tilemgr.lo +CFLAGS = @CFLAGS@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) +LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +DIST_COMMON = Makefile.am Makefile.in + + +DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + +TAR = tar +GZIP = --best +DEP_FILES = .deps/bucketutils.P .deps/obj.P .deps/scenery.P \ +.deps/texload.P .deps/tilecache.P .deps/tilemgr.P +SOURCES = $(libScenery_la_SOURCES) +OBJECTS = $(libScenery_la_OBJECTS) + +all: Makefile $(LTLIBRARIES) + +.SUFFIXES: +.SUFFIXES: .S .c .lo .o .s +$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && $(AUTOMAKE) --gnu Src/Scenery/Makefile + +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) + cd $(top_builddir) \ + && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status + + +mostlyclean-libLTLIBRARIES: + +clean-libLTLIBRARIES: + -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) + +distclean-libLTLIBRARIES: + +maintainer-clean-libLTLIBRARIES: + +install-libLTLIBRARIES: $(lib_LTLIBRARIES) + @$(NORMAL_INSTALL) + $(mkinstalldirs) $(DESTDIR)$(libdir) + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ + echo "$(LIBTOOL) --mode=install $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p"; \ + $(LIBTOOL) --mode=install $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p; \ + else :; fi; \ + done + +uninstall-libLTLIBRARIES: + @$(NORMAL_UNINSTALL) + list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \ + done + +.s.o: + $(COMPILE) -c $< + +.S.o: + $(COMPILE) -c $< + +mostlyclean-compile: + -rm -f *.o core *.core + +clean-compile: + +distclean-compile: + -rm -f *.tab.c + +maintainer-clean-compile: + +.s.lo: + $(LIBTOOL) --mode=compile $(COMPILE) -c $< + +.S.lo: + $(LIBTOOL) --mode=compile $(COMPILE) -c $< + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +distclean-libtool: + +maintainer-clean-libtool: + +libScenery.la: $(libScenery_la_OBJECTS) $(libScenery_la_DEPENDENCIES) + $(LINK) -rpath $(libdir) $(libScenery_la_LDFLAGS) $(libScenery_la_OBJECTS) $(libScenery_la_LIBADD) $(LIBS) + +tags: TAGS + +ID: $(HEADERS) $(SOURCES) $(LISP) + here=`pwd` && cd $(srcdir) \ + && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ + || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) + +mostlyclean-tags: + +clean-tags: + +distclean-tags: + -rm -f TAGS ID + +maintainer-clean-tags: + +distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) + +subdir = Src/Scenery + +distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Src/Scenery/Makefile + @for file in $(DISTFILES); do \ + d=$(srcdir); \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file; \ + done + +DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) + +-include $(DEP_FILES) + +mostlyclean-depend: + +clean-depend: + +distclean-depend: + +maintainer-clean-depend: + -rm -rf .deps + +%.o: %.c + @echo '$(COMPILE) -c $<'; \ + $(COMPILE) -Wp,-MD,.deps/$(*F).P -c $< + +%.lo: %.c + @echo '$(LTCOMPILE) -c $<'; \ + $(LTCOMPILE) -Wp,-MD,.deps/$(*F).p -c $< + @-sed -e 's/^\([^:]*\)\.o:/\1.lo \1.o:/' \ + < .deps/$(*F).p > .deps/$(*F).P + @-rm -f .deps/$(*F).p +info: +dvi: +check: all + $(MAKE) +installcheck: +install-exec: install-libLTLIBRARIES + @$(NORMAL_INSTALL) + +install-data: + @$(NORMAL_INSTALL) + +install: install-exec install-data all + @: + +uninstall: uninstall-libLTLIBRARIES + +install-strip: + $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install +installdirs: + $(mkinstalldirs) $(DATADIR)$(libdir) + + +mostlyclean-generic: + -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) + +clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + +distclean-generic: + -rm -f Makefile $(DISTCLEANFILES) + -rm -f config.cache config.log stamp-h stamp-h[0-9]* + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) + -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) +mostlyclean: mostlyclean-libLTLIBRARIES mostlyclean-compile \ + mostlyclean-libtool mostlyclean-tags mostlyclean-depend \ + mostlyclean-generic + +clean: clean-libLTLIBRARIES clean-compile clean-libtool clean-tags \ + clean-depend clean-generic mostlyclean + +distclean: distclean-libLTLIBRARIES distclean-compile distclean-libtool \ + distclean-tags distclean-depend distclean-generic clean + -rm -f config.status + -rm -f libtool + +maintainer-clean: maintainer-clean-libLTLIBRARIES \ + maintainer-clean-compile maintainer-clean-libtool \ + maintainer-clean-tags maintainer-clean-depend \ + maintainer-clean-generic distclean + @echo "This command is intended for maintainers to use;" + @echo "it deletes files that may require special tools to rebuild." + +.PHONY: mostlyclean-libLTLIBRARIES distclean-libLTLIBRARIES \ +clean-libLTLIBRARIES maintainer-clean-libLTLIBRARIES \ +uninstall-libLTLIBRARIES install-libLTLIBRARIES mostlyclean-compile \ +distclean-compile clean-compile maintainer-clean-compile \ +mostlyclean-libtool distclean-libtool clean-libtool \ +maintainer-clean-libtool tags mostlyclean-tags distclean-tags \ +clean-tags maintainer-clean-tags distdir mostlyclean-depend \ +distclean-depend clean-depend maintainer-clean-depend info dvi \ +installcheck install-exec install-data install uninstall all \ +installdirs mostlyclean-generic distclean-generic clean-generic \ +maintainer-clean-generic clean mostlyclean distclean maintainer-clean + + +INCLUDES += -I.. + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/Scenery/obj.c b/Scenery/obj.c index 5d3e1b2b2..557c845a9 100644 --- a/Scenery/obj.c +++ b/Scenery/obj.c @@ -25,7 +25,9 @@ **************************************************************************/ -#ifdef WIN32 +#include + +#ifdef HAVE_WINDOWS_H # include #endif @@ -66,7 +68,7 @@ void calc_normal(double p1[3], double p2[3], double p3[3], double normal[3]) } -#define FG_TEX_CONSTANT 64.0 +#define FG_TEX_CONSTANT 128.0 float calc_lon(double x, double y, double z) { float tmp; @@ -390,9 +392,12 @@ GLint fgObjLoad(char *path, struct fgCartesianPoint *ref, double *radius) { /* $Log$ -/* Revision 1.25 1998/03/14 00:30:50 curt -/* Beginning initial terrain texturing experiments. +/* Revision 1.26 1998/04/03 22:11:36 curt +/* Converting to Gnu autoconf system. /* + * Revision 1.25 1998/03/14 00:30:50 curt + * Beginning initial terrain texturing experiments. + * * Revision 1.24 1998/02/09 21:30:18 curt * Fixed a nagging problem with terrain tiles not "quite" matching up perfectly. * diff --git a/Scenery/obj.h b/Scenery/obj.h index 81e0deb4b..030033c62 100644 --- a/Scenery/obj.h +++ b/Scenery/obj.h @@ -28,7 +28,9 @@ #define _OBJ_H -#ifdef WIN32 +#include + +#ifdef HAVE_WINDOWS_H # include #endif @@ -45,9 +47,12 @@ GLint fgObjLoad(char *path, struct fgCartesianPoint *ref, double *radius); /* $Log$ -/* Revision 1.6 1998/01/31 00:43:25 curt -/* Added MetroWorks patches from Carmen Volpe. +/* Revision 1.7 1998/04/03 22:11:37 curt +/* Converting to Gnu autoconf system. /* + * Revision 1.6 1998/01/31 00:43:25 curt + * Added MetroWorks patches from Carmen Volpe. + * * Revision 1.5 1998/01/27 00:48:03 curt * Incorporated Paul Bleisch's new debug message * system and commandline/config file processing code. diff --git a/Scenery/scenery.c b/Scenery/scenery.c index dabedf42d..e74ad2854 100644 --- a/Scenery/scenery.c +++ b/Scenery/scenery.c @@ -25,7 +25,9 @@ **************************************************************************/ -#ifdef WIN32 +#include + +#ifdef HAVE_WINDOWS_H # include #endif @@ -68,7 +70,7 @@ int fgSceneryInit( void ) { path[0] = '\0'; strcat(path, g->root_dir); strcat(path, "/Textures/"); - strcat(path, "desert.rgb"); + strcat(path, "forest.rgb"); if ( (texbuf = read_rgb_texture(path, &width, &height)) == NULL ) { fgPrintf( FG_GENERAL, FG_EXIT, "Error in loading textures!\n" ); @@ -112,9 +114,12 @@ void fgSceneryRender( void ) { /* $Log$ -/* Revision 1.37 1998/03/23 21:23:05 curt -/* Debugging output tweaks. +/* Revision 1.38 1998/04/03 22:11:37 curt +/* Converting to Gnu autoconf system. /* + * Revision 1.37 1998/03/23 21:23:05 curt + * Debugging output tweaks. + * * Revision 1.36 1998/03/14 00:30:50 curt * Beginning initial terrain texturing experiments. * diff --git a/Scenery/tilecache.c b/Scenery/tilecache.c index fa6e8ea15..bf72c18d7 100644 --- a/Scenery/tilecache.c +++ b/Scenery/tilecache.c @@ -24,7 +24,9 @@ **************************************************************************/ -#ifdef WIN32 +#include + +#ifdef HAVE_WINDOWS_H # include #endif @@ -79,7 +81,7 @@ int fgTileCacheExists( struct fgBUCKET *p ) { /* Fill in a tile cache entry with real data for the specified bucket */ void fgTileCacheEntryFillIn( int index, struct fgBUCKET *p ) { - struct fgGENERAL *g; + fgGENERAL *g; char base_path[256]; char file_name[256]; @@ -194,9 +196,12 @@ int fgTileCacheNextAvail( void ) { /* $Log$ -/* Revision 1.7 1998/02/01 03:39:55 curt -/* Minor tweaks. +/* Revision 1.8 1998/04/03 22:11:38 curt +/* Converting to Gnu autoconf system. /* + * Revision 1.7 1998/02/01 03:39:55 curt + * Minor tweaks. + * * Revision 1.6 1998/01/31 00:43:26 curt * Added MetroWorks patches from Carmen Volpe. * diff --git a/Scenery/tilecache.h b/Scenery/tilecache.h index 851af45eb..7fca74a15 100644 --- a/Scenery/tilecache.h +++ b/Scenery/tilecache.h @@ -28,7 +28,9 @@ #define _TILECACHE_H -#ifdef WIN32 +#include + +#ifdef HAVE_WINDOWS_H # include #endif @@ -79,10 +81,13 @@ void fgTileCacheEntryInfo( int index, GLint *display_list, /* $Log$ -/* Revision 1.6 1998/02/18 15:07:10 curt -/* Tweaks to build with SGI OpenGL (and therefor hopefully other accelerated -/* drivers will work.) +/* Revision 1.7 1998/04/03 22:11:38 curt +/* Converting to Gnu autoconf system. /* + * Revision 1.6 1998/02/18 15:07:10 curt + * Tweaks to build with SGI OpenGL (and therefor hopefully other accelerated + * drivers will work.) + * * Revision 1.5 1998/02/16 13:39:45 curt * Miscellaneous weekend tweaks. Fixed? a cache problem that caused whole * tiles to occasionally be missing. diff --git a/Scenery/tilemgr.c b/Scenery/tilemgr.c index c085af8c9..71928b072 100644 --- a/Scenery/tilemgr.c +++ b/Scenery/tilemgr.c @@ -25,7 +25,9 @@ **************************************************************************/ -#ifdef WIN32 +#include + +#ifdef HAVE_WINDOWS_H # include #endif @@ -217,9 +219,12 @@ void fgTileMgrRender( void ) { /* $Log$ -/* Revision 1.21 1998/03/23 21:23:05 curt -/* Debugging output tweaks. +/* Revision 1.22 1998/04/03 22:11:38 curt +/* Converting to Gnu autoconf system. /* + * Revision 1.21 1998/03/23 21:23:05 curt + * Debugging output tweaks. + * * Revision 1.20 1998/03/14 00:30:51 curt * Beginning initial terrain texturing experiments. * diff --git a/Weather/Makefile b/Weather/Makefile deleted file mode 100644 index 9c4b10e89..000000000 --- a/Weather/Makefile +++ /dev/null @@ -1,36 +0,0 @@ -#--------------------------------------------------------------------------- -# 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 = libWeather.a -TARGETS = $(ARLIBRARY) - -CFILES = weather.c -CXXFILES = - -LDIRT = $(FG_ROOT_LIB)/$(ARLIBRARY) - -include $(FG_ROOT_SRC)/commondefs - -include $(COMMONRULES) diff --git a/Weather/Makefile.am b/Weather/Makefile.am new file mode 100644 index 000000000..4a269239a --- /dev/null +++ b/Weather/Makefile.am @@ -0,0 +1,7 @@ +libdir = ${exec_prefix}/lib + +lib_LTLIBRARIES = libWeather.la +libWeather_la_SOURCES = \ + weather.c + +INCLUDES += -I.. diff --git a/Weather/Makefile.in b/Weather/Makefile.in new file mode 100644 index 000000000..2666c8220 --- /dev/null +++ b/Weather/Makefile.in @@ -0,0 +1,319 @@ +# Makefile.in generated automatically by automake 1.2h from Makefile.am + +# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + + +SHELL = /bin/sh + +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +VPATH = @srcdir@ +prefix = @prefix@ +exec_prefix = @exec_prefix@ + +bindir = @bindir@ +sbindir = @sbindir@ +libexecdir = @libexecdir@ +datadir = @datadir@ +sysconfdir = @sysconfdir@ +sharedstatedir = @sharedstatedir@ +localstatedir = @localstatedir@ +infodir = @infodir@ +mandir = @mandir@ +includedir = @includedir@ +oldincludedir = /usr/include + +DISTDIR = + +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ + +top_builddir = ../.. + +ACLOCAL = @ACLOCAL@ +AUTOCONF = @AUTOCONF@ +AUTOMAKE = @AUTOMAKE@ +AUTOHEADER = @AUTOHEADER@ + +INSTALL = @INSTALL@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +transform = @program_transform_name@ + +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +host_alias = @host_alias@ +host_triplet = @host@ +CC = @CC@ +CXX = @CXX@ +LD = @LD@ +LIBTOOL = @LIBTOOL@ +LN_S = @LN_S@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +NM = @NM@ +PACKAGE = @PACKAGE@ +RANLIB = @RANLIB@ +VERSION = @VERSION@ + +libdir = ${exec_prefix}/lib + +lib_LTLIBRARIES = libWeather.la +libWeather_la_SOURCES = \ + weather.c +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = ../../Src/Include/config.h +CONFIG_CLEAN_FILES = +LTLIBRARIES = $(lib_LTLIBRARIES) + + +DEFS = @DEFS@ -I. -I$(srcdir) -I../../Src/Include +CPPFLAGS = @CPPFLAGS@ +LDFLAGS = @LDFLAGS@ +LIBS = @LIBS@ +X_CFLAGS = @X_CFLAGS@ +X_LIBS = @X_LIBS@ +X_EXTRA_LIBS = @X_EXTRA_LIBS@ +X_PRE_LIBS = @X_PRE_LIBS@ +libWeather_la_LDFLAGS = +libWeather_la_LIBADD = +libWeather_la_OBJECTS = weather.lo +CFLAGS = @CFLAGS@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) +LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +DIST_COMMON = Makefile.am Makefile.in + + +DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + +TAR = tar +GZIP = --best +DEP_FILES = .deps/weather.P +SOURCES = $(libWeather_la_SOURCES) +OBJECTS = $(libWeather_la_OBJECTS) + +all: Makefile $(LTLIBRARIES) + +.SUFFIXES: +.SUFFIXES: .S .c .lo .o .s +$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && $(AUTOMAKE) --gnu Src/Weather/Makefile + +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) + cd $(top_builddir) \ + && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status + + +mostlyclean-libLTLIBRARIES: + +clean-libLTLIBRARIES: + -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) + +distclean-libLTLIBRARIES: + +maintainer-clean-libLTLIBRARIES: + +install-libLTLIBRARIES: $(lib_LTLIBRARIES) + @$(NORMAL_INSTALL) + $(mkinstalldirs) $(DESTDIR)$(libdir) + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ + echo "$(LIBTOOL) --mode=install $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p"; \ + $(LIBTOOL) --mode=install $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p; \ + else :; fi; \ + done + +uninstall-libLTLIBRARIES: + @$(NORMAL_UNINSTALL) + list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \ + done + +.s.o: + $(COMPILE) -c $< + +.S.o: + $(COMPILE) -c $< + +mostlyclean-compile: + -rm -f *.o core *.core + +clean-compile: + +distclean-compile: + -rm -f *.tab.c + +maintainer-clean-compile: + +.s.lo: + $(LIBTOOL) --mode=compile $(COMPILE) -c $< + +.S.lo: + $(LIBTOOL) --mode=compile $(COMPILE) -c $< + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +distclean-libtool: + +maintainer-clean-libtool: + +libWeather.la: $(libWeather_la_OBJECTS) $(libWeather_la_DEPENDENCIES) + $(LINK) -rpath $(libdir) $(libWeather_la_LDFLAGS) $(libWeather_la_OBJECTS) $(libWeather_la_LIBADD) $(LIBS) + +tags: TAGS + +ID: $(HEADERS) $(SOURCES) $(LISP) + here=`pwd` && cd $(srcdir) \ + && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ + || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) + +mostlyclean-tags: + +clean-tags: + +distclean-tags: + -rm -f TAGS ID + +maintainer-clean-tags: + +distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) + +subdir = Src/Weather + +distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Src/Weather/Makefile + @for file in $(DISTFILES); do \ + d=$(srcdir); \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file; \ + done + +DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) + +-include $(DEP_FILES) + +mostlyclean-depend: + +clean-depend: + +distclean-depend: + +maintainer-clean-depend: + -rm -rf .deps + +%.o: %.c + @echo '$(COMPILE) -c $<'; \ + $(COMPILE) -Wp,-MD,.deps/$(*F).P -c $< + +%.lo: %.c + @echo '$(LTCOMPILE) -c $<'; \ + $(LTCOMPILE) -Wp,-MD,.deps/$(*F).p -c $< + @-sed -e 's/^\([^:]*\)\.o:/\1.lo \1.o:/' \ + < .deps/$(*F).p > .deps/$(*F).P + @-rm -f .deps/$(*F).p +info: +dvi: +check: all + $(MAKE) +installcheck: +install-exec: install-libLTLIBRARIES + @$(NORMAL_INSTALL) + +install-data: + @$(NORMAL_INSTALL) + +install: install-exec install-data all + @: + +uninstall: uninstall-libLTLIBRARIES + +install-strip: + $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install +installdirs: + $(mkinstalldirs) $(DATADIR)$(libdir) + + +mostlyclean-generic: + -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) + +clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + +distclean-generic: + -rm -f Makefile $(DISTCLEANFILES) + -rm -f config.cache config.log stamp-h stamp-h[0-9]* + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) + -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) +mostlyclean: mostlyclean-libLTLIBRARIES mostlyclean-compile \ + mostlyclean-libtool mostlyclean-tags mostlyclean-depend \ + mostlyclean-generic + +clean: clean-libLTLIBRARIES clean-compile clean-libtool clean-tags \ + clean-depend clean-generic mostlyclean + +distclean: distclean-libLTLIBRARIES distclean-compile distclean-libtool \ + distclean-tags distclean-depend distclean-generic clean + -rm -f config.status + -rm -f libtool + +maintainer-clean: maintainer-clean-libLTLIBRARIES \ + maintainer-clean-compile maintainer-clean-libtool \ + maintainer-clean-tags maintainer-clean-depend \ + maintainer-clean-generic distclean + @echo "This command is intended for maintainers to use;" + @echo "it deletes files that may require special tools to rebuild." + +.PHONY: mostlyclean-libLTLIBRARIES distclean-libLTLIBRARIES \ +clean-libLTLIBRARIES maintainer-clean-libLTLIBRARIES \ +uninstall-libLTLIBRARIES install-libLTLIBRARIES mostlyclean-compile \ +distclean-compile clean-compile maintainer-clean-compile \ +mostlyclean-libtool distclean-libtool clean-libtool \ +maintainer-clean-libtool tags mostlyclean-tags distclean-tags \ +clean-tags maintainer-clean-tags distdir mostlyclean-depend \ +distclean-depend clean-depend maintainer-clean-depend info dvi \ +installcheck install-exec install-data install uninstall all \ +installdirs mostlyclean-generic distclean-generic clean-generic \ +maintainer-clean-generic clean mostlyclean distclean maintainer-clean + + +INCLUDES += -I.. + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: