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