Applied patch #15286: documentation and col/rowspan demo by dghart

[wxWidgets.git] / samples / dll / dll_sdk_exe.dsp

diff --git a/samples/dll/dll_sdk_exe.dsp b/samples/dll/dll_sdk_exe.dsp
index c54487e7f88067cd464dce2314743937585a85fa..c31f0f7ad0eff84178d910ab041f0dbaa729be11 100644 (file)
--- a/samples/dll/dll_sdk_exe.dsp
+++ b/samples/dll/dll_sdk_exe.dsp
@@ -17,12 +17,8 @@ CFG=sdk_exe - Win32 Debug
 !MESSAGE \r
 !MESSAGE Possible choices for configuration are:\r
 !MESSAGE \r
-!MESSAGE "sdk_exe - Win32 DLL Universal Release" (based on "Win32 (x86) Application")\r
-!MESSAGE "sdk_exe - Win32 DLL Universal Debug" (based on "Win32 (x86) Application")\r
 !MESSAGE "sdk_exe - Win32 DLL Release" (based on "Win32 (x86) Application")\r
 !MESSAGE "sdk_exe - Win32 DLL Debug" (based on "Win32 (x86) Application")\r
-!MESSAGE "sdk_exe - Win32 Universal Release" (based on "Win32 (x86) Application")\r
-!MESSAGE "sdk_exe - Win32 Universal Debug" (based on "Win32 (x86) Application")\r
 !MESSAGE "sdk_exe - Win32 Release" (based on "Win32 (x86) Application")\r
 !MESSAGE "sdk_exe - Win32 Debug" (based on "Win32 (x86) Application")\r
 !MESSAGE \r
@@ -35,57 +31,7 @@ CPP=cl.exe
 MTL=midl.exe\r
 RSC=rc.exe\r
 \r
-!IF  "$(CFG)" == "sdk_exe - Win32 DLL Universal Release"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "vc_mswunivudll"\r
-# PROP BASE Intermediate_Dir "vc_mswunivudll\sdk_exe"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "vc_mswunivudll"\r
-# PROP Intermediate_Dir "vc_mswunivudll\sdk_exe"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /W1 /Zi /Fdvc_mswunivudll\sdk_exe.pdb /opt:ref /opt:icf /O2 /GR /EHsc /D "WIN32" /D "_WINDOWS" /c\r
-# ADD CPP /nologo /FD /MD /W1 /Zi /Fdvc_mswunivudll\sdk_exe.pdb /opt:ref /opt:icf /O2 /GR /EHsc /D "WIN32" /D "_WINDOWS" /c\r
-# ADD BASE MTL /nologo /D "WIN32" /D "_WINDOWS" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "WIN32" /D "_WINDOWS" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d _WINDOWS\r
-# ADD RSC /l 0x409 /d _WINDOWS\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 vc_mswunivudll\my_dll.lib user32.lib /nologo /machine:i386 /out:"vc_mswunivudll\sdk_exe.exe" /debug /pdb:"vc_mswunivudll\sdk_exe.pdb" /subsystem:windows\r
-# ADD LINK32 vc_mswunivudll\my_dll.lib user32.lib /nologo /machine:i386 /out:"vc_mswunivudll\sdk_exe.exe" /debug /pdb:"vc_mswunivudll\sdk_exe.pdb" /subsystem:windows\r
-\r
-!ELSEIF  "$(CFG)" == "sdk_exe - Win32 DLL Universal Debug"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "vc_mswunivuddll"\r
-# PROP BASE Intermediate_Dir "vc_mswunivuddll\sdk_exe"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "vc_mswunivuddll"\r
-# PROP Intermediate_Dir "vc_mswunivuddll\sdk_exe"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /W1 /Zi /Fdvc_mswunivuddll\sdk_exe.pdb /Od /Gm /GR /EHsc /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /c\r
-# ADD CPP /nologo /FD /MDd /W1 /Zi /Fdvc_mswunivuddll\sdk_exe.pdb /Od /Gm /GR /EHsc /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /c\r
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d _WINDOWS\r
-# ADD RSC /l 0x409 /d "_DEBUG" /d _WINDOWS\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 vc_mswunivuddll\my_dll.lib user32.lib /nologo /machine:i386 /out:"vc_mswunivuddll\sdk_exe.exe" /debug /pdb:"vc_mswunivuddll\sdk_exe.pdb" /subsystem:windows\r
-# ADD LINK32 vc_mswunivuddll\my_dll.lib user32.lib /nologo /machine:i386 /out:"vc_mswunivuddll\sdk_exe.exe" /debug /pdb:"vc_mswunivuddll\sdk_exe.pdb" /subsystem:windows\r
-\r
-!ELSEIF  "$(CFG)" == "sdk_exe - Win32 DLL Release"\r
+!IF  "$(CFG)" == "sdk_exe - Win32 DLL Release"
 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 1\r
@@ -135,56 +81,6 @@ LINK32=link.exe
 # ADD BASE LINK32 vc_mswuddll\my_dll.lib user32.lib /nologo /machine:i386 /out:"vc_mswuddll\sdk_exe.exe" /debug /pdb:"vc_mswuddll\sdk_exe.pdb" /subsystem:windows\r
 # ADD LINK32 vc_mswuddll\my_dll.lib user32.lib /nologo /machine:i386 /out:"vc_mswuddll\sdk_exe.exe" /debug /pdb:"vc_mswuddll\sdk_exe.pdb" /subsystem:windows\r
 \r
-!ELSEIF  "$(CFG)" == "sdk_exe - Win32 Universal Release"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "vc_mswunivu"\r
-# PROP BASE Intermediate_Dir "vc_mswunivu\sdk_exe"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "vc_mswunivu"\r
-# PROP Intermediate_Dir "vc_mswunivu\sdk_exe"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /W1 /Zi /Fdvc_mswunivu\sdk_exe.pdb /opt:ref /opt:icf /O2 /GR /EHsc /D "WIN32" /D "_WINDOWS" /c\r
-# ADD CPP /nologo /FD /MD /W1 /Zi /Fdvc_mswunivu\sdk_exe.pdb /opt:ref /opt:icf /O2 /GR /EHsc /D "WIN32" /D "_WINDOWS" /c\r
-# ADD BASE MTL /nologo /D "WIN32" /D "_WINDOWS" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "WIN32" /D "_WINDOWS" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d _WINDOWS\r
-# ADD RSC /l 0x409 /d _WINDOWS\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 vc_mswunivu\my_dll.lib user32.lib /nologo /machine:i386 /out:"vc_mswunivu\sdk_exe.exe" /debug /pdb:"vc_mswunivu\sdk_exe.pdb" /subsystem:windows\r
-# ADD LINK32 vc_mswunivu\my_dll.lib user32.lib /nologo /machine:i386 /out:"vc_mswunivu\sdk_exe.exe" /debug /pdb:"vc_mswunivu\sdk_exe.pdb" /subsystem:windows\r
-\r
-!ELSEIF  "$(CFG)" == "sdk_exe - Win32 Universal Debug"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "vc_mswunivud"\r
-# PROP BASE Intermediate_Dir "vc_mswunivud\sdk_exe"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "vc_mswunivud"\r
-# PROP Intermediate_Dir "vc_mswunivud\sdk_exe"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /W1 /Zi /Fdvc_mswunivud\sdk_exe.pdb /Od /Gm /GR /EHsc /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /c\r
-# ADD CPP /nologo /FD /MDd /W1 /Zi /Fdvc_mswunivud\sdk_exe.pdb /Od /Gm /GR /EHsc /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /c\r
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d _WINDOWS\r
-# ADD RSC /l 0x409 /d "_DEBUG" /d _WINDOWS\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 vc_mswunivud\my_dll.lib user32.lib /nologo /machine:i386 /out:"vc_mswunivud\sdk_exe.exe" /debug /pdb:"vc_mswunivud\sdk_exe.pdb" /subsystem:windows\r
-# ADD LINK32 vc_mswunivud\my_dll.lib user32.lib /nologo /machine:i386 /out:"vc_mswunivud\sdk_exe.exe" /debug /pdb:"vc_mswunivud\sdk_exe.pdb" /subsystem:windows\r
-\r
 !ELSEIF  "$(CFG)" == "sdk_exe - Win32 Release"\r
 \r
 # PROP BASE Use_MFC 0\r
@@ -239,12 +135,8 @@ LINK32=link.exe
 \r
 # Begin Target\r
 \r
-# Name "sdk_exe - Win32 DLL Universal Release"\r
-# Name "sdk_exe - Win32 DLL Universal Debug"\r
 # Name "sdk_exe - Win32 DLL Release"\r
 # Name "sdk_exe - Win32 DLL Debug"\r
-# Name "sdk_exe - Win32 Universal Release"\r
-# Name "sdk_exe - Win32 Universal Debug"\r
 # Name "sdk_exe - Win32 Release"\r
 # Name "sdk_exe - Win32 Debug"\r
 # Begin Group "Source Files"\r