X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ecf23aa6269c155f66f5a37d00bb8b11ad01f383..4a64bee465c0dbf3d97fbf290cb2fef4ad41ca34:/src/wxvc_dll.dsp

diff --git a/src/wxvc_dll.dsp b/src/wxvc_dll.dsp
index 0450bbdfba..50e691395d 100644
--- a/src/wxvc_dll.dsp
+++ b/src/wxvc_dll.dsp
@@ -38,8 +38,8 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "ReleaseDLL"
-# PROP Intermediate_Dir "ReleaseDLL"
+# PROP Output_Dir "../lib"
+# PROP Intermediate_Dir "msw/ReleaseDLL"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
@@ -53,7 +53,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comctl32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib uuid.lib rpcrt4.lib advapi32.lib winmm.lib /nologo /subsystem:windows /dll /machine:I386 /out:"ReleaseDLL/wxvc.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comctl32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib uuid.lib rpcrt4.lib advapi32.lib winmm.lib /nologo /subsystem:windows /dll /machine:I386 /out:"../lib/wxdll.dll"
 
 !ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
@@ -64,8 +64,8 @@ LINK32=link.exe
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DebugDLL"
-# PROP Intermediate_Dir "DebugDLL"
+# PROP Output_Dir "../lib"
+# PROP Intermediate_Dir "msw/DebugDLL"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
@@ -79,7 +79,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comctl32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib uuid.lib rpcrt4.lib advapi32.lib winmm.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"DebugDLL/wxvc.dll" /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comctl32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib uuid.lib rpcrt4.lib advapi32.lib winmm.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"../lib/wxdlld.dll" /pdbtype:sept
 
 !ENDIF 
 
@@ -219,6 +219,10 @@ SOURCE=.\common\fs_inet.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\common\fs_mem.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\common\fs_zip.cpp
 # ADD CPP /I "zlib"
 # End Source File
@@ -510,7 +514,15 @@ SOURCE=.\generic\choicdgg.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\generic\gridg.cpp
+SOURCE=.\generic\dragimgg.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\generic\grid.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\generic\gridsel.cpp
 # End Source File
 # Begin Source File
 
@@ -588,6 +600,14 @@ SOURCE=.\generic\textdlgg.cpp
 
 SOURCE=.\generic\tipdlg.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"
 
@@ -634,10 +654,6 @@ SOURCE=.\html\m_dflist.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\html\m_meta.cpp
-# End Source File
-# Begin Source File
-
 SOURCE=.\html\m_fonts.cpp
 # End Source File
 # Begin Source File
@@ -662,6 +678,10 @@ SOURCE=.\html\m_list.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\html\m_meta.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\html\m_pre.cpp
 # End Source File
 # Begin Source File
@@ -778,6 +798,10 @@ SOURCE=.\msw\dialog.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
@@ -847,6 +871,10 @@ SOURCE=.\msw\gdiobj.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\msw\glcanvas.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\msw\gsocket.c
 # SUBTRACT CPP /YX /Yc /Yu
 # End Source File
@@ -1193,134 +1221,97 @@ SOURCE=.\png\pngwutil.c
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=.\xpm\crbuffri.c
-# ADD CPP /D "FOR_MSW"
+SOURCE=.\xpm\attrib.c
 # SUBTRACT CPP /YX /Yc /Yu
 # End Source File
 # Begin Source File
 
-SOURCE=.\xpm\crbuffrp.c
-# ADD CPP /D "FOR_MSW"
+SOURCE=.\xpm\crbuffri.c
 # SUBTRACT CPP /YX /Yc /Yu
 # End Source File
 # Begin Source File
 
 SOURCE=.\xpm\crdatfri.c
-# ADD CPP /D "FOR_MSW"
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\xpm\crdatfrp.c
-# ADD CPP /D "FOR_MSW"
 # SUBTRACT CPP /YX /Yc /Yu
 # End Source File
 # Begin Source File
 
 SOURCE=.\xpm\create.c
-# ADD CPP /D "FOR_MSW"
 # SUBTRACT CPP /YX /Yc /Yu
 # End Source File
 # Begin Source File
 
 SOURCE=.\xpm\crifrbuf.c
-# ADD CPP /D "FOR_MSW"
 # SUBTRACT CPP /YX /Yc /Yu
 # End Source File
 # Begin Source File
 
 SOURCE=.\xpm\crifrdat.c
-# ADD CPP /D "FOR_MSW"
 # SUBTRACT CPP /YX /Yc /Yu
 # End Source File
 # Begin Source File
 
-SOURCE=.\xpm\crpfrbuf.c
-# ADD CPP /D "FOR_MSW"
+SOURCE=.\xpm\dataxpm.c
 # SUBTRACT CPP /YX /Yc /Yu
 # End Source File
 # Begin Source File
 
-SOURCE=.\xpm\crpfrdat.c
-# ADD CPP /D "FOR_MSW"
+SOURCE=.\xpm\hashtab.c
 # SUBTRACT CPP /YX /Yc /Yu
 # End Source File
 # Begin Source File
 
-SOURCE=.\xpm\dataxpm.c
-# ADD CPP /D "FOR_MSW"
+SOURCE=.\xpm\imagexpm.c
 # SUBTRACT CPP /YX /Yc /Yu
 # End Source File
 # Begin Source File
 
-SOURCE=.\xpm\hashtab.c
-# ADD CPP /D "FOR_MSW"
+SOURCE=.\xpm\info.c
 # SUBTRACT CPP /YX /Yc /Yu
 # End Source File
 # Begin Source File
 
 SOURCE=.\xpm\misc.c
-# ADD CPP /D "FOR_MSW"
 # SUBTRACT CPP /YX /Yc /Yu
 # End Source File
 # Begin Source File
 
 SOURCE=.\xpm\parse.c
-# ADD CPP /D "FOR_MSW"
 # SUBTRACT CPP /YX /Yc /Yu
 # End Source File
 # Begin Source File
 
 SOURCE=.\xpm\rdftodat.c
-# ADD CPP /D "FOR_MSW"
 # SUBTRACT CPP /YX /Yc /Yu
 # End Source File
 # Begin Source File
 
 SOURCE=.\xpm\rdftoi.c
-# ADD CPP /D "FOR_MSW"
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\xpm\rdftop.c
-# ADD CPP /D "FOR_MSW"
 # SUBTRACT CPP /YX /Yc /Yu
 # End Source File
 # Begin Source File
 
 SOURCE=.\xpm\rgb.c
-# ADD CPP /D "FOR_MSW"
 # SUBTRACT CPP /YX /Yc /Yu
 # End Source File
 # Begin Source File
 
 SOURCE=.\xpm\scan.c
-# ADD CPP /D "FOR_MSW"
 # SUBTRACT CPP /YX /Yc /Yu
 # End Source File
 # Begin Source File
 
 SOURCE=.\xpm\simx.c
-# ADD CPP /D "FOR_MSW"
 # SUBTRACT CPP /YX /Yc /Yu
 # End Source File
 # Begin Source File
 
 SOURCE=.\xpm\wrffrdat.c
-# ADD CPP /D "FOR_MSW"
 # SUBTRACT CPP /YX /Yc /Yu
 # End Source File
 # Begin Source File
 
 SOURCE=.\xpm\wrffri.c
-# ADD CPP /D "FOR_MSW"
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\xpm\wrffrp.c
-# ADD CPP /D "FOR_MSW"
 # SUBTRACT CPP /YX /Yc /Yu
 # End Source File
 # End Group
@@ -2190,6 +2181,208 @@ SOURCE=.\jpeg\jutils.c
 
 !ENDIF 
 
+# End Source File
+# End Group
+# Begin Group "TIFF files"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\tiff\tif_aux.c
+# ADD CPP /I "tiff"
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
+SOURCE=.\tiff\tif_close.c
+# ADD CPP /I "tiff"
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
+SOURCE=.\tiff\tif_codec.c
+# ADD CPP /I "tiff"
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
+SOURCE=.\tiff\tif_compress.c
+# ADD CPP /I "tiff"
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
+SOURCE=.\tiff\tif_dir.c
+# ADD CPP /I "tiff"
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
+SOURCE=.\tiff\tif_dirinfo.c
+# ADD CPP /I "tiff"
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
+SOURCE=.\tiff\tif_dirread.c
+# ADD CPP /I "tiff"
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
+SOURCE=.\tiff\tif_dirwrite.c
+# ADD CPP /I "tiff"
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
+SOURCE=.\tiff\tif_dumpmode.c
+# ADD CPP /I "tiff"
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
+SOURCE=.\tiff\tif_error.c
+# ADD CPP /I "tiff"
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
+SOURCE=.\tiff\tif_fax3.c
+# ADD CPP /I "tiff"
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
+SOURCE=.\tiff\tif_fax3sm.c
+# ADD CPP /I "tiff"
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
+SOURCE=.\tiff\tif_flush.c
+# ADD CPP /I "tiff"
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
+SOURCE=.\tiff\tif_getimage.c
+# ADD CPP /I "tiff"
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
+SOURCE=.\tiff\tif_jpeg.c
+# ADD CPP /I "tiff"
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
+SOURCE=.\tiff\tif_luv.c
+# ADD CPP /I "tiff"
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
+SOURCE=.\tiff\tif_lzw.c
+# ADD CPP /I "tiff"
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
+SOURCE=.\tiff\tif_next.c
+# ADD CPP /I "tiff"
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
+SOURCE=.\tiff\tif_open.c
+# ADD CPP /I "tiff"
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
+SOURCE=.\tiff\tif_packbits.c
+# ADD CPP /I "tiff"
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
+SOURCE=.\tiff\tif_pixarlog.c
+# ADD CPP /I "tiff"
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
+SOURCE=.\tiff\tif_predict.c
+# ADD CPP /I "tiff"
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
+SOURCE=.\tiff\tif_print.c
+# ADD CPP /I "tiff"
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
+SOURCE=.\tiff\tif_read.c
+# ADD CPP /I "tiff"
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
+SOURCE=.\tiff\tif_strip.c
+# ADD CPP /I "tiff"
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
+SOURCE=.\tiff\tif_swab.c
+# ADD CPP /I "tiff"
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
+SOURCE=.\tiff\tif_thunder.c
+# ADD CPP /I "tiff"
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
+SOURCE=.\tiff\tif_tile.c
+# ADD CPP /I "tiff"
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
+SOURCE=.\tiff\tif_version.c
+# ADD CPP /I "tiff"
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
+SOURCE=.\tiff\tif_warning.c
+# ADD CPP /I "tiff"
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
+SOURCE=.\tiff\tif_win32.c
+# ADD CPP /I "tiff"
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
+SOURCE=.\tiff\tif_write.c
+# ADD CPP /I "tiff"
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
+SOURCE=.\tiff\tif_zip.c
+# ADD CPP /I "tiff"
+# SUBTRACT CPP /YX /Yc /Yu
 # End Source File
 # End Group
 # End Target