regenerated from .pro files

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11913 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/samples/html/about/about.dsp b/samples/html/about/about.dsp
index fce8bf6e11be8b250667325bb13bd2eb2509862c..87b6195fdc20f590c5c35e5277c7d245bd6867ed 100644 (file)
--- a/samples/html/about/about.dsp
+++ b/samples/html/about/about.dsp
@@ -1,10 +1,10 @@
-# Microsoft Developer Studio Project File - Name="about" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="htmlabout" - Package Owner=<4>
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
 # TARGTYPE "Win32 (x86) Application" 0x0101
 
-CFG=about - Win32 Debug
+CFG=htmlabout - Win32 Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
@@ -13,14 +13,14 @@ CFG=about - Win32 Debug
 !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 "about.mak" CFG="about - Win32 Debug"
+!MESSAGE NMAKE /f "about.mak" CFG="htmlabout - Win32 Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "about - Win32 Release DLL" (based on "Win32 (x86) Application")
-!MESSAGE "about - Win32 Debug DLL" (based on "Win32 (x86) Application")
-!MESSAGE "about - Win32 Release" (based on "Win32 (x86) Application")
-!MESSAGE "about - Win32 Debug" (based on "Win32 (x86) Application")
+!MESSAGE "htmlabout - Win32 Release DLL" (based on "Win32 (x86) Application")
+!MESSAGE "htmlabout - Win32 Debug DLL" (based on "Win32 (x86) Application")
+!MESSAGE "htmlabout - Win32 Release" (based on "Win32 (x86) Application")
+!MESSAGE "htmlabout - Win32 Debug" (based on "Win32 (x86) Application")
 !MESSAGE 
 
 # Begin Project
@@ -30,7 +30,7 @@ CPP=cl.exe
 MTL=midl.exe
 RSC=rc.exe
 
-!ELSEIF "$(CFG)" == "about - Win32 Release DLL"
+!ELSEIF "$(CFG)" == "htmlabout - Win32 Release DLL"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -56,7 +56,7 @@ 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 comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /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 comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /machine:I386 ../../..\lib\wxmsw232.lib
 
-!ELSEIF "$(CFG)" == "about - Win32 Debug DLL"
+!ELSEIF "$(CFG)" == "htmlabout - Win32 Debug DLL"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -82,7 +82,7 @@ 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 comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /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 comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ../../..\lib\wxmsw232d.lib
 
-!ELSEIF "$(CFG)" == "about - Win32 Release"
+!ELSEIF "$(CFG)" == "htmlabout - Win32 Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -108,7 +108,7 @@ 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 comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /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 comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /machine:I386 ../../..\lib\zlib.lib ../../..\lib\regex.lib ../../..\lib\png.lib ../../..\lib\jpeg.lib ../../..\lib\tiff.lib ../../..\lib\wxmsw.lib
 
-!ELSEIF "$(CFG)" == "about - Win32 Debug"
+!ELSEIF "$(CFG)" == "htmlabout - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -138,10 +138,10 @@ LINK32=link.exe
 
 # Begin Target
 
-# Name "about - Win32 Release DLL"
-# Name "about - Win32 Debug DLL"
-# Name "about - Win32 Release"
-# Name "about - Win32 Debug"
+# Name "htmlabout - Win32 Release DLL"
+# Name "htmlabout - Win32 Debug DLL"
+# Name "htmlabout - Win32 Release"
+# Name "htmlabout - Win32 Debug"
 # Begin Source File
 
 SOURCE=.\about.cpp

diff --git a/samples/html/help/help.dsp b/samples/html/help/help.dsp
index 528a61880f60805eb1bf793a05241e6389e5c122..726c2062dcbc4d32aa06914dc15cf56b3faabfc8 100644 (file)
--- a/samples/html/help/help.dsp
+++ b/samples/html/help/help.dsp
@@ -44,11 +44,11 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W4 /O2 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D WINVER=0x400 /YX /FD /c
-# ADD CPP /nologo /W4 /O2 /I "..\..\..\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D WINVER=0x400 /D WIN32 /D WINVER=0x400 /D _MT /D wxUSE_GUI=1 /YX /FD /c /MD  /D WXUSINGDLL  /I../../..\lib\mswdll 
+# ADD CPP /nologo /W4 /O2 /I "../../../include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D WINVER=0x400 /D WIN32 /D WINVER=0x400 /D _MT /D wxUSE_GUI=1 /YX /FD /c /MD  /D WXUSINGDLL  /I../../..\lib\mswdll 
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
-# ADD BASE RSC /l 0x409 /d "NDEBUG" /I "..\..\..\include"
-# ADD RSC /l 0x409 /d "NDEBUG" /I "..\..\..\include"
+# ADD BASE RSC /l 0x409 /d "NDEBUG" /I "../../../include"
+# ADD RSC /l 0x409 /d "NDEBUG" /I "../../../include"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -70,11 +70,11 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W4 /Zi /Od /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D WINVER=0x400 /YX /FD /c
-# ADD CPP /nologo /W4 /Zi /Od /I "..\..\..\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D WINVER=0x400 /D WIN32 /D WINVER=0x400 /D _MT /D wxUSE_GUI=1 /YX /FD /c /MDd /D "__WXDEBUG__" /D "WXDEBUG=1"  /D WXUSINGDLL  /I../../..\lib\mswdlld 
+# ADD CPP /nologo /W4 /Zi /Od /I "../../../include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D WINVER=0x400 /D WIN32 /D WINVER=0x400 /D _MT /D wxUSE_GUI=1 /YX /FD /c /MDd /D "__WXDEBUG__" /D "WXDEBUG=1"  /D WXUSINGDLL  /I../../..\lib\mswdlld 
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /I "..\..\..\include"
-# ADD RSC /l 0x409 /d "_DEBUG" /I "..\..\..\include"
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /I "../../../include"
+# ADD RSC /l 0x409 /d "_DEBUG" /I "../../../include"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -96,11 +96,11 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W4 /O2 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D WINVER=0x400 /YX /FD /c
-# ADD CPP /nologo /W4 /O2 /I "..\..\..\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D WINVER=0x400 /D WIN32 /D WINVER=0x400 /D _MT /D wxUSE_GUI=1 /YX /FD /c /MD  /I../../..\lib\msw 
+# ADD CPP /nologo /W4 /O2 /I "../../../include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D WINVER=0x400 /D WIN32 /D WINVER=0x400 /D _MT /D wxUSE_GUI=1 /YX /FD /c /MD  /I../../..\lib\msw 
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
-# ADD BASE RSC /l 0x409 /d "NDEBUG" /I "..\..\..\include"
-# ADD RSC /l 0x409 /d "NDEBUG" /I "..\..\..\include"
+# ADD BASE RSC /l 0x409 /d "NDEBUG" /I "../../../include"
+# ADD RSC /l 0x409 /d "NDEBUG" /I "../../../include"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -122,11 +122,11 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W4 /Zi /Od /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D WINVER=0x400 /YX /FD /c
-# ADD CPP /nologo /W4 /Zi /Od /I "..\..\..\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D WINVER=0x400 /D WIN32 /D WINVER=0x400 /D _MT /D wxUSE_GUI=1 /YX /FD /c /MDd /D "__WXDEBUG__" /D "WXDEBUG=1"  /I../../..\lib\mswd 
+# ADD CPP /nologo /W4 /Zi /Od /I "../../../include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D WINVER=0x400 /D WIN32 /D WINVER=0x400 /D _MT /D wxUSE_GUI=1 /YX /FD /c /MDd /D "__WXDEBUG__" /D "WXDEBUG=1"  /I../../..\lib\mswd 
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /I "..\..\..\include"
-# ADD RSC /l 0x409 /d "_DEBUG" /I "..\..\..\include"
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /I "../../../include"
+# ADD RSC /l 0x409 /d "_DEBUG" /I "../../../include"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo

diff --git a/samples/html/helpview/helpview.dsp b/samples/html/helpview/helpview.dsp
index cafaa53a1f011a65d6bab33f779dc5cb93d9b8e0..06cd30adfd2acc0f8d92a255e55ce38659aac543 100644 (file)
--- a/samples/html/helpview/helpview.dsp
+++ b/samples/html/helpview/helpview.dsp
@@ -1,10 +1,10 @@
-# Microsoft Developer Studio Project File - Name="helpview" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="htmlhelpview" - Package Owner=<4>
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
 # TARGTYPE "Win32 (x86) Application" 0x0101
 
-CFG=helpview - Win32 Debug
+CFG=htmlhelpview - Win32 Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
@@ -13,14 +13,14 @@ CFG=helpview - Win32 Debug
 !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 "helpview.mak" CFG="helpview - Win32 Debug"
+!MESSAGE NMAKE /f "helpview.mak" CFG="htmlhelpview - Win32 Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "helpview - Win32 Release DLL" (based on "Win32 (x86) Application")
-!MESSAGE "helpview - Win32 Debug DLL" (based on "Win32 (x86) Application")
-!MESSAGE "helpview - Win32 Release" (based on "Win32 (x86) Application")
-!MESSAGE "helpview - Win32 Debug" (based on "Win32 (x86) Application")
+!MESSAGE "htmlhelpview - Win32 Release DLL" (based on "Win32 (x86) Application")
+!MESSAGE "htmlhelpview - Win32 Debug DLL" (based on "Win32 (x86) Application")
+!MESSAGE "htmlhelpview - Win32 Release" (based on "Win32 (x86) Application")
+!MESSAGE "htmlhelpview - Win32 Debug" (based on "Win32 (x86) Application")
 !MESSAGE 
 
 # Begin Project
@@ -30,7 +30,7 @@ CPP=cl.exe
 MTL=midl.exe
 RSC=rc.exe
 
-!ELSEIF "$(CFG)" == "helpview - Win32 Release DLL"
+!ELSEIF "$(CFG)" == "htmlhelpview - Win32 Release DLL"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -56,7 +56,7 @@ 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 comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /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 comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /machine:I386 ../../..\lib\wxmsw232.lib
 
-!ELSEIF "$(CFG)" == "helpview - Win32 Debug DLL"
+!ELSEIF "$(CFG)" == "htmlhelpview - Win32 Debug DLL"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -82,7 +82,7 @@ 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 comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /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 comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ../../..\lib\wxmsw232d.lib
 
-!ELSEIF "$(CFG)" == "helpview - Win32 Release"
+!ELSEIF "$(CFG)" == "htmlhelpview - Win32 Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -108,7 +108,7 @@ 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 comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /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 comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /machine:I386 ../../..\lib\zlib.lib ../../..\lib\regex.lib ../../..\lib\png.lib ../../..\lib\jpeg.lib ../../..\lib\tiff.lib ../../..\lib\wxmsw.lib
 
-!ELSEIF "$(CFG)" == "helpview - Win32 Debug"
+!ELSEIF "$(CFG)" == "htmlhelpview - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -138,10 +138,10 @@ LINK32=link.exe
 
 # Begin Target
 
-# Name "helpview - Win32 Release DLL"
-# Name "helpview - Win32 Debug DLL"
-# Name "helpview - Win32 Release"
-# Name "helpview - Win32 Debug"
+# Name "htmlhelpview - Win32 Release DLL"
+# Name "htmlhelpview - Win32 Debug DLL"
+# Name "htmlhelpview - Win32 Release"
+# Name "htmlhelpview - Win32 Debug"
 # Begin Source File
 
 SOURCE=.\helpview.cpp

diff --git a/samples/html/printing/printing.dsp b/samples/html/printing/printing.dsp
index ba4eb95703465a599b2a1242de88bf26fc1c3fe8..cea2b766f31589be3b6c98ae4e5afa1b3d5e17a5 100644 (file)
--- a/samples/html/printing/printing.dsp
+++ b/samples/html/printing/printing.dsp
@@ -1,10 +1,10 @@
-# Microsoft Developer Studio Project File - Name="printing" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="htmlprinting" - Package Owner=<4>
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
 # TARGTYPE "Win32 (x86) Application" 0x0101
 
-CFG=printing - Win32 Debug
+CFG=htmlprinting - Win32 Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
@@ -13,14 +13,14 @@ CFG=printing - Win32 Debug
 !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 "printing.mak" CFG="printing - Win32 Debug"
+!MESSAGE NMAKE /f "printing.mak" CFG="htmlprinting - Win32 Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "printing - Win32 Release DLL" (based on "Win32 (x86) Application")
-!MESSAGE "printing - Win32 Debug DLL" (based on "Win32 (x86) Application")
-!MESSAGE "printing - Win32 Release" (based on "Win32 (x86) Application")
-!MESSAGE "printing - Win32 Debug" (based on "Win32 (x86) Application")
+!MESSAGE "htmlprinting - Win32 Release DLL" (based on "Win32 (x86) Application")
+!MESSAGE "htmlprinting - Win32 Debug DLL" (based on "Win32 (x86) Application")
+!MESSAGE "htmlprinting - Win32 Release" (based on "Win32 (x86) Application")
+!MESSAGE "htmlprinting - Win32 Debug" (based on "Win32 (x86) Application")
 !MESSAGE 
 
 # Begin Project
@@ -30,7 +30,7 @@ CPP=cl.exe
 MTL=midl.exe
 RSC=rc.exe
 
-!ELSEIF "$(CFG)" == "printing - Win32 Release DLL"
+!ELSEIF "$(CFG)" == "htmlprinting - Win32 Release DLL"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -56,7 +56,7 @@ 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 comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /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 comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /machine:I386 ../../..\lib\wxmsw232.lib
 
-!ELSEIF "$(CFG)" == "printing - Win32 Debug DLL"
+!ELSEIF "$(CFG)" == "htmlprinting - Win32 Debug DLL"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -82,7 +82,7 @@ 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 comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /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 comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ../../..\lib\wxmsw232d.lib
 
-!ELSEIF "$(CFG)" == "printing - Win32 Release"
+!ELSEIF "$(CFG)" == "htmlprinting - Win32 Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -108,7 +108,7 @@ 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 comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /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 comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /machine:I386 ../../..\lib\zlib.lib ../../..\lib\regex.lib ../../..\lib\png.lib ../../..\lib\jpeg.lib ../../..\lib\tiff.lib ../../..\lib\wxmsw.lib
 
-!ELSEIF "$(CFG)" == "printing - Win32 Debug"
+!ELSEIF "$(CFG)" == "htmlprinting - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -138,10 +138,10 @@ LINK32=link.exe
 
 # Begin Target
 
-# Name "printing - Win32 Release DLL"
-# Name "printing - Win32 Debug DLL"
-# Name "printing - Win32 Release"
-# Name "printing - Win32 Debug"
+# Name "htmlprinting - Win32 Release DLL"
+# Name "htmlprinting - Win32 Debug DLL"
+# Name "htmlprinting - Win32 Release"
+# Name "htmlprinting - Win32 Debug"
 # Begin Source File
 
 SOURCE=.\printing.cpp

diff --git a/samples/html/test/test.dsp b/samples/html/test/test.dsp
index dc31bd7aa127aa420a1d1512f4a49852c23a33b7..12d92cdb06f2e35334924fe533448669426b1903 100644 (file)
--- a/samples/html/test/test.dsp
+++ b/samples/html/test/test.dsp
@@ -1,10 +1,10 @@
-# Microsoft Developer Studio Project File - Name="test" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="htmltest" - Package Owner=<4>
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
 # TARGTYPE "Win32 (x86) Application" 0x0101
 
-CFG=test - Win32 Debug
+CFG=htmltest - Win32 Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
@@ -13,14 +13,14 @@ CFG=test - Win32 Debug
 !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 "test.mak" CFG="test - Win32 Debug"
+!MESSAGE NMAKE /f "test.mak" CFG="htmltest - Win32 Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "test - Win32 Release DLL" (based on "Win32 (x86) Application")
-!MESSAGE "test - Win32 Debug DLL" (based on "Win32 (x86) Application")
-!MESSAGE "test - Win32 Release" (based on "Win32 (x86) Application")
-!MESSAGE "test - Win32 Debug" (based on "Win32 (x86) Application")
+!MESSAGE "htmltest - Win32 Release DLL" (based on "Win32 (x86) Application")
+!MESSAGE "htmltest - Win32 Debug DLL" (based on "Win32 (x86) Application")
+!MESSAGE "htmltest - Win32 Release" (based on "Win32 (x86) Application")
+!MESSAGE "htmltest - Win32 Debug" (based on "Win32 (x86) Application")
 !MESSAGE 
 
 # Begin Project
@@ -30,7 +30,7 @@ CPP=cl.exe
 MTL=midl.exe
 RSC=rc.exe
 
-!ELSEIF "$(CFG)" == "test - Win32 Release DLL"
+!ELSEIF "$(CFG)" == "htmltest - Win32 Release DLL"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -56,7 +56,7 @@ 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 comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /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 comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /machine:I386 ../../..\lib\wxmsw232.lib
 
-!ELSEIF "$(CFG)" == "test - Win32 Debug DLL"
+!ELSEIF "$(CFG)" == "htmltest - Win32 Debug DLL"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -82,7 +82,7 @@ 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 comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /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 comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ../../..\lib\wxmsw232d.lib
 
-!ELSEIF "$(CFG)" == "test - Win32 Release"
+!ELSEIF "$(CFG)" == "htmltest - Win32 Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -108,7 +108,7 @@ 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 comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /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 comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /machine:I386 ../../..\lib\zlib.lib ../../..\lib\regex.lib ../../..\lib\png.lib ../../..\lib\jpeg.lib ../../..\lib\tiff.lib ../../..\lib\wxmsw.lib
 
-!ELSEIF "$(CFG)" == "test - Win32 Debug"
+!ELSEIF "$(CFG)" == "htmltest - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -138,10 +138,10 @@ LINK32=link.exe
 
 # Begin Target
 
-# Name "test - Win32 Release DLL"
-# Name "test - Win32 Debug DLL"
-# Name "test - Win32 Release"
-# Name "test - Win32 Debug"
+# Name "htmltest - Win32 Release DLL"
+# Name "htmltest - Win32 Debug DLL"
+# Name "htmltest - Win32 Release"
+# Name "htmltest - Win32 Debug"
 # Begin Source File
 
 SOURCE=.\test.cpp

diff --git a/samples/html/virtual/virtual.dsp b/samples/html/virtual/virtual.dsp
index 05bd3e64ace5c3eb3bbd46906c7b673f1e6968e4..9358e74acbd55c26fcad5ad77b5d0262564978aa 100644 (file)
--- a/samples/html/virtual/virtual.dsp
+++ b/samples/html/virtual/virtual.dsp
@@ -1,10 +1,10 @@
-# Microsoft Developer Studio Project File - Name="virtual" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="htmlvirtual" - Package Owner=<4>
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
 # TARGTYPE "Win32 (x86) Application" 0x0101
 
-CFG=virtual - Win32 Debug
+CFG=htmlvirtual - Win32 Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
@@ -13,14 +13,14 @@ CFG=virtual - Win32 Debug
 !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 "virtual.mak" CFG="virtual - Win32 Debug"
+!MESSAGE NMAKE /f "virtual.mak" CFG="htmlvirtual - Win32 Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "virtual - Win32 Release DLL" (based on "Win32 (x86) Application")
-!MESSAGE "virtual - Win32 Debug DLL" (based on "Win32 (x86) Application")
-!MESSAGE "virtual - Win32 Release" (based on "Win32 (x86) Application")
-!MESSAGE "virtual - Win32 Debug" (based on "Win32 (x86) Application")
+!MESSAGE "htmlvirtual - Win32 Release DLL" (based on "Win32 (x86) Application")
+!MESSAGE "htmlvirtual - Win32 Debug DLL" (based on "Win32 (x86) Application")
+!MESSAGE "htmlvirtual - Win32 Release" (based on "Win32 (x86) Application")
+!MESSAGE "htmlvirtual - Win32 Debug" (based on "Win32 (x86) Application")
 !MESSAGE 
 
 # Begin Project
@@ -30,7 +30,7 @@ CPP=cl.exe
 MTL=midl.exe
 RSC=rc.exe
 
-!ELSEIF "$(CFG)" == "virtual - Win32 Release DLL"
+!ELSEIF "$(CFG)" == "htmlvirtual - Win32 Release DLL"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -56,7 +56,7 @@ 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 comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /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 comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /machine:I386 ../../..\lib\wxmsw232.lib
 
-!ELSEIF "$(CFG)" == "virtual - Win32 Debug DLL"
+!ELSEIF "$(CFG)" == "htmlvirtual - Win32 Debug DLL"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -82,7 +82,7 @@ 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 comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /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 comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ../../..\lib\wxmsw232d.lib
 
-!ELSEIF "$(CFG)" == "virtual - Win32 Release"
+!ELSEIF "$(CFG)" == "htmlvirtual - Win32 Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -108,7 +108,7 @@ 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 comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /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 comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /machine:I386 ../../..\lib\zlib.lib ../../..\lib\regex.lib ../../..\lib\png.lib ../../..\lib\jpeg.lib ../../..\lib\tiff.lib ../../..\lib\wxmsw.lib
 
-!ELSEIF "$(CFG)" == "virtual - Win32 Debug"
+!ELSEIF "$(CFG)" == "htmlvirtual - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -138,10 +138,10 @@ LINK32=link.exe
 
 # Begin Target
 
-# Name "virtual - Win32 Release DLL"
-# Name "virtual - Win32 Debug DLL"
-# Name "virtual - Win32 Release"
-# Name "virtual - Win32 Debug"
+# Name "htmlvirtual - Win32 Release DLL"
+# Name "htmlvirtual - Win32 Debug DLL"
+# Name "htmlvirtual - Win32 Release"
+# Name "htmlvirtual - Win32 Debug"
 # Begin Source File
 
 SOURCE=.\virtual.cpp

diff --git a/samples/html/widget/widget.dsp b/samples/html/widget/widget.dsp
index 80ab2b487edc278f564128ff42929406eb9abc3b..9e72ac0f27dfc46d80aab18f67bdb32b277c1f83 100644 (file)
--- a/samples/html/widget/widget.dsp
+++ b/samples/html/widget/widget.dsp
@@ -1,10 +1,10 @@
-# Microsoft Developer Studio Project File - Name="widget" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="htmlwidget" - Package Owner=<4>
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
 # TARGTYPE "Win32 (x86) Application" 0x0101
 
-CFG=widget - Win32 Debug
+CFG=htmlwidget - Win32 Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
@@ -13,14 +13,14 @@ CFG=widget - Win32 Debug
 !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 "widget.mak" CFG="widget - Win32 Debug"
+!MESSAGE NMAKE /f "widget.mak" CFG="htmlwidget - Win32 Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "widget - Win32 Release DLL" (based on "Win32 (x86) Application")
-!MESSAGE "widget - Win32 Debug DLL" (based on "Win32 (x86) Application")
-!MESSAGE "widget - Win32 Release" (based on "Win32 (x86) Application")
-!MESSAGE "widget - Win32 Debug" (based on "Win32 (x86) Application")
+!MESSAGE "htmlwidget - Win32 Release DLL" (based on "Win32 (x86) Application")
+!MESSAGE "htmlwidget - Win32 Debug DLL" (based on "Win32 (x86) Application")
+!MESSAGE "htmlwidget - Win32 Release" (based on "Win32 (x86) Application")
+!MESSAGE "htmlwidget - Win32 Debug" (based on "Win32 (x86) Application")
 !MESSAGE 
 
 # Begin Project
@@ -30,7 +30,7 @@ CPP=cl.exe
 MTL=midl.exe
 RSC=rc.exe
 
-!ELSEIF "$(CFG)" == "widget - Win32 Release DLL"
+!ELSEIF "$(CFG)" == "htmlwidget - Win32 Release DLL"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -56,7 +56,7 @@ 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 comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /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 comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /machine:I386 ../../..\lib\wxmsw232.lib
 
-!ELSEIF "$(CFG)" == "widget - Win32 Debug DLL"
+!ELSEIF "$(CFG)" == "htmlwidget - Win32 Debug DLL"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -82,7 +82,7 @@ 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 comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /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 comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ../../..\lib\wxmsw232d.lib
 
-!ELSEIF "$(CFG)" == "widget - Win32 Release"
+!ELSEIF "$(CFG)" == "htmlwidget - Win32 Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -108,7 +108,7 @@ 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 comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /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 comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /machine:I386 ../../..\lib\zlib.lib ../../..\lib\regex.lib ../../..\lib\png.lib ../../..\lib\jpeg.lib ../../..\lib\tiff.lib ../../..\lib\wxmsw.lib
 
-!ELSEIF "$(CFG)" == "widget - Win32 Debug"
+!ELSEIF "$(CFG)" == "htmlwidget - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -138,10 +138,10 @@ LINK32=link.exe
 
 # Begin Target
 
-# Name "widget - Win32 Release DLL"
-# Name "widget - Win32 Debug DLL"
-# Name "widget - Win32 Release"
-# Name "widget - Win32 Debug"
+# Name "htmlwidget - Win32 Release DLL"
+# Name "htmlwidget - Win32 Debug DLL"
+# Name "htmlwidget - Win32 Release"
+# Name "htmlwidget - Win32 Debug"
 # Begin Source File
 
 SOURCE=.\widget.cpp

diff --git a/samples/html/zip/zip.dsp b/samples/html/zip/zip.dsp
index 1f0fdc729086daf4a1102cce545bf2c7b587f5f8..cbfecbb03e6c83c6f3c5cf4cb0d29c9b9d66f012 100644 (file)
--- a/samples/html/zip/zip.dsp
+++ b/samples/html/zip/zip.dsp
@@ -1,10 +1,10 @@
-# Microsoft Developer Studio Project File - Name="zip" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="htmlzip" - Package Owner=<4>
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
 # TARGTYPE "Win32 (x86) Application" 0x0101
 
-CFG=zip - Win32 Debug
+CFG=htmlzip - Win32 Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
@@ -13,14 +13,14 @@ CFG=zip - Win32 Debug
 !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 "zip.mak" CFG="zip - Win32 Debug"
+!MESSAGE NMAKE /f "zip.mak" CFG="htmlzip - Win32 Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "zip - Win32 Release DLL" (based on "Win32 (x86) Application")
-!MESSAGE "zip - Win32 Debug DLL" (based on "Win32 (x86) Application")
-!MESSAGE "zip - Win32 Release" (based on "Win32 (x86) Application")
-!MESSAGE "zip - Win32 Debug" (based on "Win32 (x86) Application")
+!MESSAGE "htmlzip - Win32 Release DLL" (based on "Win32 (x86) Application")
+!MESSAGE "htmlzip - Win32 Debug DLL" (based on "Win32 (x86) Application")
+!MESSAGE "htmlzip - Win32 Release" (based on "Win32 (x86) Application")
+!MESSAGE "htmlzip - Win32 Debug" (based on "Win32 (x86) Application")
 !MESSAGE 
 
 # Begin Project
@@ -30,7 +30,7 @@ CPP=cl.exe
 MTL=midl.exe
 RSC=rc.exe
 
-!ELSEIF "$(CFG)" == "zip - Win32 Release DLL"
+!ELSEIF "$(CFG)" == "htmlzip - Win32 Release DLL"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -56,7 +56,7 @@ 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 comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /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 comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /machine:I386 ../../..\lib\wxmsw232.lib
 
-!ELSEIF "$(CFG)" == "zip - Win32 Debug DLL"
+!ELSEIF "$(CFG)" == "htmlzip - Win32 Debug DLL"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -82,7 +82,7 @@ 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 comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /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 comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ../../..\lib\wxmsw232d.lib
 
-!ELSEIF "$(CFG)" == "zip - Win32 Release"
+!ELSEIF "$(CFG)" == "htmlzip - Win32 Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -108,7 +108,7 @@ 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 comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /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 comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /machine:I386 ../../..\lib\zlib.lib ../../..\lib\regex.lib ../../..\lib\png.lib ../../..\lib\jpeg.lib ../../..\lib\tiff.lib ../../..\lib\wxmsw.lib
 
-!ELSEIF "$(CFG)" == "zip - Win32 Debug"
+!ELSEIF "$(CFG)" == "htmlzip - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -138,10 +138,10 @@ LINK32=link.exe
 
 # Begin Target
 
-# Name "zip - Win32 Release DLL"
-# Name "zip - Win32 Debug DLL"
-# Name "zip - Win32 Release"
-# Name "zip - Win32 Debug"
+# Name "htmlzip - Win32 Release DLL"
+# Name "htmlzip - Win32 Debug DLL"
+# Name "htmlzip - Win32 Release"
+# Name "htmlzip - Win32 Debug"
 # Begin Source File
 
 SOURCE=.\zip.cpp

diff --git a/samples/opengl/cube/cube.dsp b/samples/opengl/cube/cube.dsp
index b176c3e927c0bbac7316ae4e5e04442cedbf25de..a55e2258ff0d7945cb79ec77c5aa5e01dc650da6 100644 (file)
--- a/samples/opengl/cube/cube.dsp
+++ b/samples/opengl/cube/cube.dsp
@@ -1,10 +1,10 @@
-# Microsoft Developer Studio Project File - Name="cube" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="glcube" - Package Owner=<4>
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
 # TARGTYPE "Win32 (x86) Application" 0x0101
 
-CFG=cube - Win32 Debug
+CFG=glcube - Win32 Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
@@ -13,14 +13,14 @@ CFG=cube - Win32 Debug
 !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 "cube.mak" CFG="cube - Win32 Debug"
+!MESSAGE NMAKE /f "cube.mak" CFG="glcube - Win32 Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "cube - Win32 Release DLL" (based on "Win32 (x86) Application")
-!MESSAGE "cube - Win32 Debug DLL" (based on "Win32 (x86) Application")
-!MESSAGE "cube - Win32 Release" (based on "Win32 (x86) Application")
-!MESSAGE "cube - Win32 Debug" (based on "Win32 (x86) Application")
+!MESSAGE "glcube - Win32 Release DLL" (based on "Win32 (x86) Application")
+!MESSAGE "glcube - Win32 Debug DLL" (based on "Win32 (x86) Application")
+!MESSAGE "glcube - Win32 Release" (based on "Win32 (x86) Application")
+!MESSAGE "glcube - Win32 Debug" (based on "Win32 (x86) Application")
 !MESSAGE 
 
 # Begin Project
@@ -30,7 +30,7 @@ CPP=cl.exe
 MTL=midl.exe
 RSC=rc.exe
 
-!ELSEIF "$(CFG)" == "cube - Win32 Release DLL"
+!ELSEIF "$(CFG)" == "glcube - Win32 Release DLL"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -56,7 +56,7 @@ 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 comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /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 comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /machine:I386 ../../..\lib\wxmsw232.lib
 
-!ELSEIF "$(CFG)" == "cube - Win32 Debug DLL"
+!ELSEIF "$(CFG)" == "glcube - Win32 Debug DLL"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -82,7 +82,7 @@ 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 comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /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 comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ../../..\lib\wxmsw232d.lib
 
-!ELSEIF "$(CFG)" == "cube - Win32 Release"
+!ELSEIF "$(CFG)" == "glcube - Win32 Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -108,7 +108,7 @@ 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 comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /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 comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /machine:I386 ../../..\lib\zlib.lib ../../..\lib\regex.lib ../../..\lib\png.lib ../../..\lib\jpeg.lib ../../..\lib\tiff.lib ../../..\lib\wxmsw.lib
 
-!ELSEIF "$(CFG)" == "cube - Win32 Debug"
+!ELSEIF "$(CFG)" == "glcube - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -138,10 +138,10 @@ LINK32=link.exe
 
 # Begin Target
 
-# Name "cube - Win32 Release DLL"
-# Name "cube - Win32 Debug DLL"
-# Name "cube - Win32 Release"
-# Name "cube - Win32 Debug"
+# Name "glcube - Win32 Release DLL"
+# Name "glcube - Win32 Debug DLL"
+# Name "glcube - Win32 Release"
+# Name "glcube - Win32 Debug"
 # Begin Source File
 
 SOURCE=.\cube.cpp

diff --git a/samples/opengl/isosurf/isosurf.dsp b/samples/opengl/isosurf/isosurf.dsp
index 88e578a0b4c750639b57ff2b0c9d7db8f089f805..dab0164800a892074566e7344a65702bbae42c16 100644 (file)
--- a/samples/opengl/isosurf/isosurf.dsp
+++ b/samples/opengl/isosurf/isosurf.dsp
@@ -1,10 +1,10 @@
-# Microsoft Developer Studio Project File - Name="isosurf" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="glisosurf" - Package Owner=<4>
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
 # TARGTYPE "Win32 (x86) Application" 0x0101
 
-CFG=isosurf - Win32 Debug
+CFG=glisosurf - Win32 Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
@@ -13,14 +13,14 @@ CFG=isosurf - Win32 Debug
 !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 "isosurf.mak" CFG="isosurf - Win32 Debug"
+!MESSAGE NMAKE /f "isosurf.mak" CFG="glisosurf - Win32 Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "isosurf - Win32 Release DLL" (based on "Win32 (x86) Application")
-!MESSAGE "isosurf - Win32 Debug DLL" (based on "Win32 (x86) Application")
-!MESSAGE "isosurf - Win32 Release" (based on "Win32 (x86) Application")
-!MESSAGE "isosurf - Win32 Debug" (based on "Win32 (x86) Application")
+!MESSAGE "glisosurf - Win32 Release DLL" (based on "Win32 (x86) Application")
+!MESSAGE "glisosurf - Win32 Debug DLL" (based on "Win32 (x86) Application")
+!MESSAGE "glisosurf - Win32 Release" (based on "Win32 (x86) Application")
+!MESSAGE "glisosurf - Win32 Debug" (based on "Win32 (x86) Application")
 !MESSAGE 
 
 # Begin Project
@@ -30,7 +30,7 @@ CPP=cl.exe
 MTL=midl.exe
 RSC=rc.exe
 
-!ELSEIF "$(CFG)" == "isosurf - Win32 Release DLL"
+!ELSEIF "$(CFG)" == "glisosurf - Win32 Release DLL"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -56,7 +56,7 @@ 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 comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /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 comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /machine:I386 ../../..\lib\wxmsw232.lib
 
-!ELSEIF "$(CFG)" == "isosurf - Win32 Debug DLL"
+!ELSEIF "$(CFG)" == "glisosurf - Win32 Debug DLL"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -82,7 +82,7 @@ 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 comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /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 comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ../../..\lib\wxmsw232d.lib
 
-!ELSEIF "$(CFG)" == "isosurf - Win32 Release"
+!ELSEIF "$(CFG)" == "glisosurf - Win32 Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -108,7 +108,7 @@ 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 comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /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 comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /machine:I386 ../../..\lib\zlib.lib ../../..\lib\regex.lib ../../..\lib\png.lib ../../..\lib\jpeg.lib ../../..\lib\tiff.lib ../../..\lib\wxmsw.lib
 
-!ELSEIF "$(CFG)" == "isosurf - Win32 Debug"
+!ELSEIF "$(CFG)" == "glisosurf - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -138,10 +138,10 @@ LINK32=link.exe
 
 # Begin Target
 
-# Name "isosurf - Win32 Release DLL"
-# Name "isosurf - Win32 Debug DLL"
-# Name "isosurf - Win32 Release"
-# Name "isosurf - Win32 Debug"
+# Name "glisosurf - Win32 Release DLL"
+# Name "glisosurf - Win32 Debug DLL"
+# Name "glisosurf - Win32 Release"
+# Name "glisosurf - Win32 Debug"
 # Begin Source File
 
 SOURCE=.\isosurf.cpp

diff --git a/samples/opengl/penguin/penguin.dsp b/samples/opengl/penguin/penguin.dsp
index 71f1675c4bd71464bbb80492bbf9e06a97976b9a..3a7131d489724e2fb7bc01cce59393ba7f1b9207 100644 (file)
--- a/samples/opengl/penguin/penguin.dsp
+++ b/samples/opengl/penguin/penguin.dsp
@@ -1,10 +1,10 @@
-# Microsoft Developer Studio Project File - Name="penguin" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="glpenguin" - Package Owner=<4>
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
 # TARGTYPE "Win32 (x86) Application" 0x0101
 
-CFG=penguin - Win32 Debug
+CFG=glpenguin - Win32 Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
@@ -13,14 +13,14 @@ CFG=penguin - Win32 Debug
 !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 "penguin.mak" CFG="penguin - Win32 Debug"
+!MESSAGE NMAKE /f "penguin.mak" CFG="glpenguin - Win32 Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "penguin - Win32 Release DLL" (based on "Win32 (x86) Application")
-!MESSAGE "penguin - Win32 Debug DLL" (based on "Win32 (x86) Application")
-!MESSAGE "penguin - Win32 Release" (based on "Win32 (x86) Application")
-!MESSAGE "penguin - Win32 Debug" (based on "Win32 (x86) Application")
+!MESSAGE "glpenguin - Win32 Release DLL" (based on "Win32 (x86) Application")
+!MESSAGE "glpenguin - Win32 Debug DLL" (based on "Win32 (x86) Application")
+!MESSAGE "glpenguin - Win32 Release" (based on "Win32 (x86) Application")
+!MESSAGE "glpenguin - Win32 Debug" (based on "Win32 (x86) Application")
 !MESSAGE 
 
 # Begin Project
@@ -30,7 +30,7 @@ CPP=cl.exe
 MTL=midl.exe
 RSC=rc.exe
 
-!ELSEIF "$(CFG)" == "penguin - Win32 Release DLL"
+!ELSEIF "$(CFG)" == "glpenguin - Win32 Release DLL"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -56,7 +56,7 @@ 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 comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /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 comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /machine:I386 ../../..\lib\wxmsw232.lib
 
-!ELSEIF "$(CFG)" == "penguin - Win32 Debug DLL"
+!ELSEIF "$(CFG)" == "glpenguin - Win32 Debug DLL"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -82,7 +82,7 @@ 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 comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /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 comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ../../..\lib\wxmsw232d.lib
 
-!ELSEIF "$(CFG)" == "penguin - Win32 Release"
+!ELSEIF "$(CFG)" == "glpenguin - Win32 Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -108,7 +108,7 @@ 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 comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /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 comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /machine:I386 ../../..\lib\zlib.lib ../../..\lib\regex.lib ../../..\lib\png.lib ../../..\lib\jpeg.lib ../../..\lib\tiff.lib ../../..\lib\wxmsw.lib
 
-!ELSEIF "$(CFG)" == "penguin - Win32 Debug"
+!ELSEIF "$(CFG)" == "glpenguin - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -138,10 +138,10 @@ LINK32=link.exe
 
 # Begin Target
 
-# Name "penguin - Win32 Release DLL"
-# Name "penguin - Win32 Debug DLL"
-# Name "penguin - Win32 Release"
-# Name "penguin - Win32 Debug"
+# Name "glpenguin - Win32 Release DLL"
+# Name "glpenguin - Win32 Debug DLL"
+# Name "glpenguin - Win32 Release"
+# Name "glpenguin - Win32 Debug"
 # Begin Source File
 
 SOURCE=.\penguin.cpp