Applied patch sent to me for xpmdecod.cpp/VC++ compilation, and changed

[wxWidgets.git] / src / wxUniv.dsp

diff --git a/src/wxUniv.dsp b/src/wxUniv.dsp
index 2a21340399ed6cf8332a3677f9038f0ba773c39c..4affb2d59989b1111bc70ec329d3bbb8902fc209 100644 (file)
--- a/src/wxUniv.dsp
+++ b/src/wxUniv.dsp
@@ -49,7 +49,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\lib\wxuniv.lib"
 
 !ELSEIF  "$(CFG)" == "wxUniv - Win32 Debug"
 
@@ -97,6 +97,10 @@ SOURCE=.\common\clipcmn.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\common\clntdata.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\common\cmdline.cpp
 # End Source File
 # Begin Source File
@@ -197,11 +201,6 @@ SOURCE=.\common\event.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\common\extended.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
 SOURCE=.\common\fddlgcmn.cpp
 # End Source File
 # Begin Source File
@@ -510,11 +509,6 @@ SOURCE=.\common\txtstrm.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\common\unzip.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
 SOURCE=.\common\url.cpp
 # End Source File
 # Begin Source File
@@ -565,6 +559,18 @@ SOURCE=.\common\zipstrm.cpp
 
 SOURCE=.\common\zstream.cpp
 # End Source File
+
+# Begin Source File
+
+SOURCE=.\common\extended.c
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
+SOURCE=.\common\unzip.c
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+
 # End Group
 # Begin Group "Generic Files"
 
@@ -741,6 +747,7 @@ SOURCE=.\generic\treelay.cpp
 
 SOURCE=.\generic\wizard.cpp
 # End Source File
+
 # End Group
 # Begin Group "wxHTML Files"
 
@@ -825,12 +832,18 @@ SOURCE=.\html\m_tables.cpp
 
 SOURCE=.\html\winpars.cpp
 # End Source File
+
 # End Group
 # Begin Group "MSW Files"
 
 # PROP Default_Filter ""
 # Begin Source File
 
+SOURCE=.\msw\dummy.cpp
+# ADD CPP /Yc"wx/wxprec.h"
+# End Source File
+# Begin Source File
+
 SOURCE=.\msw\app.cpp
 # End Source File
 # Begin Source File
@@ -895,11 +908,6 @@ SOURCE=.\msw\dir.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\msw\dummy.cpp
-# ADD CPP /Yc"wx/wxprec.h"
-# End Source File
-# Begin Source File
-
 SOURCE=.\msw\evtloop.cpp
 # End Source File
 # Begin Source File
@@ -924,16 +932,6 @@ SOURCE=.\msw\gdiobj.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\msw\gsocket.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\gsockmsw.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
 SOURCE=.\msw\icon.cpp
 # End Source File
 # Begin Source File
@@ -1000,22 +998,22 @@ SOURCE=.\msw\utilsexc.cpp
 
 SOURCE=.\msw\window.cpp
 # End Source File
-# End Group
-# Begin Group "Universal Files"
-
-# PROP Default_Filter ""
-# Begin Group "Theme Files"
 
-# PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=.\univ\themes\gtk.cpp
+SOURCE=.\msw\gsocket.c
+# SUBTRACT CPP /YX /Yc /Yu
 # End Source File
 # Begin Source File
 
-SOURCE=.\univ\themes\win32.cpp
+SOURCE=.\msw\gsockmsw.c
+# SUBTRACT CPP /YX /Yc /Yu
 # End Source File
+
 # End Group
+# Begin Group "Universal Files"
+
+# PROP Default_Filter ""
 # Begin Source File
 
 SOURCE=.\univ\bmpbuttn.cpp
@@ -1144,6 +1142,20 @@ SOURCE=.\univ\topluniv.cpp
 
 SOURCE=.\univ\winuniv.cpp
 # End Source File
+
+# Begin Group "Theme Files"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\univ\themes\gtk.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\univ\themes\win32.cpp
+# End Source File
+
+# End Group
 # End Group
 # Begin Group "Headers"
 
@@ -1154,9 +1166,7 @@ SOURCE=.\univ\winuniv.cpp
 # Begin Source File
 
 SOURCE=..\include\wx\univ\setup.h
-
 !IF  "$(CFG)" == "wxUniv - Win32 Release"
-
 # Begin Custom Build - Creating wx/setup.h from $(InputPath)
 InputPath=..\include\wx\univ\setup.h
 
@@ -1164,9 +1174,7 @@ InputPath=..\include\wx\univ\setup.h
        copy $(InputPath) ..\lib\univ\wx\setup.h
 
 # End Custom Build
-
 !ELSEIF  "$(CFG)" == "wxUniv - Win32 Debug"
-
 # Begin Custom Build - Creating wx/setup.h from $(InputPath)
 InputPath=..\include\wx\univ\setup.h
 
@@ -1174,9 +1182,7 @@ InputPath=..\include\wx\univ\setup.h
        copy $(InputPath) ..\lib\univd\wx\setup.h
 
 # End Custom Build
-
 !ENDIF 
-
 # End Source File
 # End Group
 # Begin Group "Common"
@@ -1248,6 +1254,10 @@ SOURCE=..\include\wx\clipbrd.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\clntdata.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\cmdline.h
 # End Source File
 # Begin Source File
@@ -2066,6 +2076,7 @@ SOURCE=..\include\wx\zipstrm.h
 
 SOURCE=..\include\wx\zstream.h
 # End Source File
+
 # End Group
 # Begin Group "MSW"
 
@@ -2196,6 +2207,10 @@ SOURCE=..\include\wx\generic\scrolwin.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\generic\spinctlg.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\generic\splash.h
 # End Source File
 # Begin Source File
@@ -2222,6 +2237,7 @@ SOURCE=..\include\wx\generic\treectlg.h
 
 SOURCE=..\include\wx\generic\wizard.h
 # End Source File
+
 # End Group
 # Begin Group "HTML"
 
@@ -2278,6 +2294,7 @@ SOURCE=..\include\wx\html\m_templ.h
 
 SOURCE=..\include\wx\html\winpars.h
 # End Source File
+
 # End Group
 # Begin Group "Universal"