Added zlib library support. Added new "install.exe" for cygwin32 installs.
This commit is contained in:
curt
parent
fc3910d194
commit
ea9d60545b
7 changed files with 70 additions and 17 deletions
|
|
@ -14,10 +14,16 @@ clean-deps:
|
|||
Lib/*/*/.deps Simulator/*/*/.deps Tools/*/*/.deps
|
||||
|
||||
clean-libs:
|
||||
rm -rf .libs Src/.libs Src/*/.libs Src/*/*/.libs
|
||||
rm -f Src/*/so_locations Src/*/*/so_locations
|
||||
rm -rf .libs Lib/.libs Simulator/.libs Tools/.libs \
|
||||
Lib/*/.libs Simulator/*/.libs Tools/*/.libs \
|
||||
Lib/*/*/.libs Simulator/*/*/.libs Tools/*/*/.libs
|
||||
rm -f Simulator/*/so_locations Lib/*/so_locations \
|
||||
Simulator/*/*/so_locations Lib/*/*/so_locations
|
||||
|
||||
# clean up after winbloze spews random case for file names :-(
|
||||
clean-winbloze: clean-deps clean-libs
|
||||
rm -f makefile Src/makefile Src/*/makefile Src/*/*/makefile
|
||||
rm -f Src/Main/fg.exe
|
||||
rm -f makefile Include/makefile Lib/makefile Simulator/makefile \
|
||||
Tools/makefile \
|
||||
Lib/*/makefile Simulator/*/makefile Tools/*/makefile \
|
||||
Lib/*/*/makefile Simulator/*/*/makefile Tools/*/*/makefile
|
||||
rm -f Src/Main/fg.exe Tools/*/*.exe
|
||||
|
|
|
|||
16
NEWS
Normal file
16
NEWS
Normal file
|
|
@ -0,0 +1,16 @@
|
|||
New in 0.42:
|
||||
* Simple autopilot heading hold contributed by
|
||||
Jeff Goeke-Smith <jgoeke@voyager.net>
|
||||
* More code reorganization and clean ups.
|
||||
|
||||
New in 0.41:
|
||||
* Many autoconf cleanups and tweaks
|
||||
* make and make install work in unix
|
||||
* make works for cygnus win32 (but not install yet)
|
||||
* make dist now works
|
||||
* added the Tools directory into the main source tree
|
||||
|
||||
New in 0.40:
|
||||
* Gnu automake/autoconf/libtool make system
|
||||
* Initial texture support
|
||||
* Bug fixes
|
||||
25
README.Win32
25
README.Win32
|
|
@ -48,6 +48,17 @@ a completely free development environment.
|
|||
cd FlightGear-X.XX
|
||||
pkunzip -d win32-libs-X.XX.zip
|
||||
|
||||
6. --> IMPORTANT <--
|
||||
|
||||
You will find a file called "install.exe" In the Win32 directory
|
||||
created when you unzip the win32-libs-X.XX.zip file.
|
||||
|
||||
This version of install.exe should replace the one in your
|
||||
H-i386-cygwin32\bin directory - it's sole claim to fame is that it
|
||||
"understands" that when many calls to it say "install foo" they
|
||||
mean "install foo.exe". If you skip this step, and attempt an
|
||||
install with the older version present, "make install" will fail.
|
||||
|
||||
Side Note: we need to make a distinction between the "build tree" and
|
||||
the "install tree." The "build tree" is what we've been talking
|
||||
about up until this point. This is where the source code lives
|
||||
|
|
@ -57,7 +68,7 @@ Side Note: we need to make a distinction between the "build tree" and
|
|||
executables, the scenery, the textures, and any other run-time
|
||||
files will be located.
|
||||
|
||||
6. Configure the make system for your environment and your "install
|
||||
7. Configure the make system for your environment and your "install
|
||||
tree". Tell the configure script where you would like to install
|
||||
the exectuables and all the scenery and textures by using the
|
||||
"--prefix" option. In the following example the base of the
|
||||
|
|
@ -65,11 +76,11 @@ Side Note: we need to make a distinction between the "build tree" and
|
|||
|
||||
./configure --prefix=/FlightGear
|
||||
|
||||
7. Build the executable. Run:
|
||||
8. Build the executable. Run:
|
||||
|
||||
make
|
||||
|
||||
8. Create and populate the install tree. Run:
|
||||
9. Create and populate the install tree. Run:
|
||||
|
||||
make install
|
||||
|
||||
|
|
@ -84,17 +95,17 @@ Important Note: so far you've built and installed the simulator and
|
|||
make sure you have the appropriate scenery and texture downloaded
|
||||
and unzip'ed in your "install tree".
|
||||
|
||||
9. Download and install the scenery and texture files.
|
||||
10. Download and install the scenery and texture files.
|
||||
|
||||
10. Set the runtime environment variable to point to the base of your
|
||||
11. Set the runtime environment variable to point to the base of your
|
||||
"install tree". Run:
|
||||
|
||||
export FG_ROOT=/FlightGear
|
||||
|
||||
11. Try it out! There are several ways to run flight gear once it has
|
||||
12. Try it out! There are several ways to run flight gear once it has
|
||||
been installed. The simplest is as follows. Run:
|
||||
|
||||
/FlightGear/bin/runfg.bat
|
||||
|
||||
12. I appreciate feedback. Tell me if it works! If it doesn't, tell me
|
||||
13. I appreciate feedback. Tell me if it works! If it doesn't, tell me
|
||||
what went wrong. My email is curt@me.umn.edu
|
||||
|
|
|
|||
|
|
@ -38,4 +38,9 @@ Num Lock Inactive
|
|||
2 = back
|
||||
3 = right/back
|
||||
6 = right
|
||||
9 = right/forward
|
||||
9 = right/forward
|
||||
|
||||
Autopilot
|
||||
---------
|
||||
Shift + A Enable Autopilot
|
||||
Shift + S Disable Autopilot
|
||||
|
|
|
|||
6
Thanks
6
Thanks
|
|
@ -41,6 +41,12 @@ Didier Chauveau <chauveau@math.univ-mlv.fr>
|
|||
http://edcwww.cr.usgs.gov/landdaac/gtopo30/gtopo30.html
|
||||
|
||||
|
||||
Jean-loup Gailly and Mark Adler <zlib@quest.jpl.nasa.gov>
|
||||
Authors of the zlib library. Used for on-the-fly compression and
|
||||
decompression routines.
|
||||
http://www.cdrom.com/pub/infozip/zlib/
|
||||
|
||||
|
||||
Jeff Goeke-Smith <jgoeke@voyager.net>
|
||||
Contributed our first autopilot.
|
||||
|
||||
|
|
|
|||
12
configure
vendored
12
configure
vendored
|
|
@ -703,7 +703,7 @@ fi
|
|||
|
||||
PACKAGE=FlightGear
|
||||
|
||||
VERSION=0.42
|
||||
VERSION=0.43
|
||||
|
||||
if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
|
||||
{ echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
|
||||
|
|
@ -4021,8 +4021,11 @@ trap 'rm -fr `echo "\
|
|||
Include/Makefile \
|
||||
Lib/Makefile \
|
||||
Lib/Bucket/Makefile \
|
||||
Lib/Debug/Makefile \
|
||||
Lib/DEM/Makefile \
|
||||
Lib/Math/Makefile \
|
||||
Lib/XGL/Makefile \
|
||||
Lib/zlib/Makefile \
|
||||
Simulator/Makefile \
|
||||
Simulator/Aircraft/Makefile \
|
||||
Simulator/Astro/Makefile \
|
||||
|
|
@ -4037,13 +4040,13 @@ trap 'rm -fr `echo "\
|
|||
Simulator/Main/runfg \
|
||||
Simulator/Main/runfg.bat \
|
||||
Simulator/Makefile \
|
||||
Simulator/Math/Makefile \
|
||||
Simulator/Scenery/Makefile \
|
||||
Simulator/Time/Makefile \
|
||||
Simulator/Weather/Makefile \
|
||||
Tools/Makefile \
|
||||
Tools/AssemTris/Makefile \
|
||||
Tools/Dem2node/Makefile \
|
||||
Tools/DemRaw2ascii/Makefile \
|
||||
Tools/FixNode/Makefile \
|
||||
Tools/FixObj/Makefile \
|
||||
Tools/SplitTris/Makefile \
|
||||
|
|
@ -4155,8 +4158,11 @@ CONFIG_FILES=\${CONFIG_FILES-"\
|
|||
Include/Makefile \
|
||||
Lib/Makefile \
|
||||
Lib/Bucket/Makefile \
|
||||
Lib/Debug/Makefile \
|
||||
Lib/DEM/Makefile \
|
||||
Lib/Math/Makefile \
|
||||
Lib/XGL/Makefile \
|
||||
Lib/zlib/Makefile \
|
||||
Simulator/Makefile \
|
||||
Simulator/Aircraft/Makefile \
|
||||
Simulator/Astro/Makefile \
|
||||
|
|
@ -4171,13 +4177,13 @@ CONFIG_FILES=\${CONFIG_FILES-"\
|
|||
Simulator/Main/runfg \
|
||||
Simulator/Main/runfg.bat \
|
||||
Simulator/Makefile \
|
||||
Simulator/Math/Makefile \
|
||||
Simulator/Scenery/Makefile \
|
||||
Simulator/Time/Makefile \
|
||||
Simulator/Weather/Makefile \
|
||||
Tools/Makefile \
|
||||
Tools/AssemTris/Makefile \
|
||||
Tools/Dem2node/Makefile \
|
||||
Tools/DemRaw2ascii/Makefile \
|
||||
Tools/FixNode/Makefile \
|
||||
Tools/FixObj/Makefile \
|
||||
Tools/SplitTris/Makefile \
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ dnl
|
|||
AC_INIT(Simulator/Aircraft/aircraft.c)
|
||||
|
||||
dnl Initialize the automake stuff
|
||||
AM_INIT_AUTOMAKE(FlightGear, 0.42)
|
||||
AM_INIT_AUTOMAKE(FlightGear, 0.43)
|
||||
|
||||
dnl Checks for programs.
|
||||
|
||||
|
|
@ -132,8 +132,11 @@ AC_OUTPUT( \
|
|||
Include/Makefile \
|
||||
Lib/Makefile \
|
||||
Lib/Bucket/Makefile \
|
||||
Lib/Debug/Makefile \
|
||||
Lib/DEM/Makefile \
|
||||
Lib/Math/Makefile \
|
||||
Lib/XGL/Makefile \
|
||||
Lib/zlib/Makefile \
|
||||
Simulator/Makefile \
|
||||
Simulator/Aircraft/Makefile \
|
||||
Simulator/Astro/Makefile \
|
||||
|
|
@ -148,13 +151,13 @@ AC_OUTPUT( \
|
|||
Simulator/Main/runfg \
|
||||
Simulator/Main/runfg.bat \
|
||||
Simulator/Makefile \
|
||||
Simulator/Math/Makefile \
|
||||
Simulator/Scenery/Makefile \
|
||||
Simulator/Time/Makefile \
|
||||
Simulator/Weather/Makefile \
|
||||
Tools/Makefile \
|
||||
Tools/AssemTris/Makefile \
|
||||
Tools/Dem2node/Makefile \
|
||||
Tools/DemRaw2ascii/Makefile \
|
||||
Tools/FixNode/Makefile \
|
||||
Tools/FixObj/Makefile \
|
||||
Tools/SplitTris/Makefile \
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue