X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/36edded90cf3d4d11dc55362b332733b79e8f54d..0147a7c1409829913d5cdfc29d3d1588f29c64cb:/src/wxvc_dll.dsp diff --git a/src/wxvc_dll.dsp b/src/wxvc_dll.dsp index 16222f40b6..8a2930ead7 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 rpcrt4.lib winmm.lib opengl32.lib glu32.lib /nologo /subsystem:windows /dll /machine:I386 /out:"../lib/wx23_2.dll" !ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug" @@ -64,12 +64,12 @@ 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 -# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /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" /D WXMAKINGDLL=1 /Yu"wx/wxprec.h" /FD /c +# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /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" /D WXMAKINGDLL=1 /Yu"wx/wxprec.h" /FD /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x809 /d "_DEBUG" @@ -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 rpcrt4.lib winmm.lib opengl32.lib glu32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"../lib/wx23_2d.dll" /pdbtype:sept !ENDIF @@ -104,6 +104,14 @@ SOURCE=.\common\clipcmn.cpp # End Source File # Begin Source File +SOURCE=.\common\cmdline.cpp +# End Source File +# Begin Source File + +SOURCE=.\common\cmdproc.cpp +# End Source File +# Begin Source File + SOURCE=.\common\cmndata.cpp # End Source File # Begin Source File @@ -112,6 +120,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 @@ -120,7 +132,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 @@ -132,6 +144,10 @@ SOURCE=.\common\db.cpp # End Source File # Begin Source File +SOURCE=.\common\dbgrid.cpp +# End Source File +# Begin Source File + SOURCE=.\common\dbtable.cpp # End Source File # Begin Source File @@ -140,6 +156,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 @@ -170,6 +190,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 @@ -195,6 +223,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 @@ -203,6 +235,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 +247,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 @@ -220,10 +260,18 @@ SOURCE=.\common\ftp.cpp # End Source File # Begin Source File +SOURCE=.\common\gaugecmn.cpp +# End Source File +# Begin Source File + SOURCE=.\common\gdicmn.cpp # End Source File # Begin Source File +SOURCE=.\common\geometry.cpp +# End Source File +# Begin Source File + SOURCE=.\common\gifdecod.cpp # End Source File # Begin Source File @@ -261,11 +309,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 @@ -306,7 +371,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 @@ -318,6 +383,10 @@ SOURCE=.\common\mstream.cpp # End Source File # Begin Source File +SOURCE=.\common\nbkbase.cpp +# End Source File +# Begin Source File + SOURCE=.\common\object.cpp # End Source File # Begin Source File @@ -346,6 +415,19 @@ SOURCE=.\common\protocol.cpp # End Source File # Begin Source File +SOURCE=.\common\quantize.cpp +# End Source File +# Begin Source File + +SOURCE=.\common\radiocmn.cpp +# End Source File +# Begin Source File + +SOURCE=.\common\regex.cpp +# ADD CPP /I "regex" +# End Source File +# Begin Source File + SOURCE=.\common\resourc2.cpp # End Source File # Begin Source File @@ -394,11 +476,11 @@ SOURCE=.\common\string.cpp # End Source File # Begin Source File -SOURCE=.\common\tbarbase.cpp +SOURCE=.\common\sysopt.cpp # End Source File # Begin Source File -SOURCE=.\common\tbarsmpl.cpp +SOURCE=.\common\tbarbase.cpp # End Source File # Begin Source File @@ -410,15 +492,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 @@ -472,6 +554,10 @@ SOURCE=.\common\wxexpr.cpp # End Source File # Begin Source File +SOURCE=.\common\xpmdecod.cpp +# End Source File +# Begin Source File + SOURCE=.\common\zipstrm.cpp # ADD CPP /I "zlib" # End Source File @@ -489,11 +575,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\dragimgg.cpp +# End Source File +# Begin Source File + +SOURCE=.\generic\grid.cpp +# End Source File +# Begin Source File + +SOURCE=.\generic\gridctrl.cpp +# End Source File +# Begin Source File + +SOURCE=.\generic\gridsel.cpp # End Source File # Begin Source File @@ -545,7 +647,11 @@ SOURCE=.\generic\sashwin.cpp # End Source File # Begin Source File -SOURCE=.\generic\scrolwin.cpp +SOURCE=.\generic\scrlwing.cpp +# End Source File +# Begin Source File + +SOURCE=.\generic\splash.cpp # End Source File # Begin Source File @@ -561,12 +667,32 @@ 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 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 # Begin Group "wxHTML Files" @@ -609,6 +735,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 +763,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 @@ -749,6 +883,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 @@ -757,6 +895,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 +912,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 +928,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,15 +948,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 @@ -851,6 +1022,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 +1058,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 @@ -940,6 +1102,10 @@ SOURCE=.\msw\slidrmsw.cpp # End Source File # Begin Source File +SOURCE=.\msw\snglinst.cpp +# End Source File +# Begin Source File + SOURCE=.\msw\spinbutt.cpp # End Source File # Begin Source File @@ -980,11 +1146,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 @@ -1018,11 +1184,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" @@ -1152,142 +1313,6 @@ SOURCE=.\png\pngwutil.c # 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 "" @@ -1370,7 +1395,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 +1402,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 /Zi /I ".." # SUBTRACT CPP /YX /Yc /Yu !ENDIF @@ -1394,13 +1419,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 /Zi /I ".." # SUBTRACT CPP /YX /Yc /Yu !ENDIF @@ -1410,13 +1436,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 /Zi /I ".." # SUBTRACT CPP /YX /Yc /Yu !ENDIF @@ -1426,13 +1453,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 /Zi /I ".." # SUBTRACT CPP /YX /Yc /Yu !ENDIF @@ -1442,13 +1470,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 /Zi /I ".." # SUBTRACT CPP /YX /Yc /Yu !ENDIF @@ -1458,13 +1487,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 /Zi /I ".." # SUBTRACT CPP /YX /Yc /Yu !ENDIF @@ -1474,13 +1504,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 /Zi /I ".." # SUBTRACT CPP /YX /Yc /Yu !ENDIF @@ -1490,13 +1521,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 /Zi /I ".." # SUBTRACT CPP /YX /Yc /Yu !ENDIF @@ -1506,13 +1538,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 /Zi /I ".." # SUBTRACT CPP /YX /Yc /Yu !ENDIF @@ -1522,13 +1555,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 /Zi /I ".." # SUBTRACT CPP /YX /Yc /Yu !ENDIF @@ -1538,13 +1572,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 /Zi /I ".." # SUBTRACT CPP /YX /Yc /Yu !ENDIF @@ -1554,13 +1589,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 /Zi /I ".." # SUBTRACT CPP /YX /Yc /Yu !ENDIF @@ -1570,13 +1606,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 /Zi /I ".." # SUBTRACT CPP /YX /Yc /Yu !ENDIF @@ -1586,13 +1623,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 /Zi /I ".." # SUBTRACT CPP /YX /Yc /Yu !ENDIF @@ -1602,13 +1640,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 /Zi /I ".." # SUBTRACT CPP /YX /Yc /Yu !ENDIF @@ -1618,13 +1657,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 /Zi /I ".." # SUBTRACT CPP /YX /Yc /Yu !ENDIF @@ -1634,13 +1674,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 /Zi /I ".." # SUBTRACT CPP /YX /Yc /Yu !ENDIF @@ -1650,13 +1691,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 /Zi /I ".." # SUBTRACT CPP /YX /Yc /Yu !ENDIF @@ -1666,13 +1708,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 /Zi /I ".." # SUBTRACT CPP /YX /Yc /Yu !ENDIF @@ -1682,13 +1725,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 /Zi /I ".." # SUBTRACT CPP /YX /Yc /Yu !ENDIF @@ -1698,13 +1742,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 /Zi /I ".." # SUBTRACT CPP /YX /Yc /Yu !ENDIF @@ -1714,13 +1759,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 /Zi /I ".." # SUBTRACT CPP /YX /Yc /Yu !ENDIF @@ -1730,13 +1776,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 /Zi /I ".." # SUBTRACT CPP /YX /Yc /Yu !ENDIF @@ -1746,13 +1793,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 /Zi /I ".." # SUBTRACT CPP /YX /Yc /Yu !ENDIF @@ -1762,13 +1810,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 /Zi /I ".." # SUBTRACT CPP /YX /Yc /Yu !ENDIF @@ -1778,13 +1827,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 /Zi /I ".." # SUBTRACT CPP /YX /Yc /Yu !ENDIF @@ -1794,13 +1844,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 /Zi /I ".." # SUBTRACT CPP /YX /Yc /Yu !ENDIF @@ -1810,13 +1861,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 /Zi /I ".." # SUBTRACT CPP /YX /Yc /Yu !ENDIF @@ -1826,13 +1878,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 /Zi /I ".." # SUBTRACT CPP /YX /Yc /Yu !ENDIF @@ -1842,13 +1895,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 /Zi /I ".." # SUBTRACT CPP /YX /Yc /Yu !ENDIF @@ -1858,13 +1912,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 /Zi /I ".." # SUBTRACT CPP /YX /Yc /Yu !ENDIF @@ -1874,13 +1929,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 /Zi /I ".." # SUBTRACT CPP /YX /Yc /Yu !ENDIF @@ -1890,13 +1946,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 /Zi /I ".." # SUBTRACT CPP /YX /Yc /Yu !ENDIF @@ -1906,13 +1963,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 /Zi /I ".." # SUBTRACT CPP /YX /Yc /Yu !ENDIF @@ -1922,13 +1980,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 /Zi /I ".." # SUBTRACT CPP /YX /Yc /Yu !ENDIF @@ -1938,13 +1997,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 /Zi /I ".." # SUBTRACT CPP /YX /Yc /Yu !ENDIF @@ -1954,13 +2014,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 /Zi /I ".." # SUBTRACT CPP /YX /Yc /Yu !ENDIF @@ -1970,13 +2031,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 /Zi /I ".." # SUBTRACT CPP /YX /Yc /Yu !ENDIF @@ -1986,13 +2048,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 /Zi /I ".." # SUBTRACT CPP /YX /Yc /Yu !ENDIF @@ -2002,13 +2065,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 /Zi /I ".." # SUBTRACT CPP /YX /Yc /Yu !ENDIF @@ -2018,13 +2082,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 /Zi /I ".." # SUBTRACT CPP /YX /Yc /Yu !ENDIF @@ -2034,13 +2099,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 /Zi /I ".." # SUBTRACT CPP /YX /Yc /Yu !ENDIF @@ -2050,13 +2116,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 /Zi /I ".." # SUBTRACT CPP /YX /Yc /Yu !ENDIF @@ -2066,13 +2133,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 /Zi /I ".." # SUBTRACT CPP /YX /Yc /Yu !ENDIF @@ -2082,13 +2150,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 /Zi /I ".." # SUBTRACT CPP /YX /Yc /Yu !ENDIF @@ -2098,19 +2167,250 @@ 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 /Zi /I ".." # SUBTRACT CPP /YX /Yc /Yu !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 +# Begin Group "Regex Files" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=.\regex\regcomp.c +# SUBTRACT CPP /YX /Yc /Yu +# End Source File +# Begin Source File + +SOURCE=.\regex\regerror.c +# SUBTRACT CPP /YX /Yc /Yu +# End Source File +# Begin Source File + +SOURCE=.\regex\regexec.c +# SUBTRACT CPP /YX /Yc /Yu +# End Source File +# Begin Source File + +SOURCE=.\regex\regfree.c +# SUBTRACT CPP /YX /Yc /Yu +# End Source File +# Begin Source File + +SOURCE=.\regex\split.c +# SUBTRACT CPP /YX /Yc /Yu +# End Source File +# End Group # End Target # End Project