Added Release Unicode DLL and Debug Unicode DLL (identical

to non-DLL configurations) in order to get appropriate
regex configuration compiled when wxWindows is compiled via
wxWindows.dsw. Closes bug 877037.

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

diff --git a/src/regex/regex.dsp b/src/regex/regex.dsp
index 5457afb921f64f0f3daa8c132671659d1a60dd0a..eb9ab413cf5d6f742b259c6791afc48b54e8e4fc 100644 (file)
--- a/src/regex/regex.dsp
+++ b/src/regex/regex.dsp
@@ -4,7 +4,7 @@
 
 # TARGTYPE "Win32 (x86) Static Library" 0x0104
 
-CFG=regex - Win32 Debug Unicode
+CFG=regex - Win32 Debug Unicode DLL
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
@@ -13,7 +13,7 @@ CFG=regex - Win32 Debug Unicode
 !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 "regex.mak" CFG="regex - Win32 Debug Unicode"
+!MESSAGE NMAKE /f "regex.mak" CFG="regex - Win32 Debug Unicode DLL"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
@@ -22,6 +22,8 @@ CFG=regex - Win32 Debug Unicode
 !MESSAGE "regex - Win32 Release Unicode" (based on "Win32 (x86) Static Library")
 !MESSAGE "regex - Win32 Debug Unicode" (based on "Win32 (x86) Static Library")
 !MESSAGE "regex - Win32 Release With Debug Info" (based on "Win32 (x86) Static Library")
+!MESSAGE "regex - Win32 Debug Unicode DLL" (based on "Win32 (x86) Static Library")
+!MESSAGE "regex - Win32 Release Unicode DLL" (based on "Win32 (x86) Static Library")
 !MESSAGE 
 
 # Begin Project
@@ -148,6 +150,52 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\regex.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\regex.lib"
 
+!ELSEIF  "$(CFG)" == "regex - Win32 Debug Unicode DLL"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "regex___Win32_Debug_Unicode_DLL"
+# PROP BASE Intermediate_Dir "regex___Win32_Debug_Unicode_DLL"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "regex___Win32_Debug_Unicode_DLL"
+# PROP Intermediate_Dir "regex___Win32_Debug_Unicode_DLL"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MDd /W4 /Gm /Zi /Od /I "." /I "../lib/mswud" /I "../../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "_UNICODE" /D "UNICODE" /D "wxUSE_UNICODE" /D "__WXMSW__" /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W4 /Gm /Zi /Od /I "." /I "../lib/mswud" /I "../../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "_UNICODE" /D "UNICODE" /D "wxUSE_UNICODE" /D "__WXMSW__" /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /YX /FD /GZ /c
+# ADD BASE RSC /l 0x809 /d "_DEBUG"
+# ADD RSC /l 0x809 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\regexud.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\regexud.lib"
+
+!ELSEIF  "$(CFG)" == "regex - Win32 Release Unicode DLL"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "regex___Win32_Release_Unicode_DLL"
+# PROP BASE Intermediate_Dir "regex___Win32_Release_Unicode_DLL"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "regex___Win32_Release_Unicode_DLL"
+# PROP Intermediate_Dir "regex___Win32_Release_Unicode_DLL"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MD /W4 /O1 /I "." /I "../lib/mswu" /I "../../include" /D "WIN32" /D "_WINDOWS" /D "_UNICODE" /D "UNICODE" /D "wxUSE_UNICODE" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c
+# ADD CPP /nologo /MD /W4 /O1 /I "." /I "../lib/mswu" /I "../../include" /D "WIN32" /D "_WINDOWS" /D "_UNICODE" /D "UNICODE" /D "wxUSE_UNICODE" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c
+# ADD BASE RSC /l 0x809 /d "NDEBUG"
+# ADD RSC /l 0x809 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\regexu.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\regexu.lib"
+
 !ENDIF 
 
 # Begin Target
@@ -157,6 +205,8 @@ LIB32=link.exe -lib
 # Name "regex - Win32 Release Unicode"
 # Name "regex - Win32 Debug Unicode"
 # Name "regex - Win32 Release With Debug Info"
+# Name "regex - Win32 Debug Unicode DLL"
+# Name "regex - Win32 Release Unicode DLL"
 # Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
@@ -233,7 +283,7 @@ InputPath=..\..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "regex - Win32 Debug Unicode"
 
 # Begin Custom Build - Creating ..\lib\mswud\wx\setup.h from $(InputPath)
-InputPath=..\..\include\wx\mswud\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "../lib/mswud/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
        copy "$(InputPath)" ..\lib\mswud\wx\setup.h
@@ -250,6 +300,26 @@ InputPath=..\..\include\wx\msw\setup.h
 
 # End Custom Build
 
+!ELSEIF  "$(CFG)" == "regex - Win32 Debug Unicode DLL"
+
+# Begin Custom Build - Creating ..\lib\mswud\wx\setup.h from $(InputPath)
+InputPath=..\..\include\wx\msw\setup.h
+
+"../lib/mswud/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy "$(InputPath)" ..\lib\mswud\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "regex - Win32 Release Unicode DLL"
+
+# Begin Custom Build - Creating ..\lib\mswu\wx\setup.h from $(InputPath)
+InputPath=..\..\include\wx\msw\setup.h
+
+"../lib/mswu/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy "$(InputPath)" ..\lib\mswu\wx\setup.h
+
+# End Custom Build
+
 !ENDIF 
 
 # End Source File