Prepairing for 0.0.17

diff --git a/Doxyfile b/Doxyfile
index 6f00fe513c2169847e4c080a7037fdd6aa9c21e3..86860a2dc607487a8ac1417b53b3f876ad3de8da 100644 (file)
--- a/Doxyfile
+++ b/Doxyfile
@@ -22,7 +22,7 @@ PROJECT_NAME           = SimGear
 # This could be handy for archiving the generated documentation or 
 # if some version control system is used.
 
-PROJECT_NUMBER         = 0.0.16
+PROJECT_NUMBER         = 0.0.17
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
 # base path where the generated documentation will be put. 

diff --git a/SimGear.dsp b/SimGear.dsp
index 2485ab3be6fb713422aaa32ecae1842cd407bed2..f7613157233e70239ecce0e6268a18d4d8a9b3c8 100644 (file)
--- a/SimGear.dsp
+++ b/SimGear.dsp
@@ -41,7 +41,7 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /YX /FD /c\r
-# ADD CPP /nologo /W3 /GX /O2  /I "." /I ".." /I ".\SimGear" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "HAVE_CONFIG_H" /FD /c\r
+# ADD CPP /nologo /W3 /GX /O2 /D "HAVE_CONFIG_H"  /I "." /I ".." /I ".\SimGear" /D "HAVE_CONFIG_H" /D "NDEBUG" /D "WIN32" /D "_MBCS" /FD /c\r
 # ADD BASE RSC /l 0x409 /d "NDEBUG"\r
 # ADD RSC /l 0x409 /d "NDEBUG"\r
 BSC32=bscmake.exe\r
@@ -64,7 +64,7 @@ LINK32=link.exe -lib
 # PROP Intermediate_Dir "Debug"\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /YX /FD /GZ /c\r
-# ADD CPP /nologo /W3 /GX /ZI /Od  /I "." /I ".." /I ".\SimGear" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "HAVE_CONFIG_H" /FR /FD /GZ /c\r
+# ADD CPP /nologo /W3 /GX /ZI /Od /D "HAVE_CONFIG_H"  /I "." /I ".." /I ".\SimGear" /D "HAVE_CONFIG_H" /D "_DEBUG" /D "WIN32" /D "_MBCS" /FR /FD /GZ /c\r
 # ADD BASE RSC /l 0x409 /d "_DEBUG"\r
 # ADD RSC /l 0x409 /d "_DEBUG"\r
 BSC32=bscmake.exe\r
@@ -1824,5 +1824,33 @@ SOURCE=.\simgear\zlib\zutil.h
 \r
 # End Source File\r
 # End Group\r
+\r
+# Begin Source File\r
+\r
+SOURCE = .\simgear\simgear_config.h.vc5\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# Begin Custom Build - Creating config.h\r
+InputPath=.\simgear\simgear_config.h.vc5\r
+\r
+".\simgear\simgear_config.h": $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+        copy .\simgear\simgear_config.h.vc5 .\simgear\simgear_config.h\r
+\r
+# End Custom Build\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# Begin Custom Build - Creating config.h\r
+InputPath=.\simgear\simgear_config.h.vc5\r
+\r
+".\simgear\simgear_config.h": $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+        copy .\simgear\simgear_config.h.vc5 .\simgear\simgear_config.h\r
+\r
+# End Custom Build\r
+\r
+!ENDIF\r
+\r
+# End Source File\r
 # End Target\r
 # End Project\r

diff --git a/am2dsp.cfg b/am2dsp.cfg
index 044bc9d07ca4443a90c1a76aab7c33fd71534e96..bf38633ce8184ffa21d85c32eed32cda26dda734 100644 (file)
--- a/am2dsp.cfg
+++ b/am2dsp.cfg
@@ -1,5 +1,40 @@
 exclude_dir = threads
+
 include_path = .
 include_path = ..
 include_path = .\SimGear
 #include_path = \usr\include
+
+define = HAVE_CONFIG_H
+
+#add_project = .\SimGear\simgear\metakit\win\msvc60\mklib.dsp
+
+# Rule to create simgear_config.h
+add_source_file = \
+# Begin Source File\
+\
+SOURCE = .\simgear\simgear_config.h.vc5\
+\
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\
+\
+# Begin Custom Build - Creating config.h\
+InputPath=.\simgear\simgear_config.h.vc5\
+\
+".\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"\
+\
+# Begin Custom Build - Creating config.h\
+InputPath=.\simgear\simgear_config.h.vc5\
+\
+".\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 8e210d9e79418e81a28514e2899557d306a33f1b..732c2458f1b2bd595dde56b5586eac546179a85c 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -6,7 +6,7 @@ dnl $Id$
 AC_INIT(simgear/bucket/newbucket.cxx)
 
 dnl Initialize the automake stuff
-AM_INIT_AUTOMAKE(SimGear, 0.0.16)
+AM_INIT_AUTOMAKE(SimGear, 0.0.17)
 
 dnl Specify KAI C++ compiler and flags.
 dnl Borrowed with slight modification from blitz distribution.