should fix Unicode build for BC++ 5.3

[wxWidgets.git] / src / wxUniv.dsp

diff --git a/src/wxUniv.dsp b/src/wxUniv.dsp
index ffd95f067095a09eef57eb498c56479429460fa4..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"
 


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

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

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


@@ -213,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


@@ -289,6 +302,10 @@ SOURCE=.\common\hash.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

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

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


@@ -297,6 +314,10 @@ SOURCE=.\common\http.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

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

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


@@ -309,6 +330,10 @@ SOURCE=.\common\image.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

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

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


@@ -389,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


@@ -457,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


@@ -521,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


@@ -571,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"
 


@@ -609,6 +635,10 @@ SOURCE=.\generic\colrdlgg.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

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

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


@@ -657,7 +687,7 @@ SOURCE=.\generic\helphtml.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=.\generic\helpwxht.cpp
+SOURCE=.\generic\imaglist.cpp

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


@@ -673,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


@@ -759,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"
 


@@ -848,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


@@ -924,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


@@ -948,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
 


@@ -972,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


@@ -1012,24 +1054,32 @@ SOURCE=.\msw\utilsexc.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

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

 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


@@ -1156,26 +1206,16 @@ SOURCE=.\univ\theme.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=.\univ\topluniv.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\univ\winuniv.cpp
+SOURCE=.\univ\toolbar.cpp

 # End Source File
 # End Source File

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

 # Begin Source File
 
 # Begin Source File
 

-SOURCE=.\univ\themes\gtk.cpp
+SOURCE=.\univ\topluniv.cpp

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

-SOURCE=.\univ\themes\win32.cpp
+SOURCE=.\univ\winuniv.cpp

 # End Source File
 # End Source File

-
-# End Group

 # End Group
 # Begin Group "Headers"
 
 # End Group
 # Begin Group "Headers"
 


@@ -1186,23 +1226,29 @@ 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
 
 "../lib/univ/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 # Begin Custom Build - Creating lib\univ\wx\setup.h from $(InputPath)
 InputPath=..\include\wx\univ\setup.h
 
 "../lib/univ/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-       copy $(InputPath) ..\lib\univ\wx\setup.h
+       copy "$(InputPath)" ..\lib\univ\wx\setup.h

 
 # End Custom Build
 
 # 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
 
 "../lib/univd/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 # Begin Custom Build - Creating lib\univd\wx\setup.h from $(InputPath)
 InputPath=..\include\wx\univ\setup.h
 
 "../lib/univd/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-       copy $(InputPath) ..\lib\univd\wx\setup.h
+       copy "$(InputPath)" ..\lib\univd\wx\setup.h

 
 # End Custom Build
 
 # End Custom Build

+

 !ENDIF 
 !ENDIF 

+

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


@@ -1218,6 +1264,10 @@ SOURCE=..\include\wx\app.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

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

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


@@ -1234,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


@@ -1370,6 +1424,10 @@ SOURCE=..\include\wx\dc.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

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

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


@@ -1466,6 +1524,10 @@ SOURCE=..\include\wx\fdrepdlg.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

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

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


@@ -1570,6 +1632,10 @@ SOURCE=..\include\wx\hash.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

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

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


@@ -1590,6 +1656,10 @@ SOURCE=..\include\wx\icon.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

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

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


@@ -1642,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


@@ -1670,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


@@ -1734,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


@@ -2022,10 +2104,6 @@ SOURCE=..\include\wx\types.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

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

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


@@ -2058,6 +2136,10 @@ SOURCE=..\include\wx\version.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

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

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


@@ -2116,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"
 


@@ -2195,10 +2276,6 @@ SOURCE=..\include\wx\generic\helphtml.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

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

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


@@ -2259,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


@@ -2271,13 +2352,16 @@ SOURCE=..\include\wx\generic\textdlgg.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

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

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

-

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


@@ -2334,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"