Updated am2dsp.cfg file for creating MSVC project files.

New README.MSVC.
New src-libs/zlib.dsp for building zlib.

diff --git a/README.MSVC b/README.MSVC
new file mode 100644 (file)
index 0000000..33a89c2
--- /dev/null
+++ b/README.MSVC
@@ -0,0 +1,24 @@
+This document describes how to build SimGear using the supplied workspace and
+project files.  
+
+Unpack the SimGear source file into your work directory.  This creates a new
+subdirectory called SimGear-X.Y.Z.  Rename this to SimGear.  Before we can
+build SimGear you must unpack and build the third party libraries metakit and
+zlib.  Sources for these are included in the SimGear/src-libs directory.
+Unpack these into the top level SimGear directory.  At this point your
+directory structure should look something like this:
+
+<work_dir>/
+  SimGear/
+    metakit-x.y.z/
+    simgear/
+    src-libs/
+    zlib-x.y.z/
+
+Now open the SimGear workspace.  This workspace file contains projects for
+building metakit(mklib), SimGear and zlib.  Select each project as the active
+project and build all.  Order is unimportant since there are no dependencies
+between the projects.
+
+The workspace and project files are generated by a perl script with extra
+input from the am2dsp.cfg file.

diff --git a/am2dsp.cfg b/am2dsp.cfg
index bf38633ce8184ffa21d85c32eed32cda26dda734..c24f9bf612e96e9085a95908cc3e192495124d9b 100644 (file)
--- a/am2dsp.cfg
+++ b/am2dsp.cfg
@@ -1,40 +1,39 @@
+type = StaticLibrary,Multithreaded,
 exclude_dir = threads
 
 include_path = .
 include_path = ..
 include_path = .\SimGear
-#include_path = \usr\include
+include_path = .\SimGear\metakit-2.4.3\include
+include_path = ..\SimGear\zlib-1.1.4
 
 define = HAVE_CONFIG_H
 
-#add_project = .\SimGear\simgear\metakit\win\msvc60\mklib.dsp
+add_project = .\SimGear\metakit-2.4.3\win\msvc60\mklib.dsp,mklib
+add_project = .\SimGear\zlib.dsp,zlib
 
 # Rule to create simgear_config.h
-add_source_file = \
-# Begin Source File\
+add_source_file = SOURCE=.\simgear\simgear_config.h.vc5\
 \
-SOURCE = .\simgear\simgear_config.h.vc5\
-\
-!IF  "$(CFG)" == "FlightGear - Win32 Release"\
+!IF  "$(CFG)" == "SimGear - Win32 Release"\
 \
 # Begin Custom Build - Creating config.h\
 InputPath=.\simgear\simgear_config.h.vc5\
 \
-".\simgear\simgear_config.h": $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\
+".\simgear\simgear_config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\
         copy .\simgear\simgear_config.h.vc5 .\simgear\simgear_config.h\
 \
 # End Custom Build\
 \
-!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\
+!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\
 \
 # Begin Custom Build - Creating config.h\
 InputPath=.\simgear\simgear_config.h.vc5\
 \
-".\simgear\simgear_config.h": $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\
+".\simgear\simgear_config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\
         copy .\simgear\simgear_config.h.vc5 .\simgear\simgear_config.h\
 \
 # End Custom Build\
 \
 !ENDIF\
-\
-# End Source File
+

diff --git a/configure.in b/configure.in
index 161c075534cec4a7d4651c737ffc0c898c8ee616..5340e219cab32c77729a6fc7383deeaa5b11c1d4 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -9,7 +9,7 @@ AC_INIT(simgear/bucket/newbucket.cxx)
 AC_PREREQ(2.13)
 
 dnl Initialize the automake stuff
-AM_INIT_AUTOMAKE(SimGear, 0.0.18)
+AM_INIT_AUTOMAKE(SimGear, 0.0.19pre1)
 
 dnl Specify KAI C++ compiler and flags.
 dnl Borrowed with slight modification from blitz distribution.

diff --git a/src-libs/zlib.dsp b/src-libs/zlib.dsp
new file mode 100755 (executable)
index 0000000..dc1945c
--- /dev/null
+++ b/src-libs/zlib.dsp
@@ -0,0 +1,180 @@
+# Microsoft Developer Studio Project File - Name="zlib" - Package Owner=<4>\r
+# Microsoft Developer Studio Generated Build File, Format Version 6.00\r
+# ** DO NOT EDIT **\r
+\r
+# TARGTYPE "Win32 (x86) Static Library" 0x0104\r
+\r
+CFG=zlib - Win32 Debug\r
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,\r
+!MESSAGE use the Export Makefile command and run\r
+!MESSAGE \r
+!MESSAGE NMAKE /f "zlib.mak".\r
+!MESSAGE \r
+!MESSAGE You can specify a configuration when running NMAKE\r
+!MESSAGE by defining the macro CFG on the command line. For example:\r
+!MESSAGE \r
+!MESSAGE NMAKE /f "zlib.mak" CFG="zlib - Win32 Debug"\r
+!MESSAGE \r
+!MESSAGE Possible choices for configuration are:\r
+!MESSAGE \r
+!MESSAGE "zlib - Win32 Release" (based on "Win32 (x86) Static Library")\r
+!MESSAGE "zlib - Win32 Debug" (based on "Win32 (x86) Static Library")\r
+!MESSAGE \r
+\r
+# Begin Project\r
+# PROP AllowPerConfigDependencies 0\r
+# PROP Scc_ProjName ""\r
+# PROP Scc_LocalPath ""\r
+CPP=cl.exe\r
+RSC=rc.exe\r
+\r
+!IF  "$(CFG)" == "zlib - Win32 Release"\r
+\r
+# PROP Use_MFC 0\r
+# PROP Use_Debug_Libraries 0\r
+# PROP Output_Dir "zlib-1.1.4/Release"\r
+# PROP Intermediate_Dir "zlib-1.1.4/Release"\r
+# PROP Target_Dir ""\r
+LINK32=link.exe -lib\r
+# ADD CPP /nologo /MT /W3 /GX- /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /FD /c\r
+# ADD RSC /l 0xc09 /d "NDEBUG"\r
+BSC32=bscmake.exe\r
+# ADD BSC32 /nologo\r
+LIB32=link.exe -lib\r
+# ADD LIB32 /nologo\r
+\r
+!ELSEIF  "$(CFG)" == "zlib - Win32 Debug"\r
+\r
+# PROP Use_MFC 0\r
+# PROP Use_Debug_Libraries 1\r
+# PROP Output_Dir "zlib-1.1.4/Debug"\r
+# PROP Intermediate_Dir "zlib-1.1.4/Debug"\r
+# PROP Target_Dir ""\r
+LINK32=link.exe -lib\r
+# ADD CPP /nologo /MTd /W3 /Gm /GX- /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FD /GZ  /c\r
+# ADD RSC /l 0xc09 /d "_DEBUG"\r
+BSC32=bscmake.exe\r
+# ADD BSC32 /nologo\r
+LIB32=link.exe -lib\r
+# ADD LIB32 /nologo\r
+\r
+!ENDIF \r
+\r
+# Begin Target\r
+\r
+# Name "zlib - Win32 Release"\r
+# Name "zlib - Win32 Debug"\r
+# Begin Group "Source Files"\r
+\r
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"\r
+# Begin Source File\r
+\r
+SOURCE=".\zlib-1.1.4\adler32.c"\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=".\zlib-1.1.4\compress.c"\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=".\zlib-1.1.4\crc32.c"\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=".\zlib-1.1.4\deflate.c"\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=".\zlib-1.1.4\gzio.c"\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=".\zlib-1.1.4\infblock.c"\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=".\zlib-1.1.4\infcodes.c"\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=".\zlib-1.1.4\inffast.c"\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=".\zlib-1.1.4\inflate.c"\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=".\zlib-1.1.4\inftrees.c"\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=".\zlib-1.1.4\infutil.c"\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=".\zlib-1.1.4\maketree.c"\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=".\zlib-1.1.4\trees.c"\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=".\zlib-1.1.4\uncompr.c"\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=".\zlib-1.1.4\zutil.c"\r
+# End Source File\r
+# End Group\r
+# Begin Group "Header Files"\r
+\r
+# PROP Default_Filter "h;hpp;hxx;hm;inl"\r
+# Begin Source File\r
+\r
+SOURCE=".\zlib-1.1.4\deflate.h"\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=".\zlib-1.1.4\infblock.h"\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=".\zlib-1.1.4\infcodes.h"\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=".\zlib-1.1.4\inffast.h"\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=".\zlib-1.1.4\inffixed.h"\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=".\zlib-1.1.4\inftrees.h"\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=".\zlib-1.1.4\infutil.h"\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=".\zlib-1.1.4\trees.h"\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=".\zlib-1.1.4\zconf.h"\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=".\zlib-1.1.4\zlib.h"\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=".\zlib-1.1.4\zutil.h"\r
+# End Source File\r
+# End Group\r
+# End Target\r
+# End Project\r