[svn-r14255] Purpose: Add h5tinit.c to default Windows build process

Description:
Previously, we provided a static h5tinit.c with our Windows distribution, and provided instructions to optionally generate it.  Now, we will incorporate it as part of the default build process, to emulate other platforms more closely.

Tested:
VS6
VS2005

3 files changed, 36 insertions, 35 deletions

diff --git a/windows_vs6/misc/typegen/h5tinit/h5tinit.dsp b/windows_vs6/misc/typegen/h5tinit/h5tinit.dsp
index 54666df..a8bf1a9 100755
--- a/windows_vs6/misc/typegen/h5tinit/h5tinit.dsp
+++ b/windows_vs6/misc/typegen/h5tinit/h5tinit.dsp
@@ -26,7 +26,6 @@ CFG=h5tinit - Win32 Debug
 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 CPP=cl.exe

-F90=df.exe

 RSC=rc.exe

 

 !IF  "$(CFG)" == "h5tinit - Win32 Release"

@@ -38,9 +37,11 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

-# PROP Intermediate_Dir "Release"

+# PROP Output_Dir "..\..\..\..\src"

+# PROP Intermediate_Dir "..\..\..\..\src"

+# PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+F90=df.exe

 # ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt

 # ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

@@ -53,6 +54,11 @@ BSC32=bscmake.exe
 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

 # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

+# Begin Special Build Tool

+SOURCE="$(InputPath)"

+PostBuild_Desc=Generating H5tinit.c

+PostBuild_Cmds=..\..\..\..\src\h5tinit.exe > ..\..\..\..\src\H5tinit.c

+# End Special Build Tool

 

 !ELSEIF  "$(CFG)" == "h5tinit - Win32 Debug"

 

@@ -63,10 +69,11 @@ LINK32=link.exe
 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Debug"

-# PROP Intermediate_Dir "Debug"

+# PROP Output_Dir "..\..\..\..\src"

+# PROP Intermediate_Dir "..\..\..\..\src"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+F90=df.exe

 # ADD BASE F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt

 # ADD F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt

 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c

@@ -78,7 +85,12 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib /nologo /subsystem:console /debug /machine:I386 /include:"_gethostname@8" /out:"../../../../src/h5tinit.exe" /pdbtype:sept

+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib /nologo /subsystem:console /debug /machine:I386 /include:"_gethostname@8" /pdbtype:sept

+# Begin Special Build Tool

+SOURCE="$(InputPath)"

+PostBuild_Desc=Generating H5tinit.c

+PostBuild_Cmds=..\..\..\..\src\h5tinit.exe > ..\..\..\..\src\H5tinit.c

+# End Special Build Tool

 

 !ENDIF 

 

diff --git a/windows_vs6/misc/typegen/typegen.dsw b/windows_vs6/misc/typegen/typegen.dsw
deleted file mode 100755
index ba053a1..0000000
--- a/windows_vs6/misc/typegen/typegen.dsw
+++ /dev/null
@@ -1,29 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00

-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

-

-###############################################################################

-

-Project: "h5tinit"=".\h5tinit\h5tinit.dsp" - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

-###############################################################################

-

diff --git a/windows_vs6/proj/all/all.dsw b/windows_vs6/proj/all/all.dsw
index d348b36..1474436 100755
--- a/windows_vs6/proj/all/all.dsw
+++ b/windows_vs6/proj/all/all.dsw
@@ -2031,6 +2031,18 @@ Package=<4>
 

 ###############################################################################

 

+Project: "h5tinit"="..\..\misc\typegen\h5tinit\h5tinit.dsp" - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

 Project: "h5unjam"="..\..\TOOLS\h5unjam\h5unjam.dsp" - Package Owner=<4>

 

 Package=<5>

@@ -2057,6 +2069,9 @@ Package=<5>
 

 Package=<4>

 {{{

+    Begin Project Dependency

+    Project_Dep_Name h5tinit

+    End Project Dependency

 }}}

 

 ###############################################################################

@@ -2291,6 +2306,9 @@ Package=<5>
 

 Package=<4>

 {{{

+    Begin Project Dependency

+    Project_Dep_Name h5tinit

+    End Project Dependency

 }}}

 

 ###############################################################################