X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/36edded90cf3d4d11dc55362b332733b79e8f54d..0ba143c9a0ce7cfe812d248d5afee1c377ccaaee:/src/wxvc_dll.dsp diff --git a/src/wxvc_dll.dsp b/src/wxvc_dll.dsp index 16222f40b6..edacc9f9f9 100644 --- a/src/wxvc_dll.dsp +++ b/src/wxvc_dll.dsp @@ -120,7 +120,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 @@ -170,6 +170,10 @@ SOURCE=.\common\dynlib.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 @@ -203,6 +207,10 @@ SOURCE=.\common\fontcmn.cpp # End Source File # Begin Source File +SOURCE=.\common\fontmap.cpp +# End Source File +# Begin Source File + SOURCE=.\common\framecmn.cpp # End Source File # Begin Source File @@ -211,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 @@ -261,11 +273,24 @@ 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\intl.cpp # End Source File # Begin Source File @@ -306,7 +331,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 @@ -398,10 +423,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 @@ -410,10 +431,6 @@ SOURCE=.\common\textfile.cpp # End Source File # Begin Source File -SOURCE=.\common\time.cpp -# End Source File -# Begin Source File - SOURCE=.\common\timercmn.cpp # End Source File # Begin Source File @@ -489,11 +506,15 @@ 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\grid.cpp # End Source File # Begin Source File @@ -561,6 +582,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 @@ -609,6 +634,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 @@ -633,6 +662,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 @@ -757,6 +790,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 @@ -770,6 +807,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 @@ -782,6 +823,14 @@ SOURCE=.\msw\fontdlg.cpp # End Source File # Begin Source File +SOURCE=.\msw\fontenum.cpp +# End Source File +# Begin Source File + +SOURCE=.\msw\fontutil.cpp +# End Source File +# Begin Source File + SOURCE=.\msw\frame.cpp # End Source File # Begin Source File @@ -794,6 +843,10 @@ 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 @@ -851,6 +904,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 @@ -883,19 +940,6 @@ SOURCE=.\msw\penwin.cpp # End Source File # Begin Source File -SOURCE=.\msw\pnghand.cpp - -!IF "$(CFG)" == "wxvc_dll - Win32 Release" - -!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug" - -# ADD CPP /I "png" /I "zlib" - -!ENDIF - -# End Source File -# Begin Source File - SOURCE=.\msw\printdlg.cpp # End Source File # Begin Source File @@ -980,10 +1024,6 @@ SOURCE=.\msw\tbar95.cpp # End Source File # Begin Source File -SOURCE=.\msw\tbarmsw.cpp -# End Source File -# Begin Source File - SOURCE=.\msw\textctrl.cpp # End Source File # Begin Source File @@ -1157,134 +1197,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 @@ -1370,7 +1373,6 @@ SOURCE=.\zlib\zutil.c SOURCE=..\include\wx\msw\setup.h # End Source File # End Group - # Begin Group "JPEG Files" # PROP Default_Filter "" @@ -1378,13 +1380,14 @@ SOURCE=..\include\wx\msw\setup.h SOURCE=.\jpeg\jcapimin.c -!IF "$(CFG)" == "jpeg - Win32 Release" +!IF "$(CFG)" == "wxvc_dll - Win32 Release" -# ADD CPP /I ".." -# SUBTRACT CPP /YX /Yc /Yu +# ADD CPP /I "..\include" /I ".." +# SUBTRACT CPP /I "../include" /YX /Yc /Yu -!ELSEIF "$(CFG)" == "jpeg - Win32 Debug" +!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug" +# ADD CPP /I ".." # SUBTRACT CPP /YX /Yc /Yu !ENDIF @@ -1394,13 +1397,14 @@ SOURCE=.\jpeg\jcapimin.c SOURCE=.\jpeg\jcapistd.c -!IF "$(CFG)" == "jpeg - Win32 Release" +!IF "$(CFG)" == "wxvc_dll - Win32 Release" -# ADD CPP /I ".." -# SUBTRACT CPP /YX /Yc /Yu +# ADD CPP /I "..\include" /I ".." +# SUBTRACT CPP /I "../include" /YX /Yc /Yu -!ELSEIF "$(CFG)" == "jpeg - Win32 Debug" +!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug" +# ADD CPP /I ".." # SUBTRACT CPP /YX /Yc /Yu !ENDIF @@ -1410,13 +1414,14 @@ SOURCE=.\jpeg\jcapistd.c SOURCE=.\jpeg\jccoefct.c -!IF "$(CFG)" == "jpeg - Win32 Release" +!IF "$(CFG)" == "wxvc_dll - Win32 Release" -# ADD CPP /I ".." -# SUBTRACT CPP /YX /Yc /Yu +# ADD CPP /I "..\include" /I ".." +# SUBTRACT CPP /I "../include" /YX /Yc /Yu -!ELSEIF "$(CFG)" == "jpeg - Win32 Debug" +!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug" +# ADD CPP /I ".." # SUBTRACT CPP /YX /Yc /Yu !ENDIF @@ -1426,13 +1431,14 @@ SOURCE=.\jpeg\jccoefct.c SOURCE=.\jpeg\jccolor.c -!IF "$(CFG)" == "jpeg - Win32 Release" +!IF "$(CFG)" == "wxvc_dll - Win32 Release" -# ADD CPP /I ".." -# SUBTRACT CPP /YX /Yc /Yu +# ADD CPP /I "..\include" /I ".." +# SUBTRACT CPP /I "../include" /YX /Yc /Yu -!ELSEIF "$(CFG)" == "jpeg - Win32 Debug" +!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug" +# ADD CPP /I ".." # SUBTRACT CPP /YX /Yc /Yu !ENDIF @@ -1442,13 +1448,14 @@ SOURCE=.\jpeg\jccolor.c SOURCE=.\jpeg\jcdctmgr.c -!IF "$(CFG)" == "jpeg - Win32 Release" +!IF "$(CFG)" == "wxvc_dll - Win32 Release" -# ADD CPP /I ".." -# SUBTRACT CPP /YX /Yc /Yu +# ADD CPP /I "..\include" /I ".." +# SUBTRACT CPP /I "../include" /YX /Yc /Yu -!ELSEIF "$(CFG)" == "jpeg - Win32 Debug" +!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug" +# ADD CPP /I ".." # SUBTRACT CPP /YX /Yc /Yu !ENDIF @@ -1458,13 +1465,14 @@ SOURCE=.\jpeg\jcdctmgr.c SOURCE=.\jpeg\jchuff.c -!IF "$(CFG)" == "jpeg - Win32 Release" +!IF "$(CFG)" == "wxvc_dll - Win32 Release" -# ADD CPP /I ".." -# SUBTRACT CPP /YX /Yc /Yu +# ADD CPP /I "..\include" /I ".." +# SUBTRACT CPP /I "../include" /YX /Yc /Yu -!ELSEIF "$(CFG)" == "jpeg - Win32 Debug" +!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug" +# ADD CPP /I ".." # SUBTRACT CPP /YX /Yc /Yu !ENDIF @@ -1474,13 +1482,14 @@ SOURCE=.\jpeg\jchuff.c SOURCE=.\jpeg\jcinit.c -!IF "$(CFG)" == "jpeg - Win32 Release" +!IF "$(CFG)" == "wxvc_dll - Win32 Release" -# ADD CPP /I ".." -# SUBTRACT CPP /YX /Yc /Yu +# ADD CPP /I "..\include" /I ".." +# SUBTRACT CPP /I "../include" /YX /Yc /Yu -!ELSEIF "$(CFG)" == "jpeg - Win32 Debug" +!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug" +# ADD CPP /I ".." # SUBTRACT CPP /YX /Yc /Yu !ENDIF @@ -1490,13 +1499,14 @@ SOURCE=.\jpeg\jcinit.c SOURCE=.\jpeg\jcmainct.c -!IF "$(CFG)" == "jpeg - Win32 Release" +!IF "$(CFG)" == "wxvc_dll - Win32 Release" -# ADD CPP /I ".." -# SUBTRACT CPP /YX /Yc /Yu +# ADD CPP /I "..\include" /I ".." +# SUBTRACT CPP /I "../include" /YX /Yc /Yu -!ELSEIF "$(CFG)" == "jpeg - Win32 Debug" +!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug" +# ADD CPP /I ".." # SUBTRACT CPP /YX /Yc /Yu !ENDIF @@ -1506,13 +1516,14 @@ SOURCE=.\jpeg\jcmainct.c SOURCE=.\jpeg\jcmarker.c -!IF "$(CFG)" == "jpeg - Win32 Release" +!IF "$(CFG)" == "wxvc_dll - Win32 Release" -# ADD CPP /I ".." -# SUBTRACT CPP /YX /Yc /Yu +# ADD CPP /I "..\include" /I ".." +# SUBTRACT CPP /I "../include" /YX /Yc /Yu -!ELSEIF "$(CFG)" == "jpeg - Win32 Debug" +!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug" +# ADD CPP /I ".." # SUBTRACT CPP /YX /Yc /Yu !ENDIF @@ -1522,13 +1533,14 @@ SOURCE=.\jpeg\jcmarker.c SOURCE=.\jpeg\jcmaster.c -!IF "$(CFG)" == "jpeg - Win32 Release" +!IF "$(CFG)" == "wxvc_dll - Win32 Release" -# ADD CPP /I ".." -# SUBTRACT CPP /YX /Yc /Yu +# ADD CPP /I "..\include" /I ".." +# SUBTRACT CPP /I "../include" /YX /Yc /Yu -!ELSEIF "$(CFG)" == "jpeg - Win32 Debug" +!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug" +# ADD CPP /I ".." # SUBTRACT CPP /YX /Yc /Yu !ENDIF @@ -1538,13 +1550,14 @@ SOURCE=.\jpeg\jcmaster.c SOURCE=.\jpeg\jcomapi.c -!IF "$(CFG)" == "jpeg - Win32 Release" +!IF "$(CFG)" == "wxvc_dll - Win32 Release" -# ADD CPP /I ".." -# SUBTRACT CPP /YX /Yc /Yu +# ADD CPP /I "..\include" /I ".." +# SUBTRACT CPP /I "../include" /YX /Yc /Yu -!ELSEIF "$(CFG)" == "jpeg - Win32 Debug" +!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug" +# ADD CPP /I ".." # SUBTRACT CPP /YX /Yc /Yu !ENDIF @@ -1554,13 +1567,14 @@ SOURCE=.\jpeg\jcomapi.c SOURCE=.\jpeg\jcparam.c -!IF "$(CFG)" == "jpeg - Win32 Release" +!IF "$(CFG)" == "wxvc_dll - Win32 Release" -# ADD CPP /I ".." -# SUBTRACT CPP /YX /Yc /Yu +# ADD CPP /I "..\include" /I ".." +# SUBTRACT CPP /I "../include" /YX /Yc /Yu -!ELSEIF "$(CFG)" == "jpeg - Win32 Debug" +!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug" +# ADD CPP /I ".." # SUBTRACT CPP /YX /Yc /Yu !ENDIF @@ -1570,13 +1584,14 @@ SOURCE=.\jpeg\jcparam.c SOURCE=.\jpeg\jcphuff.c -!IF "$(CFG)" == "jpeg - Win32 Release" +!IF "$(CFG)" == "wxvc_dll - Win32 Release" -# ADD CPP /I ".." -# SUBTRACT CPP /YX /Yc /Yu +# ADD CPP /I "..\include" /I ".." +# SUBTRACT CPP /I "../include" /YX /Yc /Yu -!ELSEIF "$(CFG)" == "jpeg - Win32 Debug" +!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug" +# ADD CPP /I ".." # SUBTRACT CPP /YX /Yc /Yu !ENDIF @@ -1586,13 +1601,14 @@ SOURCE=.\jpeg\jcphuff.c SOURCE=.\jpeg\jcprepct.c -!IF "$(CFG)" == "jpeg - Win32 Release" +!IF "$(CFG)" == "wxvc_dll - Win32 Release" -# ADD CPP /I ".." -# SUBTRACT CPP /YX /Yc /Yu +# ADD CPP /I "..\include" /I ".." +# SUBTRACT CPP /I "../include" /YX /Yc /Yu -!ELSEIF "$(CFG)" == "jpeg - Win32 Debug" +!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug" +# ADD CPP /I ".." # SUBTRACT CPP /YX /Yc /Yu !ENDIF @@ -1602,13 +1618,14 @@ SOURCE=.\jpeg\jcprepct.c SOURCE=.\jpeg\jcsample.c -!IF "$(CFG)" == "jpeg - Win32 Release" +!IF "$(CFG)" == "wxvc_dll - Win32 Release" -# ADD CPP /I ".." -# SUBTRACT CPP /YX /Yc /Yu +# ADD CPP /I "..\include" /I ".." +# SUBTRACT CPP /I "../include" /YX /Yc /Yu -!ELSEIF "$(CFG)" == "jpeg - Win32 Debug" +!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug" +# ADD CPP /I ".." # SUBTRACT CPP /YX /Yc /Yu !ENDIF @@ -1618,13 +1635,14 @@ SOURCE=.\jpeg\jcsample.c SOURCE=.\jpeg\jctrans.c -!IF "$(CFG)" == "jpeg - Win32 Release" +!IF "$(CFG)" == "wxvc_dll - Win32 Release" -# ADD CPP /I ".." -# SUBTRACT CPP /YX /Yc /Yu +# ADD CPP /I "..\include" /I ".." +# SUBTRACT CPP /I "../include" /YX /Yc /Yu -!ELSEIF "$(CFG)" == "jpeg - Win32 Debug" +!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug" +# ADD CPP /I ".." # SUBTRACT CPP /YX /Yc /Yu !ENDIF @@ -1634,13 +1652,14 @@ SOURCE=.\jpeg\jctrans.c SOURCE=.\jpeg\jdapimin.c -!IF "$(CFG)" == "jpeg - Win32 Release" +!IF "$(CFG)" == "wxvc_dll - Win32 Release" -# ADD CPP /I ".." -# SUBTRACT CPP /YX /Yc /Yu +# ADD CPP /I "..\include" /I ".." +# SUBTRACT CPP /I "../include" /YX /Yc /Yu -!ELSEIF "$(CFG)" == "jpeg - Win32 Debug" +!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug" +# ADD CPP /I ".." # SUBTRACT CPP /YX /Yc /Yu !ENDIF @@ -1650,13 +1669,14 @@ SOURCE=.\jpeg\jdapimin.c SOURCE=.\jpeg\jdapistd.c -!IF "$(CFG)" == "jpeg - Win32 Release" +!IF "$(CFG)" == "wxvc_dll - Win32 Release" -# ADD CPP /I ".." -# SUBTRACT CPP /YX /Yc /Yu +# ADD CPP /I "..\include" /I ".." +# SUBTRACT CPP /I "../include" /YX /Yc /Yu -!ELSEIF "$(CFG)" == "jpeg - Win32 Debug" +!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug" +# ADD CPP /I ".." # SUBTRACT CPP /YX /Yc /Yu !ENDIF @@ -1666,13 +1686,14 @@ SOURCE=.\jpeg\jdapistd.c SOURCE=.\jpeg\jdatadst.c -!IF "$(CFG)" == "jpeg - Win32 Release" +!IF "$(CFG)" == "wxvc_dll - Win32 Release" -# ADD CPP /I ".." -# SUBTRACT CPP /YX /Yc /Yu +# ADD CPP /I "..\include" /I ".." +# SUBTRACT CPP /I "../include" /YX /Yc /Yu -!ELSEIF "$(CFG)" == "jpeg - Win32 Debug" +!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug" +# ADD CPP /I ".." # SUBTRACT CPP /YX /Yc /Yu !ENDIF @@ -1682,13 +1703,14 @@ SOURCE=.\jpeg\jdatadst.c SOURCE=.\jpeg\jdatasrc.c -!IF "$(CFG)" == "jpeg - Win32 Release" +!IF "$(CFG)" == "wxvc_dll - Win32 Release" -# ADD CPP /I ".." -# SUBTRACT CPP /YX /Yc /Yu +# ADD CPP /I "..\include" /I ".." +# SUBTRACT CPP /I "../include" /YX /Yc /Yu -!ELSEIF "$(CFG)" == "jpeg - Win32 Debug" +!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug" +# ADD CPP /I ".." # SUBTRACT CPP /YX /Yc /Yu !ENDIF @@ -1698,13 +1720,14 @@ SOURCE=.\jpeg\jdatasrc.c SOURCE=.\jpeg\jdcoefct.c -!IF "$(CFG)" == "jpeg - Win32 Release" +!IF "$(CFG)" == "wxvc_dll - Win32 Release" -# ADD CPP /I ".." -# SUBTRACT CPP /YX /Yc /Yu +# ADD CPP /I "..\include" /I ".." +# SUBTRACT CPP /I "../include" /YX /Yc /Yu -!ELSEIF "$(CFG)" == "jpeg - Win32 Debug" +!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug" +# ADD CPP /I ".." # SUBTRACT CPP /YX /Yc /Yu !ENDIF @@ -1714,13 +1737,14 @@ SOURCE=.\jpeg\jdcoefct.c SOURCE=.\jpeg\jdcolor.c -!IF "$(CFG)" == "jpeg - Win32 Release" +!IF "$(CFG)" == "wxvc_dll - Win32 Release" -# ADD CPP /I ".." -# SUBTRACT CPP /YX /Yc /Yu +# ADD CPP /I "..\include" /I ".." +# SUBTRACT CPP /I "../include" /YX /Yc /Yu -!ELSEIF "$(CFG)" == "jpeg - Win32 Debug" +!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug" +# ADD CPP /I ".." # SUBTRACT CPP /YX /Yc /Yu !ENDIF @@ -1730,13 +1754,14 @@ SOURCE=.\jpeg\jdcolor.c SOURCE=.\jpeg\jddctmgr.c -!IF "$(CFG)" == "jpeg - Win32 Release" +!IF "$(CFG)" == "wxvc_dll - Win32 Release" -# ADD CPP /I ".." -# SUBTRACT CPP /YX /Yc /Yu +# ADD CPP /I "..\include" /I ".." +# SUBTRACT CPP /I "../include" /YX /Yc /Yu -!ELSEIF "$(CFG)" == "jpeg - Win32 Debug" +!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug" +# ADD CPP /I ".." # SUBTRACT CPP /YX /Yc /Yu !ENDIF @@ -1746,13 +1771,14 @@ SOURCE=.\jpeg\jddctmgr.c SOURCE=.\jpeg\jdhuff.c -!IF "$(CFG)" == "jpeg - Win32 Release" +!IF "$(CFG)" == "wxvc_dll - Win32 Release" -# ADD CPP /I ".." -# SUBTRACT CPP /YX /Yc /Yu +# ADD CPP /I "..\include" /I ".." +# SUBTRACT CPP /I "../include" /YX /Yc /Yu -!ELSEIF "$(CFG)" == "jpeg - Win32 Debug" +!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug" +# ADD CPP /I ".." # SUBTRACT CPP /YX /Yc /Yu !ENDIF @@ -1762,13 +1788,14 @@ SOURCE=.\jpeg\jdhuff.c SOURCE=.\jpeg\jdinput.c -!IF "$(CFG)" == "jpeg - Win32 Release" +!IF "$(CFG)" == "wxvc_dll - Win32 Release" -# ADD CPP /I ".." -# SUBTRACT CPP /YX /Yc /Yu +# ADD CPP /I "..\include" /I ".." +# SUBTRACT CPP /I "../include" /YX /Yc /Yu -!ELSEIF "$(CFG)" == "jpeg - Win32 Debug" +!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug" +# ADD CPP /I ".." # SUBTRACT CPP /YX /Yc /Yu !ENDIF @@ -1778,13 +1805,14 @@ SOURCE=.\jpeg\jdinput.c SOURCE=.\jpeg\jdmainct.c -!IF "$(CFG)" == "jpeg - Win32 Release" +!IF "$(CFG)" == "wxvc_dll - Win32 Release" -# ADD CPP /I ".." -# SUBTRACT CPP /YX /Yc /Yu +# ADD CPP /I "..\include" /I ".." +# SUBTRACT CPP /I "../include" /YX /Yc /Yu -!ELSEIF "$(CFG)" == "jpeg - Win32 Debug" +!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug" +# ADD CPP /I ".." # SUBTRACT CPP /YX /Yc /Yu !ENDIF @@ -1794,13 +1822,14 @@ SOURCE=.\jpeg\jdmainct.c SOURCE=.\jpeg\jdmarker.c -!IF "$(CFG)" == "jpeg - Win32 Release" +!IF "$(CFG)" == "wxvc_dll - Win32 Release" -# ADD CPP /I ".." -# SUBTRACT CPP /YX /Yc /Yu +# ADD CPP /I "..\include" /I ".." +# SUBTRACT CPP /I "../include" /YX /Yc /Yu -!ELSEIF "$(CFG)" == "jpeg - Win32 Debug" +!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug" +# ADD CPP /I ".." # SUBTRACT CPP /YX /Yc /Yu !ENDIF @@ -1810,13 +1839,14 @@ SOURCE=.\jpeg\jdmarker.c SOURCE=.\jpeg\jdmaster.c -!IF "$(CFG)" == "jpeg - Win32 Release" +!IF "$(CFG)" == "wxvc_dll - Win32 Release" -# ADD CPP /I ".." -# SUBTRACT CPP /YX /Yc /Yu +# ADD CPP /I "..\include" /I ".." +# SUBTRACT CPP /I "../include" /YX /Yc /Yu -!ELSEIF "$(CFG)" == "jpeg - Win32 Debug" +!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug" +# ADD CPP /I ".." # SUBTRACT CPP /YX /Yc /Yu !ENDIF @@ -1826,13 +1856,14 @@ SOURCE=.\jpeg\jdmaster.c SOURCE=.\jpeg\jdmerge.c -!IF "$(CFG)" == "jpeg - Win32 Release" +!IF "$(CFG)" == "wxvc_dll - Win32 Release" -# ADD CPP /I ".." -# SUBTRACT CPP /YX /Yc /Yu +# ADD CPP /I "..\include" /I ".." +# SUBTRACT CPP /I "../include" /YX /Yc /Yu -!ELSEIF "$(CFG)" == "jpeg - Win32 Debug" +!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug" +# ADD CPP /I ".." # SUBTRACT CPP /YX /Yc /Yu !ENDIF @@ -1842,13 +1873,14 @@ SOURCE=.\jpeg\jdmerge.c SOURCE=.\jpeg\jdphuff.c -!IF "$(CFG)" == "jpeg - Win32 Release" +!IF "$(CFG)" == "wxvc_dll - Win32 Release" -# ADD CPP /I ".." -# SUBTRACT CPP /YX /Yc /Yu +# ADD CPP /I "..\include" /I ".." +# SUBTRACT CPP /I "../include" /YX /Yc /Yu -!ELSEIF "$(CFG)" == "jpeg - Win32 Debug" +!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug" +# ADD CPP /I ".." # SUBTRACT CPP /YX /Yc /Yu !ENDIF @@ -1858,13 +1890,14 @@ SOURCE=.\jpeg\jdphuff.c SOURCE=.\jpeg\jdpostct.c -!IF "$(CFG)" == "jpeg - Win32 Release" +!IF "$(CFG)" == "wxvc_dll - Win32 Release" -# ADD CPP /I ".." -# SUBTRACT CPP /YX /Yc /Yu +# ADD CPP /I "..\include" /I ".." +# SUBTRACT CPP /I "../include" /YX /Yc /Yu -!ELSEIF "$(CFG)" == "jpeg - Win32 Debug" +!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug" +# ADD CPP /I ".." # SUBTRACT CPP /YX /Yc /Yu !ENDIF @@ -1874,13 +1907,14 @@ SOURCE=.\jpeg\jdpostct.c SOURCE=.\jpeg\jdsample.c -!IF "$(CFG)" == "jpeg - Win32 Release" +!IF "$(CFG)" == "wxvc_dll - Win32 Release" -# ADD CPP /I ".." -# SUBTRACT CPP /YX /Yc /Yu +# ADD CPP /I "..\include" /I ".." +# SUBTRACT CPP /I "../include" /YX /Yc /Yu -!ELSEIF "$(CFG)" == "jpeg - Win32 Debug" +!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug" +# ADD CPP /I ".." # SUBTRACT CPP /YX /Yc /Yu !ENDIF @@ -1890,13 +1924,14 @@ SOURCE=.\jpeg\jdsample.c SOURCE=.\jpeg\jdtrans.c -!IF "$(CFG)" == "jpeg - Win32 Release" +!IF "$(CFG)" == "wxvc_dll - Win32 Release" -# ADD CPP /I ".." -# SUBTRACT CPP /YX /Yc /Yu +# ADD CPP /I "..\include" /I ".." +# SUBTRACT CPP /I "../include" /YX /Yc /Yu -!ELSEIF "$(CFG)" == "jpeg - Win32 Debug" +!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug" +# ADD CPP /I ".." # SUBTRACT CPP /YX /Yc /Yu !ENDIF @@ -1906,13 +1941,14 @@ SOURCE=.\jpeg\jdtrans.c SOURCE=.\jpeg\jerror.c -!IF "$(CFG)" == "jpeg - Win32 Release" +!IF "$(CFG)" == "wxvc_dll - Win32 Release" -# ADD CPP /I ".." -# SUBTRACT CPP /YX /Yc /Yu +# ADD CPP /I "..\include" /I ".." +# SUBTRACT CPP /I "../include" /YX /Yc /Yu -!ELSEIF "$(CFG)" == "jpeg - Win32 Debug" +!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug" +# ADD CPP /I ".." # SUBTRACT CPP /YX /Yc /Yu !ENDIF @@ -1922,13 +1958,14 @@ SOURCE=.\jpeg\jerror.c SOURCE=.\jpeg\jfdctflt.c -!IF "$(CFG)" == "jpeg - Win32 Release" +!IF "$(CFG)" == "wxvc_dll - Win32 Release" -# ADD CPP /I ".." -# SUBTRACT CPP /YX /Yc /Yu +# ADD CPP /I "..\include" /I ".." +# SUBTRACT CPP /I "../include" /YX /Yc /Yu -!ELSEIF "$(CFG)" == "jpeg - Win32 Debug" +!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug" +# ADD CPP /I ".." # SUBTRACT CPP /YX /Yc /Yu !ENDIF @@ -1938,13 +1975,14 @@ SOURCE=.\jpeg\jfdctflt.c SOURCE=.\jpeg\jfdctfst.c -!IF "$(CFG)" == "jpeg - Win32 Release" +!IF "$(CFG)" == "wxvc_dll - Win32 Release" -# ADD CPP /I ".." -# SUBTRACT CPP /YX /Yc /Yu +# ADD CPP /I "..\include" /I ".." +# SUBTRACT CPP /I "../include" /YX /Yc /Yu -!ELSEIF "$(CFG)" == "jpeg - Win32 Debug" +!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug" +# ADD CPP /I ".." # SUBTRACT CPP /YX /Yc /Yu !ENDIF @@ -1954,13 +1992,14 @@ SOURCE=.\jpeg\jfdctfst.c SOURCE=.\jpeg\jfdctint.c -!IF "$(CFG)" == "jpeg - Win32 Release" +!IF "$(CFG)" == "wxvc_dll - Win32 Release" -# ADD CPP /I ".." -# SUBTRACT CPP /YX /Yc /Yu +# ADD CPP /I "..\include" /I ".." +# SUBTRACT CPP /I "../include" /YX /Yc /Yu -!ELSEIF "$(CFG)" == "jpeg - Win32 Debug" +!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug" +# ADD CPP /I ".." # SUBTRACT CPP /YX /Yc /Yu !ENDIF @@ -1970,13 +2009,14 @@ SOURCE=.\jpeg\jfdctint.c SOURCE=.\jpeg\jidctflt.c -!IF "$(CFG)" == "jpeg - Win32 Release" +!IF "$(CFG)" == "wxvc_dll - Win32 Release" -# ADD CPP /I ".." -# SUBTRACT CPP /YX /Yc /Yu +# ADD CPP /I "..\include" /I ".." +# SUBTRACT CPP /I "../include" /YX /Yc /Yu -!ELSEIF "$(CFG)" == "jpeg - Win32 Debug" +!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug" +# ADD CPP /I ".." # SUBTRACT CPP /YX /Yc /Yu !ENDIF @@ -1986,13 +2026,14 @@ SOURCE=.\jpeg\jidctflt.c SOURCE=.\jpeg\jidctfst.c -!IF "$(CFG)" == "jpeg - Win32 Release" +!IF "$(CFG)" == "wxvc_dll - Win32 Release" -# ADD CPP /I ".." -# SUBTRACT CPP /YX /Yc /Yu +# ADD CPP /I "..\include" /I ".." +# SUBTRACT CPP /I "../include" /YX /Yc /Yu -!ELSEIF "$(CFG)" == "jpeg - Win32 Debug" +!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug" +# ADD CPP /I ".." # SUBTRACT CPP /YX /Yc /Yu !ENDIF @@ -2002,13 +2043,14 @@ SOURCE=.\jpeg\jidctfst.c SOURCE=.\jpeg\jidctint.c -!IF "$(CFG)" == "jpeg - Win32 Release" +!IF "$(CFG)" == "wxvc_dll - Win32 Release" -# ADD CPP /I ".." -# SUBTRACT CPP /YX /Yc /Yu +# ADD CPP /I "..\include" /I ".." +# SUBTRACT CPP /I "../include" /YX /Yc /Yu -!ELSEIF "$(CFG)" == "jpeg - Win32 Debug" +!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug" +# ADD CPP /I ".." # SUBTRACT CPP /YX /Yc /Yu !ENDIF @@ -2018,13 +2060,14 @@ SOURCE=.\jpeg\jidctint.c SOURCE=.\jpeg\jidctred.c -!IF "$(CFG)" == "jpeg - Win32 Release" +!IF "$(CFG)" == "wxvc_dll - Win32 Release" -# ADD CPP /I ".." -# SUBTRACT CPP /YX /Yc /Yu +# ADD CPP /I "..\include" /I ".." +# SUBTRACT CPP /I "../include" /YX /Yc /Yu -!ELSEIF "$(CFG)" == "jpeg - Win32 Debug" +!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug" +# ADD CPP /I ".." # SUBTRACT CPP /YX /Yc /Yu !ENDIF @@ -2034,13 +2077,14 @@ SOURCE=.\jpeg\jidctred.c SOURCE=.\jpeg\jmemmgr.c -!IF "$(CFG)" == "jpeg - Win32 Release" +!IF "$(CFG)" == "wxvc_dll - Win32 Release" -# ADD CPP /I ".." -# SUBTRACT CPP /YX /Yc /Yu +# ADD CPP /I "..\include" /I ".." +# SUBTRACT CPP /I "../include" /YX /Yc /Yu -!ELSEIF "$(CFG)" == "jpeg - Win32 Debug" +!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug" +# ADD CPP /I ".." # SUBTRACT CPP /YX /Yc /Yu !ENDIF @@ -2050,13 +2094,14 @@ SOURCE=.\jpeg\jmemmgr.c SOURCE=.\jpeg\jmemnobs.c -!IF "$(CFG)" == "jpeg - Win32 Release" +!IF "$(CFG)" == "wxvc_dll - Win32 Release" -# ADD CPP /I ".." -# SUBTRACT CPP /YX /Yc /Yu +# ADD CPP /I "..\include" /I ".." +# SUBTRACT CPP /I "../include" /YX /Yc /Yu -!ELSEIF "$(CFG)" == "jpeg - Win32 Debug" +!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug" +# ADD CPP /I ".." # SUBTRACT CPP /YX /Yc /Yu !ENDIF @@ -2066,13 +2111,14 @@ SOURCE=.\jpeg\jmemnobs.c SOURCE=.\jpeg\jquant1.c -!IF "$(CFG)" == "jpeg - Win32 Release" +!IF "$(CFG)" == "wxvc_dll - Win32 Release" -# ADD CPP /I ".." -# SUBTRACT CPP /YX /Yc /Yu +# ADD CPP /I "..\include" /I ".." +# SUBTRACT CPP /I "../include" /YX /Yc /Yu -!ELSEIF "$(CFG)" == "jpeg - Win32 Debug" +!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug" +# ADD CPP /I ".." # SUBTRACT CPP /YX /Yc /Yu !ENDIF @@ -2082,13 +2128,14 @@ SOURCE=.\jpeg\jquant1.c SOURCE=.\jpeg\jquant2.c -!IF "$(CFG)" == "jpeg - Win32 Release" +!IF "$(CFG)" == "wxvc_dll - Win32 Release" -# ADD CPP /I ".." -# SUBTRACT CPP /YX /Yc /Yu +# ADD CPP /I "..\include" /I ".." +# SUBTRACT CPP /I "../include" /YX /Yc /Yu -!ELSEIF "$(CFG)" == "jpeg - Win32 Debug" +!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug" +# ADD CPP /I ".." # SUBTRACT CPP /YX /Yc /Yu !ENDIF @@ -2098,19 +2145,19 @@ SOURCE=.\jpeg\jquant2.c SOURCE=.\jpeg\jutils.c -!IF "$(CFG)" == "jpeg - Win32 Release" +!IF "$(CFG)" == "wxvc_dll - Win32 Release" -# ADD CPP /I ".." -# SUBTRACT CPP /YX /Yc /Yu +# ADD CPP /I "..\include" /I ".." +# SUBTRACT CPP /I "../include" /YX /Yc /Yu -!ELSEIF "$(CFG)" == "jpeg - Win32 Debug" +!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug" +# ADD CPP /I ".." # SUBTRACT CPP /YX /Yc /Yu !ENDIF # End Source File # End Group - # End Target # End Project