post wxUniv merge fixes

[wxWidgets.git] / src / wxvc.dsp

diff --git a/src/wxvc.dsp b/src/wxvc.dsp
index daed614725bc9d7817aed40737d27665d2056ff2..763b35aeed311c3f75003688f25a89094795f569 100644 (file)
--- a/src/wxvc.dsp
+++ b/src/wxvc.dsp
@@ -23,8 +23,8 @@ CFG=wxvc - Win32 Debug
 
 # Begin Project
 # PROP AllowPerConfigDependencies 0
 
 # Begin Project
 # PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
+# PROP Scc_ProjName "wxvc"
+# PROP Scc_LocalPath ".."

 CPP=cl.exe
 RSC=rc.exe
 
 CPP=cl.exe
 RSC=rc.exe
 


@@ -41,7 +41,7 @@ RSC=rc.exe
 # PROP Intermediate_Dir "msw/Release"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
 # PROP Intermediate_Dir "msw/Release"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /Yu"wx/wxprec.h" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../include" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /Yu"wx/wxprec.h" /FD /c

 # ADD BASE RSC /l 0x809
 # ADD RSC /l 0x809
 BSC32=bscmake.exe
 # ADD BASE RSC /l 0x809
 # ADD RSC /l 0x809
 BSC32=bscmake.exe


@@ -97,6 +97,14 @@ SOURCE=.\common\clipcmn.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+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
 SOURCE=.\common\cmndata.cpp
 # End Source File
 # Begin Source File


@@ -105,6 +113,10 @@ SOURCE=.\common\config.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=.\common\cshelp.cpp
+# End Source File
+# Begin Source File
+

 SOURCE=.\common\ctrlcmn.cpp
 # End Source File
 # Begin Source File
 SOURCE=.\common\ctrlcmn.cpp
 # End Source File
 # Begin Source File


@@ -125,6 +137,10 @@ SOURCE=.\common\db.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=.\common\dbgrid.cpp
+# End Source File
+# Begin Source File
+

 SOURCE=.\common\dbtable.cpp
 # End Source File
 # Begin Source File
 SOURCE=.\common\dbtable.cpp
 # End Source File
 # Begin Source File


@@ -133,6 +149,10 @@ SOURCE=.\common\dcbase.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=.\common\dircmn.cpp
+# End Source File
+# Begin Source File
+

 SOURCE=.\common\dlgcmn.cpp
 # End Source File
 # Begin Source File
 SOURCE=.\common\dlgcmn.cpp
 # End Source File
 # Begin Source File


@@ -163,6 +183,10 @@ SOURCE=.\common\dynlib.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=.\common\effects.cpp
+# End Source File
+# Begin Source File
+

 SOURCE=.\common\encconv.cpp
 # End Source File
 # Begin Source File
 SOURCE=.\common\encconv.cpp
 # End Source File
 # Begin Source File


@@ -192,6 +216,10 @@ SOURCE=.\common\filefn.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=.\common\filename.cpp
+# End Source File
+# Begin Source File
+

 SOURCE=.\common\filesys.cpp
 # End Source File
 # Begin Source File
 SOURCE=.\common\filesys.cpp
 # End Source File
 # Begin Source File


@@ -229,6 +257,10 @@ SOURCE=.\common\gdicmn.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=.\common\geometry.cpp
+# End Source File
+# Begin Source File
+

 SOURCE=.\common\gifdecod.cpp
 # End Source File
 # Begin Source File
 SOURCE=.\common\gifdecod.cpp
 # End Source File
 # Begin Source File


@@ -284,6 +316,10 @@ SOURCE=.\common\imagtiff.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=.\common\imagxpm.cpp
+# End Source File
+# Begin Source File
+

 SOURCE=.\common\intl.cpp
 # End Source File
 # Begin Source File
 SOURCE=.\common\intl.cpp
 # End Source File
 # Begin Source File


@@ -336,6 +372,10 @@ SOURCE=.\common\mstream.cpp
 # End Source File
 # Begin Source File
 
 # 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
 SOURCE=.\common\object.cpp
 # End Source File
 # Begin Source File


@@ -364,6 +404,19 @@ SOURCE=.\common\protocol.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=.\common\quantize.cpp
+# End Source File
+# Begin Source File
+
+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\resource.cpp
 # End Source File
 # Begin Source File
 SOURCE=.\common\resource.cpp
 # End Source File
 # Begin Source File


@@ -408,6 +461,10 @@ SOURCE=.\common\string.cpp
 # End Source File
 # Begin Source File
 
 # 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
 SOURCE=.\common\tbarbase.cpp
 # End Source File
 # Begin Source File


@@ -428,6 +485,10 @@ SOURCE=.\common\tokenzr.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=.\common\treebase.cpp
+# End Source File
+# Begin Source File
+

 SOURCE=.\common\txtstrm.cpp
 # End Source File
 # Begin Source File
 SOURCE=.\common\txtstrm.cpp
 # End Source File
 # Begin Source File


@@ -478,6 +539,10 @@ SOURCE=.\common\wxexpr.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=.\common\xpmdecod.cpp
+# End Source File
+# Begin Source File
+

 SOURCE=.\common\zipstrm.cpp
 # ADD CPP /I "zlib"
 # End Source File
 SOURCE=.\common\zipstrm.cpp
 # ADD CPP /I "zlib"
 # End Source File


@@ -512,6 +577,10 @@ SOURCE=.\generic\choicdgg.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=.\generic\dirctrlg.cpp
+# End Source File
+# Begin Source File
+

 SOURCE=.\generic\dragimgg.cpp
 # End Source File
 # Begin Source File
 SOURCE=.\generic\dragimgg.cpp
 # End Source File
 # Begin Source File


@@ -520,6 +589,10 @@ SOURCE=.\generic\grid.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=.\generic\gridctrl.cpp
+# End Source File
+# Begin Source File
+

 SOURCE=.\generic\gridsel.cpp
 # End Source File
 # Begin Source File
 SOURCE=.\generic\gridsel.cpp
 # End Source File
 # Begin Source File


@@ -572,7 +645,11 @@ SOURCE=.\generic\sashwin.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=.\generic\scrolwin.cpp
+SOURCE=.\generic\scrlwing.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\generic\splash.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 


@@ -600,6 +677,14 @@ SOURCE=.\generic\tipdlg.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=.\generic\tipwin.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\generic\treectlg.cpp
+# End Source File
+# Begin Source File
+

 SOURCE=.\generic\treelay.cpp
 # End Source File
 # Begin Source File
 SOURCE=.\generic\treelay.cpp
 # End Source File
 # Begin Source File


@@ -878,6 +963,15 @@ SOURCE=.\msw\gsocket.c
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=.\msw\gsockmsw.c
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
+SOURCE=.\msw\helpchm.cpp
+# End Source File
+# Begin Source File
+

 SOURCE=.\msw\helpwin.cpp
 # End Source File
 # Begin Source File
 SOURCE=.\msw\helpwin.cpp
 # End Source File
 # Begin Source File


@@ -1006,6 +1100,10 @@ SOURCE=.\msw\slidrmsw.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=.\msw\snglinst.cpp
+# End Source File
+# Begin Source File
+

 SOURCE=.\msw\spinbutt.cpp
 # End Source File
 # Begin Source File
 SOURCE=.\msw\spinbutt.cpp
 # End Source File
 # Begin Source File


@@ -1050,6 +1148,10 @@ SOURCE=.\msw\textctrl.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=.\msw\tglbtn.cpp
+# End Source File
+# Begin Source File
+

 SOURCE=.\msw\thread.cpp
 # End Source File
 # Begin Source File
 SOURCE=.\msw\thread.cpp
 # End Source File
 # Begin Source File


@@ -1080,11 +1182,6 @@ SOURCE=.\msw\wave.cpp
 
 SOURCE=.\msw\window.cpp
 # End Source File
 
 SOURCE=.\msw\window.cpp
 # End Source File

-# Begin Source File
-
-SOURCE=.\msw\xpmhand.cpp
-# ADD CPP /I "../src/xpm"
-# End Source File

 # End Group
 # Begin Group "OLE Files"
 
 # End Group
 # Begin Group "OLE Files"
 


@@ -1122,5 +1219,33 @@ SOURCE=.\msw\ole\uuid.cpp
 SOURCE=..\include\wx\msw\setup.h
 # End Source File
 # End Group
 SOURCE=..\include\wx\msw\setup.h
 # End Source File
 # End Group

+# Begin Group "Regex Files"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\regex\regcomp.c
+# ADD CPP /I "regex"
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
+SOURCE=.\regex\regerror.c
+# ADD CPP /I "regex"
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
+SOURCE=.\regex\regexec.c
+# ADD CPP /I "regex"
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
+SOURCE=.\regex\regfree.c
+# ADD CPP /I "regex"
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# End Group

 # End Target
 # End Project
 # End Target
 # End Project