From 994a470fbfd85cb5b4dec4e0b7b8f00e0aba54e8 Mon Sep 17 00:00:00 2001 From: curt Date: Fri, 13 Jul 2001 14:58:14 +0000 Subject: [PATCH] Prepairing for 0.0.17 --- Doxyfile | 2 +- SimGear.dsp | 32 ++++++++++++++++++++++++++++++-- am2dsp.cfg | 35 +++++++++++++++++++++++++++++++++++ configure.in | 2 +- 4 files changed, 67 insertions(+), 4 deletions(-) diff --git a/Doxyfile b/Doxyfile index 6f00fe51..86860a2d 100644 --- 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 2485ab3b..f7613157 100644 --- a/SimGear.dsp +++ b/SimGear.dsp @@ -41,7 +41,7 @@ RSC=rc.exe # PROP Intermediate_Dir "Release" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /W3 /GX /O2 /I "." /I ".." /I ".\SimGear" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "HAVE_CONFIG_H" /FD /c +# 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 # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe @@ -64,7 +64,7 @@ LINK32=link.exe -lib # PROP Intermediate_Dir "Debug" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /YX /FD /GZ /c -# 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 +# 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 # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe @@ -1824,5 +1824,33 @@ SOURCE=.\simgear\zlib\zutil.h # End Source File # End Group + +# 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 # End Target # End Project diff --git a/am2dsp.cfg b/am2dsp.cfg index 044bc9d0..bf38633c 100644 --- 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 8e210d9e..732c2458 100644 --- 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.