X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/aab49a0b6a1786b9d4da1d1ca0dab96d24737cf9..148b44a1e7d050307bba3f10fd4520aa514e196f:/src/wxUniv.dsp?ds=sidebyside

diff --git a/src/wxUniv.dsp b/src/wxUniv.dsp
index 721188c706..5a06666a79 100644
--- 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"
 
@@ -85,6 +85,10 @@ LIB32=link.exe -lib
 # PROP Default_Filter ""
 # Begin Source File
 
+SOURCE=.\common\accesscmn.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\common\appcmn.cpp
 # End Source File
 # Begin Source File
@@ -145,6 +149,10 @@ SOURCE=.\common\ctrlsub.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\common\datacmn.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\common\datetime.cpp
 # End Source File
 # Begin Source File
@@ -193,6 +201,10 @@ SOURCE=.\common\docview.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\common\dpycmn.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\common\dseldlg.cpp
 # End Source File
 # Begin Source File
@@ -221,11 +233,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
@@ -430,10 +437,6 @@ SOURCE=.\common\object.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\common\odbc.cpp
-# End Source File
-# Begin Source File
-
 SOURCE=.\common\paper.cpp
 # End Source File
 # Begin Source File
@@ -466,7 +469,7 @@ SOURCE=.\common\regex.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\common\resource.cpp
+SOURCE=.\common\rgncmn.cpp
 # End Source File
 # Begin Source File
 
@@ -518,6 +521,10 @@ SOURCE=.\common\sysopt.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\common\taskbarcmn.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\common\tbarbase.cpp
 # End Source File
 # Begin Source File
@@ -554,11 +561,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
@@ -595,10 +597,6 @@ SOURCE=.\common\wxchar.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\common\wxexpr.cpp
-# End Source File
-# Begin Source File
-
 SOURCE=.\common\xpmdecod.cpp
 # End Source File
 # Begin Source File
@@ -609,6 +607,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"
 
@@ -647,15 +657,15 @@ SOURCE=.\generic\dirctrlg.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\generic\dirdlgg.cpp
+SOURCE=.\generic\dragimgg.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\generic\dragimgg.cpp
+SOURCE=.\generic\fdrepdlg.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\generic\fdrepdlg.cpp
+SOURCE=.\generic\filedlgg.cpp
 # End Source File
 # Begin Source File
 
@@ -727,18 +737,6 @@ SOURCE=.\generic\progdlgg.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\generic\prop.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\generic\propform.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\generic\proplist.cpp
-# End Source File
-# Begin Source File
-
 SOURCE=.\generic\sashwin.cpp
 # End Source File
 # Begin Source File
@@ -783,12 +781,9 @@ SOURCE=.\generic\treectlg.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\generic\treelay.cpp
-# End Source File
-# Begin Source File
-
 SOURCE=.\generic\wizard.cpp
 # End Source File
+
 # End Group
 # Begin Group "wxHTML Files"
 
@@ -873,12 +868,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
@@ -935,6 +936,10 @@ SOURCE=.\msw\dde.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\msw\dialup.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\msw\dib.cpp
 # End Source File
 # Begin Source File
@@ -943,16 +948,19 @@ SOURCE=.\msw\dir.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\msw\dummy.cpp
-# ADD CPP /Yc"wx/wxprec.h"
+SOURCE=.\msw\dirdlg.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\msw\evtloop.cpp
+SOURCE=.\msw\display.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\msw\enhmeta.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\msw\filedlg.cpp
+SOURCE=.\msw\evtloop.cpp
 # End Source File
 # Begin Source File
 
@@ -976,13 +984,7 @@ 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
+SOURCE=.\msw\glcanvas.cpp
 # End Source File
 # Begin Source File
 
@@ -1002,6 +1004,10 @@ SOURCE=.\msw\icon.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\msw\joystick.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\msw\main.cpp
 # End Source File
 # Begin Source File
@@ -1010,6 +1016,10 @@ SOURCE=.\msw\mimetype.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\msw\minifram.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\msw\palette.cpp
 # End Source File
 # Begin Source File
@@ -1042,6 +1052,10 @@ SOURCE=.\msw\snglinst.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\msw\taskbar.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\msw\thread.cpp
 # End Source File
 # Begin Source File
@@ -1050,6 +1064,10 @@ SOURCE=.\msw\timer.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\msw\tooltip.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\msw\toplevel.cpp
 # End Source File
 # Begin Source File
@@ -1066,28 +1084,57 @@ SOURCE=.\msw\volume.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\msw\wave.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\msw\window.cpp
 # End Source File
-# End Group
-# Begin Group "Universal Files"
 
-# PROP Default_Filter ""
-# Begin Group "Theme Files"
+# 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 Group "OLE Files"
 
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=.\univ\themes\gtk.cpp
+SOURCE=.\msw\ole\automtn.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\univ\themes\metal.cpp
+SOURCE=.\msw\ole\dataobj.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\univ\themes\win32.cpp
+SOURCE=.\msw\ole\dropsrc.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\msw\ole\droptgt.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\msw\ole\oleutils.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\msw\ole\uuid.cpp
 # End Source File
+
 # End Group
+# End Group
+# Begin Group "Universal Files"
+
+# PROP Default_Filter ""
 # Begin Source File
 
 SOURCE=.\univ\bmpbuttn.cpp
@@ -1224,6 +1271,24 @@ 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\metal.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\univ\themes\win32.cpp
+# End Source File
+
+# End Group
 # End Group
 # Begin Group "Headers"
 
@@ -1234,9 +1299,7 @@ SOURCE=.\univ\winuniv.cpp
 # Begin Source File
 
 SOURCE=..\include\wx\univ\setup.h
-
 !IF  "$(CFG)" == "wxUniv - Win32 Release"
-
 # Begin Custom Build - Creating lib\univ\wx\setup.h from $(InputPath)
 InputPath=..\include\wx\univ\setup.h
 
@@ -1244,9 +1307,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 lib\univd\wx\setup.h from $(InputPath)
 InputPath=..\include\wx\univ\setup.h
 
@@ -1254,9 +1315,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"
@@ -1268,6 +1327,10 @@ SOURCE=..\include\wx\accel.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\access.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\app.h
 # End Source File
 # Begin Source File
@@ -1396,10 +1459,6 @@ SOURCE=..\include\wx\dataobj.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\date.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\include\wx\datetime.h
 # End Source File
 # Begin Source File
@@ -1488,6 +1547,10 @@ SOURCE=..\include\wx\dirdlg.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\display.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\dnd.h
 # End Source File
 # Begin Source File
@@ -1528,10 +1591,6 @@ SOURCE=..\include\wx\event.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\expr.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\include\wx\fdrepdlg.h
 # End Source File
 # Begin Source File
@@ -1720,6 +1779,10 @@ SOURCE=..\include\wx\intl.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\iosfwrap.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\ioswrap.h
 # End Source File
 # Begin Source File
@@ -1776,6 +1839,10 @@ SOURCE=..\include\wx\longlong.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\math.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\matrix.h
 # End Source File
 # Begin Source File
@@ -1840,10 +1907,6 @@ SOURCE=..\include\wx\object.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\odbc.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\include\wx\ownerdrw.h
 # End Source File
 # Begin Source File
@@ -1892,15 +1955,7 @@ SOURCE=..\include\wx\progdlg.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\prop.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\propform.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\proplist.h
+SOURCE=..\include\wx\quantize.h
 # End Source File
 # Begin Source File
 
@@ -1912,15 +1967,15 @@ SOURCE=..\include\wx\radiobut.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\regex.h
+SOURCE=..\include\wx\rawbmp.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\region.h
+SOURCE=..\include\wx\regex.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\resource.h
+SOURCE=..\include\wx\region.h
 # End Source File
 # Begin Source File
 
@@ -2068,10 +2123,6 @@ SOURCE=..\include\wx\thread.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\time.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\include\wx\timer.h
 # End Source File
 # Begin Source File
@@ -2188,10 +2239,6 @@ SOURCE=..\include\wx\wxchar.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\wxexpr.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\include\wx\wxhtml.h
 # End Source File
 # Begin Source File
@@ -2210,6 +2257,7 @@ SOURCE=..\include\wx\zipstrm.h
 
 SOURCE=..\include\wx\zstream.h
 # End Source File
+
 # End Group
 # Begin Group "MSW"
 
@@ -2378,6 +2426,7 @@ SOURCE=..\include\wx\generic\treectlg.h
 
 SOURCE=..\include\wx\generic\wizard.h
 # End Source File
+
 # End Group
 # Begin Group "HTML"
 
@@ -2434,6 +2483,7 @@ SOURCE=..\include\wx\html\m_templ.h
 
 SOURCE=..\include\wx\html\winpars.h
 # End Source File
+
 # End Group
 # Begin Group "Universal"