From 2284c5d282fcd6c5d35e8c7d34cde636aafeced2 Mon Sep 17 00:00:00 2001 From: Fang Guo Date: Tue, 20 Dec 2005 15:46:40 -0500 Subject: [svn-r11809] Purpose: Maintenance on Windows Description: Move hl c examples to windows/hl/examples Solution: Platforms tested: Misc. update: --- windows/hl/hl_c_examples/ex_images/ex_images.dsp | 19 ++++++++++--------- windows/hl/hl_c_examples/ex_lite/ex_lite.dsp | 18 +++++++++--------- 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/windows/hl/hl_c_examples/ex_images/ex_images.dsp b/windows/hl/hl_c_examples/ex_images/ex_images.dsp index 9aad658..709c846 100755 --- a/windows/hl/hl_c_examples/ex_images/ex_images.dsp +++ b/windows/hl/hl_c_examples/ex_images/ex_images.dsp @@ -38,14 +38,14 @@ RSC=rc.exe # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\..\..\..\hl\hl_c_examples\ex_images\Release" -# PROP Intermediate_Dir "..\..\..\..\hl\hl_c_examples\ex_images\Release" +# PROP Output_Dir "..\..\..\..\hl\examples\ex_images\Release" +# PROP Intermediate_Dir "..\..\..\..\hl\examples\ex_images\Release" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE F90 /compile_only /nologo /warn:nofileopt # ADD F90 /compile_only /nologo /warn:nofileopt # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\..\hdf5lib\release\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\..\hdf5lib\release\include" /I "..\..\..\..\hl\src" /I "..\..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe @@ -53,7 +53,7 @@ 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 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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5.lib hdf5_hl.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\hdf5lib\release\lib" +# 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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5.lib hdf5_hl.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\hdf5lib\release\lib" /libpath:"..\..\..\..\proj\hdf5\release" /libpath:"..\..\..\..\proj\hdf5_hl\release" !ELSEIF "$(CFG)" == "ex_images - Win32 Debug" @@ -64,13 +64,14 @@ LINK32=link.exe # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\..\..\..\hl\hl_c_examples\ex_images\Debug" -# PROP Intermediate_Dir "..\..\..\..\hl\hl_c_examples\ex_images\Debug" +# PROP Output_Dir "..\..\..\..\hl\examples\ex_images\Debug" +# PROP Intermediate_Dir "..\..\..\..\hl\examples\ex_images\Debug" +# PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt # ADD F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /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 -# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\..\hdf5lib\debug\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c +# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\..\hdf5lib\debug\include" /I "..\..\..\..\hl\src" /I "..\..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe @@ -78,7 +79,7 @@ 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 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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5d.lib hdf5d.lib hdf5_hld.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\hdf5lib\debug\lib\\" +# 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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5d.lib hdf5d.lib hdf5_hld.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\hdf5lib\debug\lib\\" /libpath:"..\..\..\..\proj\hdf5\debug" /libpath:"..\..\..\..\proj\hdf5_hl\debug" !ENDIF @@ -91,7 +92,7 @@ LINK32=link.exe # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp" # Begin Source File -SOURCE=..\..\..\..\hl\hl_c_examples\src\ex_images.c +SOURCE=..\..\..\..\hl\examples\ex_images.c # End Source File # End Group # Begin Group "Header Files" diff --git a/windows/hl/hl_c_examples/ex_lite/ex_lite.dsp b/windows/hl/hl_c_examples/ex_lite/ex_lite.dsp index 54d53db..4e39c59 100755 --- a/windows/hl/hl_c_examples/ex_lite/ex_lite.dsp +++ b/windows/hl/hl_c_examples/ex_lite/ex_lite.dsp @@ -38,14 +38,14 @@ RSC=rc.exe # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\..\..\..\hl\hl_c_examples\ex_lite\Release" -# PROP Intermediate_Dir "..\..\..\..\hl\hl_c_examples\ex_lite\Release" +# PROP Output_Dir "..\..\..\..\hl\examples\ex_lite\Release" +# PROP Intermediate_Dir "..\..\..\..\hl\examples\ex_lite\Release" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE F90 /compile_only /nologo /warn:nofileopt # ADD F90 /compile_only /nologo /warn:nofileopt # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\..\hdf5lib\release\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\..\hdf5lib\release\include" /I "..\..\..\..\hl\src" /I "..\..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe @@ -53,7 +53,7 @@ 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 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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5.lib hdf5_hl.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\hdf5lib\release\lib" +# 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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5.lib hdf5_hl.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\hdf5lib\release\lib" /libpath:"..\..\..\..\proj\hdf5\release" /libpath:"..\..\..\..\proj\hdf5_hl\release" !ELSEIF "$(CFG)" == "ex_lite - Win32 Debug" @@ -64,14 +64,14 @@ LINK32=link.exe # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\..\..\..\hl\hl_c_examples\ex_lite\Debug" -# PROP Intermediate_Dir "..\..\..\..\hl\hl_c_examples\ex_lite\Debug" +# PROP Output_Dir "..\..\..\..\hl\examples\ex_lite\Debug" +# PROP Intermediate_Dir "..\..\..\..\hl\examples\ex_lite\Debug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt # ADD F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /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 -# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\..\hdf5lib\debug\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c +# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\..\hdf5lib\debug\include" /I "..\..\..\..\hl\src" /I "..\..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe @@ -79,7 +79,7 @@ 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 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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5d.lib hdf5_hld.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\hdf5lib\debug\lib\\" +# 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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5d.lib hdf5_hld.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\hdf5lib\debug\lib\\" /libpath:"..\..\..\..\proj\hdf5\debug" /libpath:"..\..\..\..\proj\hdf5_hl\debug" !ENDIF @@ -92,7 +92,7 @@ LINK32=link.exe # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp" # Begin Source File -SOURCE=..\..\..\..\hl\hl_c_examples\src\ex_lite.c +SOURCE=..\..\..\..\hl\examples\ex_lite.c # End Source File # End Group # Begin Group "Header Files" -- cgit v0.12