projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Corrected font calculation (use screen resolution now); and check for mask in m_image.cpp
[wxWidgets.git]
/
src
/
wxvc_dll.dsp
diff --git
a/src/wxvc_dll.dsp
b/src/wxvc_dll.dsp
index ca016d78414977d34b79f41f5b323a51b963a391..0450bbdfbac673d22939661d9ee92da255dfc3d7 100644
(file)
--- a/
src/wxvc_dll.dsp
+++ b/
src/wxvc_dll.dsp
@@
-170,6
+170,10
@@
SOURCE=.\common\dynlib.cpp
# End Source File
# Begin Source File
# 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
SOURCE=.\common\event.cpp
# End Source File
# Begin Source File
@@
-265,11
+269,19
@@
SOURCE=.\common\imagjpeg.cpp
# End Source File
# Begin Source File
# 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\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
SOURCE=.\common\imagtiff.cpp
# ADD CPP /I "tiff" /I "zlib"
# End Source File
@@
-315,7
+327,7
@@
SOURCE=.\common\menucmn.cpp
# End Source File
# Begin Source File
# End Source File
# Begin Source File
-SOURCE=.\common\mime
type
.cpp
+SOURCE=.\common\mime
cmn
.cpp
# End Source File
# Begin Source File
# End Source File
# Begin Source File
@@
-490,6
+502,10
@@
SOURCE=.\generic\busyinfo.cpp
# End Source File
# Begin Source File
# 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\choicdgg.cpp
# End Source File
# Begin Source File
@@
-614,6
+630,14
@@
SOURCE=.\html\htmprint.cpp
# End Source File
# Begin Source File
# End Source File
# Begin Source File
+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
SOURCE=.\html\m_fonts.cpp
# End Source File
# Begin Source File
@@
-638,10
+662,6
@@
SOURCE=.\html\m_list.cpp
# End Source File
# Begin Source File
# End Source File
# Begin Source File
-SOURCE=.\html\m_dflist.cpp
-# End Source File
-# Begin Source File
-
SOURCE=.\html\m_pre.cpp
# End Source File
# Begin Source File
SOURCE=.\html\m_pre.cpp
# End Source File
# Begin Source File
@@
-783,6
+803,10
@@
SOURCE=.\msw\dummy.cpp
# End Source File
# Begin Source File
# 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
SOURCE=.\msw\filedlg.cpp
# End Source File
# Begin Source File
@@
-876,6
+900,10
@@
SOURCE=.\msw\metafile.cpp
# End Source File
# Begin Source File
# 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
SOURCE=.\msw\minifram.cpp
# End Source File
# Begin Source File
@@
-1388,7
+1416,7
@@
SOURCE=.\jpeg\jcapimin.c
!IF "$(CFG)" == "wxvc_dll - Win32 Release"
# ADD CPP /I "..\include" /I ".."
!IF "$(CFG)" == "wxvc_dll - Win32 Release"
# ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include"
+# SUBTRACT CPP /I "../include"
/YX /Yc /Yu
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
@@
-1405,7
+1433,7
@@
SOURCE=.\jpeg\jcapistd.c
!IF "$(CFG)" == "wxvc_dll - Win32 Release"
# ADD CPP /I "..\include" /I ".."
!IF "$(CFG)" == "wxvc_dll - Win32 Release"
# ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include"
+# SUBTRACT CPP /I "../include"
/YX /Yc /Yu
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
@@
-1422,7
+1450,7
@@
SOURCE=.\jpeg\jccoefct.c
!IF "$(CFG)" == "wxvc_dll - Win32 Release"
# ADD CPP /I "..\include" /I ".."
!IF "$(CFG)" == "wxvc_dll - Win32 Release"
# ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include"
+# SUBTRACT CPP /I "../include"
/YX /Yc /Yu
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
@@
-1439,7
+1467,7
@@
SOURCE=.\jpeg\jccolor.c
!IF "$(CFG)" == "wxvc_dll - Win32 Release"
# ADD CPP /I "..\include" /I ".."
!IF "$(CFG)" == "wxvc_dll - Win32 Release"
# ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include"
+# SUBTRACT CPP /I "../include"
/YX /Yc /Yu
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
@@
-1456,7
+1484,7
@@
SOURCE=.\jpeg\jcdctmgr.c
!IF "$(CFG)" == "wxvc_dll - Win32 Release"
# ADD CPP /I "..\include" /I ".."
!IF "$(CFG)" == "wxvc_dll - Win32 Release"
# ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include"
+# SUBTRACT CPP /I "../include"
/YX /Yc /Yu
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
@@
-1473,7
+1501,7
@@
SOURCE=.\jpeg\jchuff.c
!IF "$(CFG)" == "wxvc_dll - Win32 Release"
# ADD CPP /I "..\include" /I ".."
!IF "$(CFG)" == "wxvc_dll - Win32 Release"
# ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include"
+# SUBTRACT CPP /I "../include"
/YX /Yc /Yu
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
@@
-1490,7
+1518,7
@@
SOURCE=.\jpeg\jcinit.c
!IF "$(CFG)" == "wxvc_dll - Win32 Release"
# ADD CPP /I "..\include" /I ".."
!IF "$(CFG)" == "wxvc_dll - Win32 Release"
# ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include"
+# SUBTRACT CPP /I "../include"
/YX /Yc /Yu
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
@@
-1507,7
+1535,7
@@
SOURCE=.\jpeg\jcmainct.c
!IF "$(CFG)" == "wxvc_dll - Win32 Release"
# ADD CPP /I "..\include" /I ".."
!IF "$(CFG)" == "wxvc_dll - Win32 Release"
# ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include"
+# SUBTRACT CPP /I "../include"
/YX /Yc /Yu
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
@@
-1524,7
+1552,7
@@
SOURCE=.\jpeg\jcmarker.c
!IF "$(CFG)" == "wxvc_dll - Win32 Release"
# ADD CPP /I "..\include" /I ".."
!IF "$(CFG)" == "wxvc_dll - Win32 Release"
# ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include"
+# SUBTRACT CPP /I "../include"
/YX /Yc /Yu
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
@@
-1541,7
+1569,7
@@
SOURCE=.\jpeg\jcmaster.c
!IF "$(CFG)" == "wxvc_dll - Win32 Release"
# ADD CPP /I "..\include" /I ".."
!IF "$(CFG)" == "wxvc_dll - Win32 Release"
# ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include"
+# SUBTRACT CPP /I "../include"
/YX /Yc /Yu
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
@@
-1558,7
+1586,7
@@
SOURCE=.\jpeg\jcomapi.c
!IF "$(CFG)" == "wxvc_dll - Win32 Release"
# ADD CPP /I "..\include" /I ".."
!IF "$(CFG)" == "wxvc_dll - Win32 Release"
# ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include"
+# SUBTRACT CPP /I "../include"
/YX /Yc /Yu
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
@@
-1575,7
+1603,7
@@
SOURCE=.\jpeg\jcparam.c
!IF "$(CFG)" == "wxvc_dll - Win32 Release"
# ADD CPP /I "..\include" /I ".."
!IF "$(CFG)" == "wxvc_dll - Win32 Release"
# ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include"
+# SUBTRACT CPP /I "../include"
/YX /Yc /Yu
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
@@
-1592,7
+1620,7
@@
SOURCE=.\jpeg\jcphuff.c
!IF "$(CFG)" == "wxvc_dll - Win32 Release"
# ADD CPP /I "..\include" /I ".."
!IF "$(CFG)" == "wxvc_dll - Win32 Release"
# ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include"
+# SUBTRACT CPP /I "../include"
/YX /Yc /Yu
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
@@
-1609,7
+1637,7
@@
SOURCE=.\jpeg\jcprepct.c
!IF "$(CFG)" == "wxvc_dll - Win32 Release"
# ADD CPP /I "..\include" /I ".."
!IF "$(CFG)" == "wxvc_dll - Win32 Release"
# ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include"
+# SUBTRACT CPP /I "../include"
/YX /Yc /Yu
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
@@
-1626,7
+1654,7
@@
SOURCE=.\jpeg\jcsample.c
!IF "$(CFG)" == "wxvc_dll - Win32 Release"
# ADD CPP /I "..\include" /I ".."
!IF "$(CFG)" == "wxvc_dll - Win32 Release"
# ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include"
+# SUBTRACT CPP /I "../include"
/YX /Yc /Yu
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
@@
-1643,7
+1671,7
@@
SOURCE=.\jpeg\jctrans.c
!IF "$(CFG)" == "wxvc_dll - Win32 Release"
# ADD CPP /I "..\include" /I ".."
!IF "$(CFG)" == "wxvc_dll - Win32 Release"
# ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include"
+# SUBTRACT CPP /I "../include"
/YX /Yc /Yu
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
@@
-1660,7
+1688,7
@@
SOURCE=.\jpeg\jdapimin.c
!IF "$(CFG)" == "wxvc_dll - Win32 Release"
# ADD CPP /I "..\include" /I ".."
!IF "$(CFG)" == "wxvc_dll - Win32 Release"
# ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include"
+# SUBTRACT CPP /I "../include"
/YX /Yc /Yu
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
@@
-1677,7
+1705,7
@@
SOURCE=.\jpeg\jdapistd.c
!IF "$(CFG)" == "wxvc_dll - Win32 Release"
# ADD CPP /I "..\include" /I ".."
!IF "$(CFG)" == "wxvc_dll - Win32 Release"
# ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include"
+# SUBTRACT CPP /I "../include"
/YX /Yc /Yu
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
@@
-1694,7
+1722,7
@@
SOURCE=.\jpeg\jdatadst.c
!IF "$(CFG)" == "wxvc_dll - Win32 Release"
# ADD CPP /I "..\include" /I ".."
!IF "$(CFG)" == "wxvc_dll - Win32 Release"
# ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include"
+# SUBTRACT CPP /I "../include"
/YX /Yc /Yu
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
@@
-1711,7
+1739,7
@@
SOURCE=.\jpeg\jdatasrc.c
!IF "$(CFG)" == "wxvc_dll - Win32 Release"
# ADD CPP /I "..\include" /I ".."
!IF "$(CFG)" == "wxvc_dll - Win32 Release"
# ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include"
+# SUBTRACT CPP /I "../include"
/YX /Yc /Yu
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
@@
-1728,7
+1756,7
@@
SOURCE=.\jpeg\jdcoefct.c
!IF "$(CFG)" == "wxvc_dll - Win32 Release"
# ADD CPP /I "..\include" /I ".."
!IF "$(CFG)" == "wxvc_dll - Win32 Release"
# ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include"
+# SUBTRACT CPP /I "../include"
/YX /Yc /Yu
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
@@
-1745,7
+1773,7
@@
SOURCE=.\jpeg\jdcolor.c
!IF "$(CFG)" == "wxvc_dll - Win32 Release"
# ADD CPP /I "..\include" /I ".."
!IF "$(CFG)" == "wxvc_dll - Win32 Release"
# ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include"
+# SUBTRACT CPP /I "../include"
/YX /Yc /Yu
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
@@
-1762,7
+1790,7
@@
SOURCE=.\jpeg\jddctmgr.c
!IF "$(CFG)" == "wxvc_dll - Win32 Release"
# ADD CPP /I "..\include" /I ".."
!IF "$(CFG)" == "wxvc_dll - Win32 Release"
# ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include"
+# SUBTRACT CPP /I "../include"
/YX /Yc /Yu
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
@@
-1779,7
+1807,7
@@
SOURCE=.\jpeg\jdhuff.c
!IF "$(CFG)" == "wxvc_dll - Win32 Release"
# ADD CPP /I "..\include" /I ".."
!IF "$(CFG)" == "wxvc_dll - Win32 Release"
# ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include"
+# SUBTRACT CPP /I "../include"
/YX /Yc /Yu
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
@@
-1796,7
+1824,7
@@
SOURCE=.\jpeg\jdinput.c
!IF "$(CFG)" == "wxvc_dll - Win32 Release"
# ADD CPP /I "..\include" /I ".."
!IF "$(CFG)" == "wxvc_dll - Win32 Release"
# ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include"
+# SUBTRACT CPP /I "../include"
/YX /Yc /Yu
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
@@
-1813,7
+1841,7
@@
SOURCE=.\jpeg\jdmainct.c
!IF "$(CFG)" == "wxvc_dll - Win32 Release"
# ADD CPP /I "..\include" /I ".."
!IF "$(CFG)" == "wxvc_dll - Win32 Release"
# ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include"
+# SUBTRACT CPP /I "../include"
/YX /Yc /Yu
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
@@
-1830,7
+1858,7
@@
SOURCE=.\jpeg\jdmarker.c
!IF "$(CFG)" == "wxvc_dll - Win32 Release"
# ADD CPP /I "..\include" /I ".."
!IF "$(CFG)" == "wxvc_dll - Win32 Release"
# ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include"
+# SUBTRACT CPP /I "../include"
/YX /Yc /Yu
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
@@
-1847,7
+1875,7
@@
SOURCE=.\jpeg\jdmaster.c
!IF "$(CFG)" == "wxvc_dll - Win32 Release"
# ADD CPP /I "..\include" /I ".."
!IF "$(CFG)" == "wxvc_dll - Win32 Release"
# ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include"
+# SUBTRACT CPP /I "../include"
/YX /Yc /Yu
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
@@
-1864,7
+1892,7
@@
SOURCE=.\jpeg\jdmerge.c
!IF "$(CFG)" == "wxvc_dll - Win32 Release"
# ADD CPP /I "..\include" /I ".."
!IF "$(CFG)" == "wxvc_dll - Win32 Release"
# ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include"
+# SUBTRACT CPP /I "../include"
/YX /Yc /Yu
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
@@
-1881,7
+1909,7
@@
SOURCE=.\jpeg\jdphuff.c
!IF "$(CFG)" == "wxvc_dll - Win32 Release"
# ADD CPP /I "..\include" /I ".."
!IF "$(CFG)" == "wxvc_dll - Win32 Release"
# ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include"
+# SUBTRACT CPP /I "../include"
/YX /Yc /Yu
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
@@
-1898,7
+1926,7
@@
SOURCE=.\jpeg\jdpostct.c
!IF "$(CFG)" == "wxvc_dll - Win32 Release"
# ADD CPP /I "..\include" /I ".."
!IF "$(CFG)" == "wxvc_dll - Win32 Release"
# ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include"
+# SUBTRACT CPP /I "../include"
/YX /Yc /Yu
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
@@
-1915,7
+1943,7
@@
SOURCE=.\jpeg\jdsample.c
!IF "$(CFG)" == "wxvc_dll - Win32 Release"
# ADD CPP /I "..\include" /I ".."
!IF "$(CFG)" == "wxvc_dll - Win32 Release"
# ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include"
+# SUBTRACT CPP /I "../include"
/YX /Yc /Yu
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
@@
-1932,7
+1960,7
@@
SOURCE=.\jpeg\jdtrans.c
!IF "$(CFG)" == "wxvc_dll - Win32 Release"
# ADD CPP /I "..\include" /I ".."
!IF "$(CFG)" == "wxvc_dll - Win32 Release"
# ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include"
+# SUBTRACT CPP /I "../include"
/YX /Yc /Yu
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
@@
-1949,7
+1977,7
@@
SOURCE=.\jpeg\jerror.c
!IF "$(CFG)" == "wxvc_dll - Win32 Release"
# ADD CPP /I "..\include" /I ".."
!IF "$(CFG)" == "wxvc_dll - Win32 Release"
# ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include"
+# SUBTRACT CPP /I "../include"
/YX /Yc /Yu
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
@@
-1966,7
+1994,7
@@
SOURCE=.\jpeg\jfdctflt.c
!IF "$(CFG)" == "wxvc_dll - Win32 Release"
# ADD CPP /I "..\include" /I ".."
!IF "$(CFG)" == "wxvc_dll - Win32 Release"
# ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include"
+# SUBTRACT CPP /I "../include"
/YX /Yc /Yu
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
@@
-1983,7
+2011,7
@@
SOURCE=.\jpeg\jfdctfst.c
!IF "$(CFG)" == "wxvc_dll - Win32 Release"
# ADD CPP /I "..\include" /I ".."
!IF "$(CFG)" == "wxvc_dll - Win32 Release"
# ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include"
+# SUBTRACT CPP /I "../include"
/YX /Yc /Yu
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
@@
-2000,7
+2028,7
@@
SOURCE=.\jpeg\jfdctint.c
!IF "$(CFG)" == "wxvc_dll - Win32 Release"
# ADD CPP /I "..\include" /I ".."
!IF "$(CFG)" == "wxvc_dll - Win32 Release"
# ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include"
+# SUBTRACT CPP /I "../include"
/YX /Yc /Yu
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
@@
-2017,7
+2045,7
@@
SOURCE=.\jpeg\jidctflt.c
!IF "$(CFG)" == "wxvc_dll - Win32 Release"
# ADD CPP /I "..\include" /I ".."
!IF "$(CFG)" == "wxvc_dll - Win32 Release"
# ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include"
+# SUBTRACT CPP /I "../include"
/YX /Yc /Yu
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
@@
-2034,7
+2062,7
@@
SOURCE=.\jpeg\jidctfst.c
!IF "$(CFG)" == "wxvc_dll - Win32 Release"
# ADD CPP /I "..\include" /I ".."
!IF "$(CFG)" == "wxvc_dll - Win32 Release"
# ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include"
+# SUBTRACT CPP /I "../include"
/YX /Yc /Yu
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
@@
-2051,7
+2079,7
@@
SOURCE=.\jpeg\jidctint.c
!IF "$(CFG)" == "wxvc_dll - Win32 Release"
# ADD CPP /I "..\include" /I ".."
!IF "$(CFG)" == "wxvc_dll - Win32 Release"
# ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include"
+# SUBTRACT CPP /I "../include"
/YX /Yc /Yu
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
@@
-2068,7
+2096,7
@@
SOURCE=.\jpeg\jidctred.c
!IF "$(CFG)" == "wxvc_dll - Win32 Release"
# ADD CPP /I "..\include" /I ".."
!IF "$(CFG)" == "wxvc_dll - Win32 Release"
# ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include"
+# SUBTRACT CPP /I "../include"
/YX /Yc /Yu
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
@@
-2085,7
+2113,7
@@
SOURCE=.\jpeg\jmemmgr.c
!IF "$(CFG)" == "wxvc_dll - Win32 Release"
# ADD CPP /I "..\include" /I ".."
!IF "$(CFG)" == "wxvc_dll - Win32 Release"
# ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include"
+# SUBTRACT CPP /I "../include"
/YX /Yc /Yu
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
@@
-2102,7
+2130,7
@@
SOURCE=.\jpeg\jmemnobs.c
!IF "$(CFG)" == "wxvc_dll - Win32 Release"
# ADD CPP /I "..\include" /I ".."
!IF "$(CFG)" == "wxvc_dll - Win32 Release"
# ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include"
+# SUBTRACT CPP /I "../include"
/YX /Yc /Yu
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
@@
-2119,7
+2147,7
@@
SOURCE=.\jpeg\jquant1.c
!IF "$(CFG)" == "wxvc_dll - Win32 Release"
# ADD CPP /I "..\include" /I ".."
!IF "$(CFG)" == "wxvc_dll - Win32 Release"
# ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include"
+# SUBTRACT CPP /I "../include"
/YX /Yc /Yu
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
@@
-2136,7
+2164,7
@@
SOURCE=.\jpeg\jquant2.c
!IF "$(CFG)" == "wxvc_dll - Win32 Release"
# ADD CPP /I "..\include" /I ".."
!IF "$(CFG)" == "wxvc_dll - Win32 Release"
# ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include"
+# SUBTRACT CPP /I "../include"
/YX /Yc /Yu
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
@@
-2153,7
+2181,7
@@
SOURCE=.\jpeg\jutils.c
!IF "$(CFG)" == "wxvc_dll - Win32 Release"
# ADD CPP /I "..\include" /I ".."
!IF "$(CFG)" == "wxvc_dll - Win32 Release"
# ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include"
+# SUBTRACT CPP /I "../include"
/YX /Yc /Yu
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"