some conflicts resolved

[wxWidgets.git] / src / wxvc6.dsp

diff --git a/src/wxvc6.dsp b/src/wxvc6.dsp
index c364e49cf57d274128cecd4e7eedce4d43c66e69..e32664b1ee0a30a611444dcef09aabb1c044b04a 100644 (file)
--- a/src/wxvc6.dsp
+++ b/src/wxvc6.dsp
@@ -1,7 +1,6 @@
 # Microsoft Developer Studio Project File - Name="wxvc6" - Package Owner=<4>
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 # Microsoft Developer Studio Project File - Name="wxvc6" - Package Owner=<4>
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **

-# RCS-ID:      $Id$

 
 # TARGTYPE "Win32 (x86) Static Library" 0x0104
 
 
 # TARGTYPE "Win32 (x86) Static Library" 0x0104
 


@@ -50,7 +49,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo

-# ADD LIB32 /nologo
+# ADD LIB32 /nologo /out:"Release\wxvc.lib"

 
 !ELSEIF  "$(CFG)" == "wxvc6 - Win32 Debug"
 
 
 !ELSEIF  "$(CFG)" == "wxvc6 - Win32 Debug"
 


@@ -65,7 +64,7 @@ LIB32=link.exe -lib
 # PROP Intermediate_Dir "Debug"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
 # PROP Intermediate_Dir "Debug"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /Z7 /Od /I "../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /Yu"wx/wxprec.h" /FD /c
+# ADD CPP /nologo /MDd /W3 /GX /Z7 /Od /I "../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /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


@@ -73,7 +72,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo

-# ADD LIB32 /nologo
+# ADD LIB32 /nologo /out:"Debug\wxvc.lib"

 
 !ENDIF 
 
 
 !ENDIF 
 


@@ -86,7 +85,7 @@ LIB32=link.exe -lib
 # PROP Default_Filter ""
 # Begin Source File
 
 # PROP Default_Filter ""
 # Begin Source File
 

-SOURCE=.\common\animate.cpp
+SOURCE=.\common\appcmn.cpp

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


@@ -181,6 +180,10 @@ SOURCE=.\common\filesys.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

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

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


@@ -467,6 +470,14 @@ SOURCE=.\generic\gridg.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

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

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


@@ -475,6 +486,10 @@ SOURCE=.\generic\laywin.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

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

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


@@ -551,11 +566,11 @@ SOURCE=.\html\htmlcell.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=.\html\htmlfilter.cpp
+SOURCE=.\html\htmlfilt.cpp

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

-SOURCE=.\html\htmlparser.cpp
+SOURCE=.\html\htmlpars.cpp

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


@@ -567,44 +582,48 @@ SOURCE=.\html\htmlwin.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=.\html\htmlwinparser.cpp
+SOURCE=.\html\htmprint.cpp

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

-SOURCE=.\html\mod_fonts.cpp
+SOURCE=.\html\m_fonts.cpp

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

-SOURCE=.\html\mod_hline.cpp
+SOURCE=.\html\m_hline.cpp

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

-SOURCE=.\html\mod_image.cpp
+SOURCE=.\html\m_image.cpp

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

-SOURCE=.\html\mod_layout.cpp
+SOURCE=.\html\m_layout.cpp

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

-SOURCE=.\html\mod_links.cpp
+SOURCE=.\html\m_links.cpp

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

-SOURCE=.\html\mod_list.cpp
+SOURCE=.\html\m_list.cpp

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

-SOURCE=.\html\mod_pre.cpp
+SOURCE=.\html\m_pre.cpp

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

-SOURCE=.\html\mod_tables.cpp
+SOURCE=.\html\m_tables.cpp

 # End Source File
 # Begin Source File
 
 SOURCE=.\html\search.cpp
 # End Source File
 # End Source File
 # Begin Source File
 
 SOURCE=.\html\search.cpp
 # End Source File

+# Begin Source File
+
+SOURCE=.\html\winpars.cpp
+# End Source File

 # End Group
 # Begin Group "MSW Files"
 
 # End Group
 # Begin Group "MSW Files"
 


@@ -635,6 +654,10 @@ SOURCE=.\msw\button.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

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

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


@@ -756,6 +779,11 @@ SOURCE=.\msw\gdiobj.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=.\msw\gsocket.c
+# SUBTRACT CPP /YX /Yc /Yu
+# 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


@@ -899,6 +927,10 @@ SOURCE=.\msw\spinbutt.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

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

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


@@ -911,11 +943,11 @@ SOURCE=.\msw\statbr95.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=.\msw\stattext.cpp
+SOURCE=.\msw\statline.cpp

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

-SOURCE=.\msw\statline.cpp
+SOURCE=.\msw\stattext.cpp

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