Visualage C++ V4.0 duplicate symbol fixes

[wxWidgets.git] / src / wxvc_dll.dsp

diff --git a/src/wxvc_dll.dsp b/src/wxvc_dll.dsp
index b25b2551bb72d4afc88380a6be15a5b6a7404576..0450bbdfbac673d22939661d9ee92da255dfc3d7 100644 (file)
--- 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
@@ -265,11 +269,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
@@ -310,7 +327,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
 
@@ -402,10 +419,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
@@ -414,10 +427,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
@@ -493,6 +502,10 @@ 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
@@ -565,6 +578,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
@@ -613,6 +630,14 @@ SOURCE=.\html\htmprint.cpp
 # 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
@@ -761,6 +786,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
@@ -774,6 +803,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
@@ -806,6 +839,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
@@ -863,6 +900,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
@@ -895,19 +936,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
@@ -992,10 +1020,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
@@ -1382,7 +1406,6 @@ SOURCE=.\zlib\zutil.c
 SOURCE=..\include\wx\msw\setup.h
 # End Source File
 # End Group
-
 # Begin Group "JPEG Files"
 
 # PROP Default_Filter ""
@@ -1390,13 +1413,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 
@@ -1406,13 +1430,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 
@@ -1422,13 +1447,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 
@@ -1438,13 +1464,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 
@@ -1454,13 +1481,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 
@@ -1470,13 +1498,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 
@@ -1486,13 +1515,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 
@@ -1502,13 +1532,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 
@@ -1518,13 +1549,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 
@@ -1534,13 +1566,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 
@@ -1550,13 +1583,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 
@@ -1566,13 +1600,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 
@@ -1582,13 +1617,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 
@@ -1598,13 +1634,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 
@@ -1614,13 +1651,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 
@@ -1630,13 +1668,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 
@@ -1646,13 +1685,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 
@@ -1662,13 +1702,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 
@@ -1678,13 +1719,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 
@@ -1694,13 +1736,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 
@@ -1710,13 +1753,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 
@@ -1726,13 +1770,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 
@@ -1742,13 +1787,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 
@@ -1758,13 +1804,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 
@@ -1774,13 +1821,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 
@@ -1790,13 +1838,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 
@@ -1806,13 +1855,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 
@@ -1822,13 +1872,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 
@@ -1838,13 +1889,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 
@@ -1854,13 +1906,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 
@@ -1870,13 +1923,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 
@@ -1886,13 +1940,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 
@@ -1902,13 +1957,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 
@@ -1918,13 +1974,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 
@@ -1934,13 +1991,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 
@@ -1950,13 +2008,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 
@@ -1966,13 +2025,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 
@@ -1982,13 +2042,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 
@@ -1998,13 +2059,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 
@@ -2014,13 +2076,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 
@@ -2030,13 +2093,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 
@@ -2046,13 +2110,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 
@@ -2062,13 +2127,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 
@@ -2078,13 +2144,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 
@@ -2094,13 +2161,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 
@@ -2110,19 +2178,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