post wxUniv merge fixes

[wxWidgets.git] / src / wxvc_dll.dsp

diff --git a/src/wxvc_dll.dsp b/src/wxvc_dll.dsp
index 4a27409903d1d9a87d8ffd4f2b32fd95be27095e..8a2930ead72cd170a514c9701adbd752bde6dd02 100644 (file)
--- a/src/wxvc_dll.dsp
+++ b/src/wxvc_dll.dsp
@@ -7,19 +7,19 @@
 CFG=wxvc_dll - Win32 Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
-!MESSAGE
+!MESSAGE 
 !MESSAGE NMAKE /f "wxvc_dll.mak".
-!MESSAGE
+!MESSAGE 
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
+!MESSAGE 
 !MESSAGE NMAKE /f "wxvc_dll.mak" CFG="wxvc_dll - Win32 Debug"
-!MESSAGE
+!MESSAGE 
 !MESSAGE Possible choices for configuration are:
-!MESSAGE
+!MESSAGE 
 !MESSAGE "wxvc_dll - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
 !MESSAGE "wxvc_dll - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE
+!MESSAGE 
 
 # Begin Project
 # PROP AllowPerConfigDependencies 0
@@ -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 /nologo /subsystem:windows /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comctl32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib rpcrt4.lib winmm.lib opengl32.lib glu32.lib /nologo /subsystem:windows /dll /machine:I386 /out:"../lib/wx23_1.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comctl32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib rpcrt4.lib winmm.lib opengl32.lib glu32.lib /nologo /subsystem:windows /dll /machine:I386 /out:"../lib/wx23_2.dll"
 
 !ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
@@ -79,9 +79,9 @@ 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 /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comctl32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib rpcrt4.lib winmm.lib opengl32.lib glu32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"../lib/wx23_1d.dll" /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comctl32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib rpcrt4.lib winmm.lib opengl32.lib glu32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"../lib/wx23_2d.dll" /pdbtype:sept
 
-!ENDIF
+!ENDIF 
 
 # Begin Target
 
@@ -108,6 +108,10 @@ SOURCE=.\common\cmdline.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\common\cmdproc.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\common\cmndata.cpp
 # End Source File
 # Begin Source File
@@ -256,6 +260,10 @@ SOURCE=.\common\ftp.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\common\gaugecmn.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\common\gdicmn.cpp
 # End Source File
 # Begin Source File
@@ -375,6 +383,10 @@ SOURCE=.\common\mstream.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\common\nbkbase.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\common\object.cpp
 # End Source File
 # Begin Source File
@@ -411,6 +423,11 @@ SOURCE=.\common\radiocmn.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\common\regex.cpp
+# ADD CPP /I "regex"
+# End Source File
+# Begin Source File
+
 SOURCE=.\common\resourc2.cpp
 # End Source File
 # Begin Source File
@@ -459,6 +476,10 @@ SOURCE=.\common\string.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\common\sysopt.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\common\tbarbase.cpp
 # End Source File
 # Begin Source File
@@ -626,7 +647,7 @@ SOURCE=.\generic\sashwin.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\generic\scrolwin.cpp
+SOURCE=.\generic\scrlwing.cpp
 # End Source File
 # Begin Source File
 
@@ -1391,7 +1412,7 @@ SOURCE=.\jpeg\jcapimin.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF
+!ENDIF 
 
 # End Source File
 # Begin Source File
@@ -1408,7 +1429,7 @@ SOURCE=.\jpeg\jcapistd.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF
+!ENDIF 
 
 # End Source File
 # Begin Source File
@@ -1425,7 +1446,7 @@ SOURCE=.\jpeg\jccoefct.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF
+!ENDIF 
 
 # End Source File
 # Begin Source File
@@ -1442,7 +1463,7 @@ SOURCE=.\jpeg\jccolor.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF
+!ENDIF 
 
 # End Source File
 # Begin Source File
@@ -1459,7 +1480,7 @@ SOURCE=.\jpeg\jcdctmgr.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF
+!ENDIF 
 
 # End Source File
 # Begin Source File
@@ -1476,7 +1497,7 @@ SOURCE=.\jpeg\jchuff.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF
+!ENDIF 
 
 # End Source File
 # Begin Source File
@@ -1493,7 +1514,7 @@ SOURCE=.\jpeg\jcinit.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF
+!ENDIF 
 
 # End Source File
 # Begin Source File
@@ -1510,7 +1531,7 @@ SOURCE=.\jpeg\jcmainct.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF
+!ENDIF 
 
 # End Source File
 # Begin Source File
@@ -1527,7 +1548,7 @@ SOURCE=.\jpeg\jcmarker.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF
+!ENDIF 
 
 # End Source File
 # Begin Source File
@@ -1544,7 +1565,7 @@ SOURCE=.\jpeg\jcmaster.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF
+!ENDIF 
 
 # End Source File
 # Begin Source File
@@ -1561,7 +1582,7 @@ SOURCE=.\jpeg\jcomapi.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF
+!ENDIF 
 
 # End Source File
 # Begin Source File
@@ -1578,7 +1599,7 @@ SOURCE=.\jpeg\jcparam.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF
+!ENDIF 
 
 # End Source File
 # Begin Source File
@@ -1595,7 +1616,7 @@ SOURCE=.\jpeg\jcphuff.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF
+!ENDIF 
 
 # End Source File
 # Begin Source File
@@ -1612,7 +1633,7 @@ SOURCE=.\jpeg\jcprepct.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF
+!ENDIF 
 
 # End Source File
 # Begin Source File
@@ -1629,7 +1650,7 @@ SOURCE=.\jpeg\jcsample.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF
+!ENDIF 
 
 # End Source File
 # Begin Source File
@@ -1646,7 +1667,7 @@ SOURCE=.\jpeg\jctrans.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF
+!ENDIF 
 
 # End Source File
 # Begin Source File
@@ -1663,7 +1684,7 @@ SOURCE=.\jpeg\jdapimin.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF
+!ENDIF 
 
 # End Source File
 # Begin Source File
@@ -1680,7 +1701,7 @@ SOURCE=.\jpeg\jdapistd.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF
+!ENDIF 
 
 # End Source File
 # Begin Source File
@@ -1697,7 +1718,7 @@ SOURCE=.\jpeg\jdatadst.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF
+!ENDIF 
 
 # End Source File
 # Begin Source File
@@ -1714,7 +1735,7 @@ SOURCE=.\jpeg\jdatasrc.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF
+!ENDIF 
 
 # End Source File
 # Begin Source File
@@ -1731,7 +1752,7 @@ SOURCE=.\jpeg\jdcoefct.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF
+!ENDIF 
 
 # End Source File
 # Begin Source File
@@ -1748,7 +1769,7 @@ SOURCE=.\jpeg\jdcolor.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF
+!ENDIF 
 
 # End Source File
 # Begin Source File
@@ -1765,7 +1786,7 @@ SOURCE=.\jpeg\jddctmgr.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF
+!ENDIF 
 
 # End Source File
 # Begin Source File
@@ -1782,7 +1803,7 @@ SOURCE=.\jpeg\jdhuff.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF
+!ENDIF 
 
 # End Source File
 # Begin Source File
@@ -1799,7 +1820,7 @@ SOURCE=.\jpeg\jdinput.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF
+!ENDIF 
 
 # End Source File
 # Begin Source File
@@ -1816,7 +1837,7 @@ SOURCE=.\jpeg\jdmainct.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF
+!ENDIF 
 
 # End Source File
 # Begin Source File
@@ -1833,7 +1854,7 @@ SOURCE=.\jpeg\jdmarker.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF
+!ENDIF 
 
 # End Source File
 # Begin Source File
@@ -1850,7 +1871,7 @@ SOURCE=.\jpeg\jdmaster.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF
+!ENDIF 
 
 # End Source File
 # Begin Source File
@@ -1867,7 +1888,7 @@ SOURCE=.\jpeg\jdmerge.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF
+!ENDIF 
 
 # End Source File
 # Begin Source File
@@ -1884,7 +1905,7 @@ SOURCE=.\jpeg\jdphuff.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF
+!ENDIF 
 
 # End Source File
 # Begin Source File
@@ -1901,7 +1922,7 @@ SOURCE=.\jpeg\jdpostct.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF
+!ENDIF 
 
 # End Source File
 # Begin Source File
@@ -1918,7 +1939,7 @@ SOURCE=.\jpeg\jdsample.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF
+!ENDIF 
 
 # End Source File
 # Begin Source File
@@ -1935,7 +1956,7 @@ SOURCE=.\jpeg\jdtrans.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF
+!ENDIF 
 
 # End Source File
 # Begin Source File
@@ -1952,7 +1973,7 @@ SOURCE=.\jpeg\jerror.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF
+!ENDIF 
 
 # End Source File
 # Begin Source File
@@ -1969,7 +1990,7 @@ SOURCE=.\jpeg\jfdctflt.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF
+!ENDIF 
 
 # End Source File
 # Begin Source File
@@ -1986,7 +2007,7 @@ SOURCE=.\jpeg\jfdctfst.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF
+!ENDIF 
 
 # End Source File
 # Begin Source File
@@ -2003,7 +2024,7 @@ SOURCE=.\jpeg\jfdctint.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF
+!ENDIF 
 
 # End Source File
 # Begin Source File
@@ -2020,7 +2041,7 @@ SOURCE=.\jpeg\jidctflt.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF
+!ENDIF 
 
 # End Source File
 # Begin Source File
@@ -2037,7 +2058,7 @@ SOURCE=.\jpeg\jidctfst.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF
+!ENDIF 
 
 # End Source File
 # Begin Source File
@@ -2054,7 +2075,7 @@ SOURCE=.\jpeg\jidctint.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF
+!ENDIF 
 
 # End Source File
 # Begin Source File
@@ -2071,7 +2092,7 @@ SOURCE=.\jpeg\jidctred.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF
+!ENDIF 
 
 # End Source File
 # Begin Source File
@@ -2088,7 +2109,7 @@ SOURCE=.\jpeg\jmemmgr.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF
+!ENDIF 
 
 # End Source File
 # Begin Source File
@@ -2105,7 +2126,7 @@ SOURCE=.\jpeg\jmemnobs.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF
+!ENDIF 
 
 # End Source File
 # Begin Source File
@@ -2122,7 +2143,7 @@ SOURCE=.\jpeg\jquant1.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF
+!ENDIF 
 
 # End Source File
 # Begin Source File
@@ -2139,7 +2160,7 @@ SOURCE=.\jpeg\jquant2.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF
+!ENDIF 
 
 # End Source File
 # Begin Source File
@@ -2156,7 +2177,7 @@ SOURCE=.\jpeg\jutils.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF
+!ENDIF 
 
 # End Source File
 # End Group
@@ -2362,5 +2383,34 @@ SOURCE=.\tiff\tif_zip.c
 # SUBTRACT CPP /YX /Yc /Yu
 # End Source File
 # End Group
+# Begin Group "Regex Files"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\regex\regcomp.c
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
+SOURCE=.\regex\regerror.c
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
+SOURCE=.\regex\regexec.c
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
+SOURCE=.\regex\regfree.c
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
+SOURCE=.\regex\split.c
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# End Group
 # End Target
 # End Project