changed html and opengl project names to start with html/gl prefix to avoid conflicts...

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

diff --git a/samples/html/about/about.pro b/samples/html/about/about.pro
index 8ad64b57aaf97dec9e2cd6296eee3b1637027b3f..61288e2aafd23c08778b37738c9aad4820e65648 100644 (file)
--- a/samples/html/about/about.pro
+++ b/samples/html/about/about.pro
@@ -18,4 +18,4 @@ WXDIR=../../..
 # project files
 SOURCES = about.cpp
 RC_FILE = about.rc
-TARGET  = about
+TARGET  = htmlabout

diff --git a/samples/html/help/help.dsp b/samples/html/help/help.dsp
index 3f02403efc9fcf317f827edbd146c7c932b52f79..528a61880f60805eb1bf793a05241e6389e5c122 100644 (file)
--- a/samples/html/help/help.dsp
+++ b/samples/html/help/help.dsp
@@ -1,10 +1,10 @@
-# Microsoft Developer Studio Project File - Name="help" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="htmlhelp" - Package Owner=<4>
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
 # TARGTYPE "Win32 (x86) Application" 0x0101
 
-CFG=help - Win32 Debug
+CFG=htmlhelp - 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=help - 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 "help.mak" CFG="help - Win32 Debug"
+!MESSAGE NMAKE /f "help.mak" CFG="htmlhelp - Win32 Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "help - Win32 Release DLL" (based on "Win32 (x86) Application")
-!MESSAGE "help - Win32 Debug DLL" (based on "Win32 (x86) Application")
-!MESSAGE "help - Win32 Release" (based on "Win32 (x86) Application")
-!MESSAGE "help - Win32 Debug" (based on "Win32 (x86) Application")
+!MESSAGE "htmlhelp - Win32 Release DLL" (based on "Win32 (x86) Application")
+!MESSAGE "htmlhelp - Win32 Debug DLL" (based on "Win32 (x86) Application")
+!MESSAGE "htmlhelp - Win32 Release" (based on "Win32 (x86) Application")
+!MESSAGE "htmlhelp - 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)" == "help - Win32 Release DLL"
+!ELSEIF "$(CFG)" == "htmlhelp - Win32 Release DLL"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -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
@@ -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)" == "help - Win32 Debug DLL"
+!ELSEIF "$(CFG)" == "htmlhelp - Win32 Debug DLL"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -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
@@ -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)" == "help - Win32 Release"
+!ELSEIF "$(CFG)" == "htmlhelp - Win32 Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -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
@@ -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)" == "help - Win32 Debug"
+!ELSEIF "$(CFG)" == "htmlhelp - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -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
@@ -138,10 +138,10 @@ LINK32=link.exe
 
 # Begin Target
 
-# Name "help - Win32 Release DLL"
-# Name "help - Win32 Debug DLL"
-# Name "help - Win32 Release"
-# Name "help - Win32 Debug"
+# Name "htmlhelp - Win32 Release DLL"
+# Name "htmlhelp - Win32 Debug DLL"
+# Name "htmlhelp - Win32 Release"
+# Name "htmlhelp - Win32 Debug"
 # Begin Source File
 
 SOURCE=.\help.cpp

diff --git a/samples/html/help/help.pro b/samples/html/help/help.pro
index ca499eae614326ad39b3599b256fb22faca85e73..53305b1aa03ef5cb0a07419cdd51bea59d550f2b 100644 (file)
--- a/samples/html/help/help.pro
+++ b/samples/html/help/help.pro
@@ -1,4 +1,4 @@
-# this is the project file for the help wxWindows sample
+# this is the project file for the html/help wxWindows sample
 
 # we generate the VC++ IDE project file, comment this line
 # to generate a makefile for (n)make
@@ -18,4 +18,4 @@ WXDIR=../../..
 # project files
 SOURCES = help.cpp
 RC_FILE = help.rc
-TARGET  = help
+TARGET  = htmlhelp

diff --git a/samples/html/helpview/helpview.pro b/samples/html/helpview/helpview.pro
index 7c10a1b0b31fbc8f2e7a15ce19464cdf19f385fb..003c860e5c490f59e24d7fabe70d4013a36653ef 100644 (file)
--- a/samples/html/helpview/helpview.pro
+++ b/samples/html/helpview/helpview.pro
@@ -18,4 +18,4 @@ WXDIR=../../..
 # project files
 SOURCES = helpview.cpp
 RC_FILE = helpview.rc
-TARGET  = helpview
+TARGET  = htmlhelpview

diff --git a/samples/html/printing/printing.pro b/samples/html/printing/printing.pro
index 604933caaf5d215f6e34fa37b92e5adc8a2a4748..e4866a3f0caad7cce1620a76aec857f46e4f33c5 100644 (file)
--- a/samples/html/printing/printing.pro
+++ b/samples/html/printing/printing.pro
@@ -18,4 +18,4 @@ WXDIR=../../..
 # project files
 SOURCES = printing.cpp
 RC_FILE = printing.rc
-TARGET  = printing
+TARGET  = htmlprinting

diff --git a/samples/html/test/test.pro b/samples/html/test/test.pro
index 9fd9ea646b14ca012d7782fc07ca921e5357918c..f8339320f9ad6a3ae8b9b11c8ab4880f4e026915 100644 (file)
--- a/samples/html/test/test.pro
+++ b/samples/html/test/test.pro
@@ -18,4 +18,4 @@ WXDIR=../../..
 # project files
 SOURCES = test.cpp
 RC_FILE = test.rc
-TARGET  = test
+TARGET  = htmltest

diff --git a/samples/html/virtual/virtual.pro b/samples/html/virtual/virtual.pro
index cc21a4e5957f4ccf8facc7feb6914fb571a3b4b9..ca698032feba25b35efe37e54dbd9b6a4c50696d 100644 (file)
--- a/samples/html/virtual/virtual.pro
+++ b/samples/html/virtual/virtual.pro
@@ -18,4 +18,4 @@ WXDIR=../../..
 # project files
 SOURCES = virtual.cpp
 RC_FILE = virtual.rc
-TARGET  = virtual
+TARGET  = htmlvirtual

diff --git a/samples/html/widget/widget.pro b/samples/html/widget/widget.pro
index ef258ce128c293bcef74006cf0a1675c384bd646..33f4c123381d5927e3929d026664566dd05f8262 100644 (file)
--- a/samples/html/widget/widget.pro
+++ b/samples/html/widget/widget.pro
@@ -18,4 +18,4 @@ WXDIR=../../..
 # project files
 SOURCES = widget.cpp
 RC_FILE = widget.rc
-TARGET  = widget
+TARGET  = htmlwidget

diff --git a/samples/html/zip/zip.pro b/samples/html/zip/zip.pro
index 32d9bba6810d3ee7f29ed80eb0e29a007aca4143..caa48169144847d46df90e259c3f41ead5b7ae33 100644 (file)
--- a/samples/html/zip/zip.pro
+++ b/samples/html/zip/zip.pro
@@ -18,4 +18,4 @@ WXDIR=../../..
 # project files
 SOURCES = zip.cpp
 RC_FILE = zip.rc
-TARGET  = zip
+TARGET  = htmlzip

diff --git a/samples/opengl/cube/cube.pro b/samples/opengl/cube/cube.pro
index d5699a86c0545f06053ac8604f861695f4cc3709..fa852e50a7cc54fe2b3be3a9990b69c113384664 100644 (file)
--- a/samples/opengl/cube/cube.pro
+++ b/samples/opengl/cube/cube.pro
@@ -1,4 +1,4 @@
-# this is the project file for the cube wxWindows sample
+# this is the project file for the opengl/cube wxWindows sample
 
 # we generate the VC++ IDE project file, comment this line
 # to generate a makefile for (n)make
@@ -18,4 +18,4 @@ WXDIR=../../..
 # project files
 SOURCES = cube.cpp
 RC_FILE = cube.rc
-TARGET  = cube
+TARGET  = glcube

diff --git a/samples/opengl/isosurf/isosurf.pro b/samples/opengl/isosurf/isosurf.pro
index 71797d8e56c34b2d9424f631d72e13277dac26ba..bb731088d20f418e96772d65c1a8187c8481595b 100644 (file)
--- a/samples/opengl/isosurf/isosurf.pro
+++ b/samples/opengl/isosurf/isosurf.pro
@@ -1,4 +1,4 @@
-# this is the project file for the isosurf wxWindows sample
+# this is the project file for the opengl/isosurf wxWindows sample
 
 # we generate the VC++ IDE project file, comment this line
 # to generate a makefile for (n)make
@@ -18,4 +18,4 @@ WXDIR=../../..
 # project files
 SOURCES = isosurf.cpp
 RC_FILE = isosurf.rc
-TARGET  = isosurf
+TARGET  = glisosurf

diff --git a/samples/opengl/penguin/penguin.pro b/samples/opengl/penguin/penguin.pro
index edde84da01db632828a3ea7420dc5d204dabc15a..321d8c71244494ac04593665a8f25b1d7753e117 100644 (file)
--- a/samples/opengl/penguin/penguin.pro
+++ b/samples/opengl/penguin/penguin.pro
@@ -1,4 +1,4 @@
-# this is the project file for the penguin wxWindows sample
+# this is the project file for the opengl/penguin wxWindows sample
 
 # we generate the VC++ IDE project file, comment this line
 # to generate a makefile for (n)make
@@ -18,4 +18,4 @@ WXDIR=../../..
 # project files
 SOURCES = penguin.cpp
 RC_FILE = penguin.rc
-TARGET  = penguin
+TARGET  = glpenguin