Windows compilation fixes after recent changes

[wxWidgets.git] / src / wxUniv.dsp

diff --git a/src/wxUniv.dsp b/src/wxUniv.dsp
index 9a4b05a9ba7738d94ba81c066bb1c6f57c0cc435..db54216826e7cb661960376e7f8fcf07ba050457 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 BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo

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

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


@@ -221,6 +221,11 @@ SOURCE=.\common\event.cpp
 # End Source File
 # Begin Source File
 
 # 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
 SOURCE=.\common\fddlgcmn.cpp
 # End Source File
 # Begin Source File


@@ -409,6 +414,10 @@ SOURCE=.\common\module.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

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

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


@@ -477,6 +486,10 @@ SOURCE=.\common\sckstrm.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

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

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


@@ -541,6 +554,11 @@ SOURCE=.\common\txtstrm.cpp
 # End Source File
 # Begin Source File
 
 # 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
 SOURCE=.\common\url.cpp
 # End Source File
 # Begin Source File


@@ -591,18 +609,6 @@ SOURCE=.\common\zipstrm.cpp
 
 SOURCE=.\common\zstream.cpp
 # End Source File
 
 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"
 
 # End Group
 # Begin Group "Generic Files"
 


@@ -681,6 +687,10 @@ SOURCE=.\generic\helphtml.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

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

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


@@ -693,6 +703,10 @@ SOURCE=.\generic\logg.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

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

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


@@ -779,7 +793,6 @@ SOURCE=.\generic\treelay.cpp
 
 SOURCE=.\generic\wizard.cpp
 # End Source File
 
 SOURCE=.\generic\wizard.cpp
 # End Source File

-

 # End Group
 # Begin Group "wxHTML Files"
 
 # End Group
 # Begin Group "wxHTML Files"
 


@@ -868,18 +881,12 @@ SOURCE=.\html\m_tables.cpp
 
 SOURCE=.\html\winpars.cpp
 # End Source File
 
 SOURCE=.\html\winpars.cpp
 # End Source File

-

 # End Group
 # Begin Group "MSW Files"
 
 # PROP Default_Filter ""
 # Begin 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
 SOURCE=.\msw\app.cpp
 # End Source File
 # Begin Source File


@@ -944,6 +951,11 @@ SOURCE=.\msw\dir.cpp
 # End Source File
 # Begin Source File
 
 # 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
 SOURCE=.\msw\evtloop.cpp
 # End Source File
 # Begin Source File


@@ -968,11 +980,17 @@ SOURCE=.\msw\gdiobj.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

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

-SOURCE=.\msw\imaglist.cpp
+SOURCE=.\msw\icon.cpp

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


@@ -992,6 +1010,10 @@ SOURCE=.\msw\pen.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

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

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


@@ -1038,22 +1060,26 @@ SOURCE=.\msw\volume.cpp
 
 SOURCE=.\msw\window.cpp
 # End Source File
 
 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
 
 # Begin Source File
 

-SOURCE=.\msw\gsocket.c
-# SUBTRACT CPP /YX /Yc /Yu
+SOURCE=.\univ\themes\gtk.cpp

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

-SOURCE=.\msw\gsockmsw.c
-# SUBTRACT CPP /YX /Yc /Yu
+SOURCE=.\univ\themes\metal.cpp

 # End Source File
 # End Source File

+# Begin Source File

 
 

+SOURCE=.\univ\themes\win32.cpp
+# End Source File

 # End Group
 # End Group

-# Begin Group "Universal Files"
-
-# PROP Default_Filter ""

 # Begin Source File
 
 SOURCE=.\univ\bmpbuttn.cpp
 # Begin Source File
 
 SOURCE=.\univ\bmpbuttn.cpp


@@ -1190,20 +1216,6 @@ SOURCE=.\univ\topluniv.cpp
 
 SOURCE=.\univ\winuniv.cpp
 # End Source File
 
 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"
 
 # End Group
 # Begin Group "Headers"
 


@@ -1214,7 +1226,9 @@ SOURCE=.\univ\themes\win32.cpp
 # Begin Source File
 
 SOURCE=..\include\wx\univ\setup.h
 # Begin Source File
 
 SOURCE=..\include\wx\univ\setup.h

+

 !IF  "$(CFG)" == "wxUniv - Win32 Release"
 !IF  "$(CFG)" == "wxUniv - Win32 Release"

+

 # Begin Custom Build - Creating lib\univ\wx\setup.h from $(InputPath)
 InputPath=..\include\wx\univ\setup.h
 
 # Begin Custom Build - Creating lib\univ\wx\setup.h from $(InputPath)
 InputPath=..\include\wx\univ\setup.h
 


@@ -1222,7 +1236,9 @@ InputPath=..\include\wx\univ\setup.h
        copy "$(InputPath)" ..\lib\univ\wx\setup.h
 
 # End Custom Build
        copy "$(InputPath)" ..\lib\univ\wx\setup.h
 
 # End Custom Build

+

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

+

 # Begin Custom Build - Creating lib\univd\wx\setup.h from $(InputPath)
 InputPath=..\include\wx\univ\setup.h
 
 # Begin Custom Build - Creating lib\univd\wx\setup.h from $(InputPath)
 InputPath=..\include\wx\univ\setup.h
 


@@ -1230,7 +1246,9 @@ InputPath=..\include\wx\univ\setup.h
        copy "$(InputPath)" ..\lib\univd\wx\setup.h
 
 # End Custom Build
        copy "$(InputPath)" ..\lib\univd\wx\setup.h
 
 # End Custom Build

+

 !ENDIF 
 !ENDIF 

+

 # End Source File
 # End Group
 # Begin Group "Common"
 # End Source File
 # End Group
 # Begin Group "Common"


@@ -1266,6 +1284,10 @@ SOURCE=..\include\wx\buffer.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=..\include\wx\build.h
+# End Source File
+# Begin Source File
+

 SOURCE=..\include\wx\busyinfo.h
 # End Source File
 # Begin Source File
 SOURCE=..\include\wx\busyinfo.h
 # End Source File
 # Begin Source File


@@ -1690,6 +1712,10 @@ SOURCE=..\include\wx\ioswrap.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=..\include\wx\ipc.h
+# End Source File
+# Begin Source File
+

 SOURCE=..\include\wx\ipcbase.h
 # End Source File
 # Begin Source File
 SOURCE=..\include\wx\ipcbase.h
 # End Source File
 # Begin Source File


@@ -1718,6 +1744,10 @@ SOURCE=..\include\wx\list.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=..\include\wx\listbase.h
+# End Source File
+# Begin Source File
+

 SOURCE=..\include\wx\listbox.h
 # End Source File
 # Begin Source File
 SOURCE=..\include\wx\listbox.h
 # End Source File
 # Begin Source File


@@ -1782,6 +1812,10 @@ SOURCE=..\include\wx\msgdlg.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=..\include\wx\msgout.h
+# End Source File
+# Begin Source File
+

 SOURCE=..\include\wx\mstream.h
 # End Source File
 # Begin Source File
 SOURCE=..\include\wx\mstream.h
 # End Source File
 # Begin Source File


@@ -2164,7 +2198,6 @@ SOURCE=..\include\wx\zipstrm.h
 
 SOURCE=..\include\wx\zstream.h
 # End Source File
 
 SOURCE=..\include\wx\zstream.h
 # End Source File

-

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


@@ -2303,6 +2336,10 @@ SOURCE=..\include\wx\generic\splitter.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=..\include\wx\generic\statline.h
+# End Source File
+# Begin Source File
+

 SOURCE=..\include\wx\generic\statusbr.h
 # End Source File
 # Begin Source File
 SOURCE=..\include\wx\generic\statusbr.h
 # End Source File
 # Begin Source File


@@ -2325,7 +2362,6 @@ SOURCE=..\include\wx\generic\treectlg.h
 
 SOURCE=..\include\wx\generic\wizard.h
 # End Source File
 
 SOURCE=..\include\wx\generic\wizard.h
 # End Source File

-

 # End Group
 # Begin Group "HTML"
 
 # End Group
 # Begin Group "HTML"
 


@@ -2382,7 +2418,6 @@ SOURCE=..\include\wx\html\m_templ.h
 
 SOURCE=..\include\wx\html\winpars.h
 # End Source File
 
 SOURCE=..\include\wx\html\winpars.h
 # End Source File

-

 # End Group
 # Begin Group "Universal"
 
 # End Group
 # Begin Group "Universal"