X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6e47faf150479ef1171b696bde7ba504c81af481..081eb1b120c1bc9147582cff84de756b4a3a63af:/src/wxvc.dsp diff --git a/src/wxvc.dsp b/src/wxvc.dsp index a22bfcbf6c..bfca38b300 100644 --- a/src/wxvc.dsp +++ b/src/wxvc.dsp @@ -37,11 +37,11 @@ RSC=rc.exe # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" +# PROP Output_Dir "msw/Release" +# PROP Intermediate_Dir "msw/Release" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /Yu"wx/wxprec.h" /FD /c +# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../include" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /Yu"wx/wxprec.h" /FD /c # ADD BASE RSC /l 0x809 # ADD RSC /l 0x809 BSC32=bscmake.exe @@ -49,7 +49,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"Release\wxvc.lib" +# ADD LIB32 /nologo /out:"..\lib\wx.lib" !ELSEIF "$(CFG)" == "wxvc - Win32 Debug" @@ -60,11 +60,11 @@ LIB32=link.exe -lib # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" +# PROP Output_Dir "msw/Debug" +# PROP Intermediate_Dir "msw/Debug" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MDd /W3 /GX /Z7 /Od /I "../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /Yu"wx/wxprec.h" /FD /c +# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /Yu"wx/wxprec.h" /FD /c # ADD BASE RSC /l 0x809 # ADD RSC /l 0x809 BSC32=bscmake.exe @@ -72,7 +72,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"Debug\wxvc.lib" +# ADD LIB32 /nologo /out:"..\lib\wxd.lib" !ENDIF @@ -97,6 +97,10 @@ SOURCE=.\common\clipcmn.cpp # End Source File # Begin Source File +SOURCE=.\common\cmdline.cpp +# End Source File +# Begin Source File + SOURCE=.\common\cmndata.cpp # End Source File # Begin Source File @@ -105,6 +109,10 @@ SOURCE=.\common\config.cpp # End Source File # Begin Source File +SOURCE=.\common\cshelp.cpp +# End Source File +# Begin Source File + SOURCE=.\common\ctrlcmn.cpp # End Source File # Begin Source File @@ -113,7 +121,7 @@ SOURCE=.\common\ctrlsub.cpp # End Source File # Begin Source File -SOURCE=.\common\date.cpp +SOURCE=.\common\datetime.cpp # End Source File # Begin Source File @@ -133,6 +141,10 @@ SOURCE=.\common\dcbase.cpp # End Source File # Begin Source File +SOURCE=.\common\dircmn.cpp +# End Source File +# Begin Source File + SOURCE=.\common\dlgcmn.cpp # End Source File # Begin Source File @@ -163,6 +175,14 @@ SOURCE=.\common\dynlib.cpp # End Source File # Begin Source File +SOURCE=.\common\effects.cpp +# End Source File +# Begin Source File + +SOURCE=.\common\encconv.cpp +# End Source File +# Begin Source File + SOURCE=.\common\event.cpp # End Source File # Begin Source File @@ -188,6 +208,10 @@ SOURCE=.\common\filefn.cpp # End Source File # Begin Source File +SOURCE=.\common\filename.cpp +# End Source File +# Begin Source File + SOURCE=.\common\filesys.cpp # End Source File # Begin Source File @@ -208,6 +232,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 @@ -225,6 +253,10 @@ SOURCE=.\common\gifdecod.cpp # End Source File # Begin Source File +SOURCE=.\common\xpmdecod.cpp +# End Source File +# Begin Source File + SOURCE=.\common\hash.cpp # End Source File # Begin Source File @@ -258,11 +290,28 @@ SOURCE=.\common\imagjpeg.cpp # End Source File # Begin Source File +SOURCE=.\common\imagpcx.cpp +# End Source File +# Begin Source File + SOURCE=.\common\imagpng.cpp # ADD CPP /I "png" /I "zlib" # End Source File # Begin Source File +SOURCE=.\common\imagpnm.cpp +# End Source File +# Begin Source File + +SOURCE=.\common\imagtiff.cpp +# ADD CPP /I "tiff" /I "zlib" +# End Source File +# Begin Source File + +SOURCE=.\common\imagxpm.cpp +# End Source File +# Begin Source File + SOURCE=.\common\intl.cpp # End Source File # Begin Source File @@ -303,7 +352,7 @@ SOURCE=.\common\menucmn.cpp # End Source File # Begin Source File -SOURCE=.\common\mimetype.cpp +SOURCE=.\common\mimecmn.cpp # End Source File # Begin Source File @@ -343,6 +392,10 @@ SOURCE=.\common\protocol.cpp # End Source File # Begin Source File +SOURCE=.\common\quantize.cpp +# End Source File +# Begin Source File + SOURCE=.\common\resource.cpp # End Source File # Begin Source File @@ -391,10 +444,6 @@ SOURCE=.\common\tbarbase.cpp # End Source File # Begin Source File -SOURCE=.\common\tbarsmpl.cpp -# End Source File -# Begin Source File - SOURCE=.\common\textcmn.cpp # End Source File # Begin Source File @@ -403,15 +452,15 @@ SOURCE=.\common\textfile.cpp # End Source File # Begin Source File -SOURCE=.\common\time.cpp +SOURCE=.\common\timercmn.cpp # End Source File # Begin Source File -SOURCE=.\common\timercmn.cpp +SOURCE=.\common\tokenzr.cpp # End Source File # Begin Source File -SOURCE=.\common\tokenzr.cpp +SOURCE=.\common\treebase.cpp # End Source File # Begin Source File @@ -491,11 +540,27 @@ SOURCE=.\generic\busyinfo.cpp # End Source File # Begin Source File +SOURCE=.\generic\calctrl.cpp +# End Source File +# Begin Source File + SOURCE=.\generic\choicdgg.cpp # End Source File # Begin Source File -SOURCE=.\generic\gridg.cpp +SOURCE=.\generic\dirctrlg.cpp +# End Source File +# Begin Source File + +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 @@ -551,6 +616,10 @@ SOURCE=.\generic\scrolwin.cpp # End Source File # Begin Source File +SOURCE=.\generic\splash.cpp +# End Source File +# Begin Source File + SOURCE=.\generic\splitter.cpp # End Source File # Begin Source File @@ -563,6 +632,10 @@ SOURCE=.\generic\tabg.cpp # End Source File # Begin Source File +SOURCE=.\generic\tbarsmpl.cpp +# End Source File +# Begin Source File + SOURCE=.\generic\textdlgg.cpp # End Source File # Begin Source File @@ -571,6 +644,18 @@ SOURCE=.\generic\tipdlg.cpp # End Source File # Begin Source File +SOURCE=.\generic\tipwin.cpp +# End Source File +# Begin Source File + +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 @@ -615,6 +700,10 @@ SOURCE=.\html\htmprint.cpp # End Source File # Begin Source File +SOURCE=.\html\m_dflist.cpp +# End Source File +# Begin Source File + SOURCE=.\html\m_fonts.cpp # End Source File # Begin Source File @@ -639,6 +728,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 @@ -755,6 +848,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 @@ -763,6 +860,10 @@ SOURCE=.\msw\dibutils.cpp # End Source File # Begin Source File +SOURCE=.\msw\dir.cpp +# End Source File +# Begin Source File + SOURCE=.\msw\dirdlg.cpp # End Source File # Begin Source File @@ -776,6 +877,10 @@ SOURCE=.\msw\dummy.cpp # End Source File # Begin Source File +SOURCE=.\msw\enhmeta.cpp +# End Source File +# Begin Source File + SOURCE=.\msw\filedlg.cpp # End Source File # Begin Source File @@ -808,15 +913,32 @@ SOURCE=.\msw\gaugemsw.cpp # End Source File # Begin Source File +SOURCE=.\msw\gdiimage.cpp +# End Source File +# Begin Source File + 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 # Begin Source File +SOURCE=.\msw\gsockmsw.c +# SUBTRACT CPP /YX /Yc /Yu +# End Source File +# Begin Source File + +SOURCE=.\msw\helpchm.cpp +# End Source File +# Begin Source File + SOURCE=.\msw\helpwin.cpp # End Source File # Begin Source File @@ -865,6 +987,10 @@ SOURCE=.\msw\metafile.cpp # End Source File # Begin Source File +SOURCE=.\msw\mimetype.cpp +# End Source File +# Begin Source File + SOURCE=.\msw\minifram.cpp # End Source File # Begin Source File @@ -897,21 +1023,6 @@ SOURCE=.\msw\penwin.cpp # End Source File # Begin Source File -SOURCE=.\msw\pnghand.cpp - -!IF "$(CFG)" == "wxvc - Win32 Release" - -# ADD CPP /I "png" /I "zlib" - -!ELSEIF "$(CFG)" == "wxvc - Win32 Debug" - -# ADD CPP /I "zlib" /I "png" - -!ENDIF - -# End Source File -# Begin Source File - SOURCE=.\msw\printdlg.cpp # End Source File # Begin Source File @@ -996,11 +1107,11 @@ SOURCE=.\msw\tbar95.cpp # End Source File # Begin Source File -SOURCE=.\msw\tbarmsw.cpp +SOURCE=.\msw\textctrl.cpp # End Source File # Begin Source File -SOURCE=.\msw\textctrl.cpp +SOURCE=.\msw\tglbtn.cpp # End Source File # Begin Source File @@ -1034,11 +1145,6 @@ SOURCE=.\msw\wave.cpp SOURCE=.\msw\window.cpp # End Source File -# Begin Source File - -SOURCE=.\msw\xpmhand.cpp -# ADD CPP /I "../src/xpm" -# End Source File # End Group # Begin Group "OLE Files" @@ -1068,318 +1174,6 @@ SOURCE=.\msw\ole\oleutils.cpp SOURCE=.\msw\ole\uuid.cpp # End Source File # End Group -# Begin Group "PNG Files" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=.\png\png.c -# ADD CPP /I "zlib" -# SUBTRACT CPP /YX /Yc /Yu -# End Source File -# Begin Source File - -SOURCE=.\png\png.h -# End Source File -# Begin Source File - -SOURCE=.\png\pngconf.h -# End Source File -# Begin Source File - -SOURCE=.\png\pngerror.c -# ADD CPP /I "zlib" -# SUBTRACT CPP /YX /Yc /Yu -# End Source File -# Begin Source File - -SOURCE=.\png\pngget.c -# ADD CPP /I "zlib" -# SUBTRACT CPP /YX /Yc /Yu -# End Source File -# Begin Source File - -SOURCE=.\png\pngmem.c -# ADD CPP /I "zlib" -# SUBTRACT CPP /YX /Yc /Yu -# End Source File -# Begin Source File - -SOURCE=.\png\pngpread.c -# ADD CPP /I "zlib" -# SUBTRACT CPP /YX /Yc /Yu -# End Source File -# Begin Source File - -SOURCE=.\png\pngread.c -# ADD CPP /I "zlib" -# SUBTRACT CPP /YX /Yc /Yu -# End Source File -# Begin Source File - -SOURCE=.\png\pngrio.c -# ADD CPP /I "zlib" -# SUBTRACT CPP /YX /Yc /Yu -# End Source File -# Begin Source File - -SOURCE=.\png\pngrtran.c -# ADD CPP /I "zlib" -# SUBTRACT CPP /YX /Yc /Yu -# End Source File -# Begin Source File - -SOURCE=.\png\pngrutil.c -# ADD CPP /I "zlib" -# SUBTRACT CPP /YX /Yc /Yu -# End Source File -# Begin Source File - -SOURCE=.\png\pngset.c -# ADD CPP /I "zlib" -# SUBTRACT CPP /YX /Yc /Yu -# End Source File -# Begin Source File - -SOURCE=.\png\pngtrans.c -# ADD CPP /I "zlib" -# SUBTRACT CPP /YX /Yc /Yu -# End Source File -# Begin Source File - -SOURCE=.\png\pngwio.c -# ADD CPP /I "zlib" -# SUBTRACT CPP /YX /Yc /Yu -# End Source File -# Begin Source File - -SOURCE=.\png\pngwrite.c -# ADD CPP /I "zlib" -# SUBTRACT CPP /YX /Yc /Yu -# End Source File -# Begin Source File - -SOURCE=.\png\pngwtran.c -# ADD CPP /I "zlib" -# SUBTRACT CPP /YX /Yc /Yu -# End Source File -# Begin Source File - -SOURCE=.\png\pngwutil.c -# ADD CPP /I "zlib" -# SUBTRACT CPP /YX /Yc /Yu -# End Source File -# End Group -# Begin Group "XPM files" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=.\xpm\crbuffri.c -# ADD CPP /D "FOR_MSW" -# SUBTRACT CPP /YX /Yc /Yu -# End Source File -# Begin Source File - -SOURCE=.\xpm\crbuffrp.c -# ADD CPP /D "FOR_MSW" -# 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" -# SUBTRACT CPP /YX /Yc /Yu -# End Source File -# Begin Source File - -SOURCE=.\xpm\crpfrdat.c -# ADD CPP /D "FOR_MSW" -# SUBTRACT CPP /YX /Yc /Yu -# End Source File -# Begin Source File - -SOURCE=.\xpm\dataxpm.c -# ADD CPP /D "FOR_MSW" -# SUBTRACT CPP /YX /Yc /Yu -# End Source File -# Begin Source File - -SOURCE=.\xpm\hashtab.c -# ADD CPP /D "FOR_MSW" -# 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 -# Begin Group "Zlib Files" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=.\zlib\adler32.c -# SUBTRACT CPP /YX /Yc /Yu -# End Source File -# Begin Source File - -SOURCE=.\zlib\compress.c -# SUBTRACT CPP /YX /Yc /Yu -# End Source File -# Begin Source File - -SOURCE=.\zlib\crc32.c -# SUBTRACT CPP /YX /Yc /Yu -# End Source File -# Begin Source File - -SOURCE=.\zlib\deflate.c -# SUBTRACT CPP /YX /Yc /Yu -# End Source File -# Begin Source File - -SOURCE=.\zlib\gzio.c -# SUBTRACT CPP /YX /Yc /Yu -# End Source File -# Begin Source File - -SOURCE=.\zlib\infblock.c -# SUBTRACT CPP /YX /Yc /Yu -# End Source File -# Begin Source File - -SOURCE=.\zlib\infcodes.c -# SUBTRACT CPP /YX /Yc /Yu -# End Source File -# Begin Source File - -SOURCE=.\zlib\inffast.c -# SUBTRACT CPP /YX /Yc /Yu -# End Source File -# Begin Source File - -SOURCE=.\zlib\inflate.c -# SUBTRACT CPP /YX /Yc /Yu -# End Source File -# Begin Source File - -SOURCE=.\zlib\inftrees.c -# SUBTRACT CPP /YX /Yc /Yu -# End Source File -# Begin Source File - -SOURCE=.\zlib\infutil.c -# SUBTRACT CPP /YX /Yc /Yu -# End Source File -# Begin Source File - -SOURCE=.\zlib\trees.c -# SUBTRACT CPP /YX /Yc /Yu -# End Source File -# Begin Source File - -SOURCE=.\zlib\uncompr.c -# SUBTRACT CPP /YX /Yc /Yu -# End Source File -# Begin Source File - -SOURCE=.\zlib\zutil.c -# SUBTRACT CPP /YX /Yc /Yu -# End Source File -# End Group # Begin Group "Setup" # PROP Default_Filter ""