Updated wxvc_dll.dsp and memory.h to make VC++ compile in DLL mode again

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5167 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/distrib/msw/vc.rsp b/distrib/msw/vc.rsp
index 5558f61ad84c0189cbd3784afd4f35e6fe047cd5..58d97b2e387301d3324447f615930f5f0f17fb24 100644 (file)
--- a/distrib/msw/vc.rsp
+++ b/distrib/msw/vc.rsp
@@ -27,8 +27,8 @@ samples/dnd/DndVC.dsw
 samples/docview/DocviewVC.dsp
 samples/docview/DocviewVC.dsw
 
 samples/docview/DocviewVC.dsp
 samples/docview/DocviewVC.dsw
 

-samples/docvwmdi/DocViewVC.dsp
-samples/docvwmdi/DocViewVC.dsw
+samples/docvwmdi/DocVwVC.dsp
+samples/docvwmdi/DocVwVC.dsw

 
 samples/dynamic/DynamicVC.dsp
 samples/dynamic/DynamicVC.dsw
 
 samples/dynamic/DynamicVC.dsp
 samples/dynamic/DynamicVC.dsw

diff --git a/distrib/msw/zipdist.bat b/distrib/msw/zipdist.bat
index 6dd50ddd826afa0239c8925c06e7ad59ea9465ed..929f4a05984bd6a9d569fa5ff8ea24720c1f459a 100755 (executable)
--- a/distrib/msw/zipdist.bat
+++ b/distrib/msw/zipdist.bat
@@ -126,6 +126,8 @@ rem from within distrib\msw, to split off wisetop.txt and wisebott.txt.
 echo Calling 'makewise' to generate wxwin2.wse...
 call %WXWIN\distrib\msw\makewise.bat
 
 echo Calling 'makewise' to generate wxwin2.wse...
 call %WXWIN\distrib\msw\makewise.bat
 

+erase /Y setup.*
+

 rem Now invoke WISE install on the new wxwin2.wse
 set wisecmd="c:\Program Files\wise\wise32.exe" /C %WXWIN\distrib\msw\wxwin2.wse
 echo Invoking %wisecmd...
 rem Now invoke WISE install on the new wxwin2.wse
 set wisecmd="c:\Program Files\wise\wise32.exe" /C %WXWIN\distrib\msw\wxwin2.wse
 echo Invoking %wisecmd...


@@ -153,6 +155,9 @@ ren s setup.w05
 ren setup.w06 s
 ren s setup.w06
 
 ren setup.w06 s
 ren s setup.w06
 

+rem Put all the setup files into a single zip archive.
+zip32 setup.zip readme.txt setup.*
+

 echo wxWindows archived.
 
 goto end
 echo wxWindows archived.
 
 goto end

diff --git a/docs/bugs.txt b/docs/bugs.txt
index 565e82771f43a3fe530a4a16026619ec2ae58245..5cfc5f67d9e774d1941ddedc5cbae868616f37a2 100644 (file)
--- a/docs/bugs.txt
+++ b/docs/bugs.txt
@@ -298,6 +298,17 @@ call, added the condition to check for the len==limit.
 visitor_email_address: vasuh@bullant.net
 wxWINDOWS+VERSION: wx2.1.11
 
 visitor_email_address: vasuh@bullant.net
 wxWINDOWS+VERSION: wx2.1.11
 

+DATE+FIXED: 30/12/1999
+DATE+IDENTIFIED: 
+DETAILS: the setting of wxvc_dll have a bug of precompiled setting with release version.
+FIXED+BY: Pumb Peng
+IDENTIFIED+BY: Pumb Peng
+PLATFORMS: windows NT
+SHORT+DESCRIPTION: wxvc_dll.dsp Bug
+Submit: Submit
+WORKAROUND: 
+visitor_email_address: 
+wxWINDOWS+VERSION: 2.1.11

 
 ---------------------------END OF BUGLIST-------------------------
 
 
 ---------------------------END OF BUGLIST-------------------------
 

diff --git a/include/wx/datetime.h b/include/wx/datetime.h
index 7ca809ea1c47c995039bd5a254e1ddc6f0a420c0..82ce040f116dd75fca416733f0ff446f0f3733c5 100644 (file)
--- a/include/wx/datetime.h
+++ b/include/wx/datetime.h
@@ -376,7 +376,7 @@ public:
 
         // a class representing a time zone: basicly, this is just an offset
         // (in seconds) from GMT
 
         // a class representing a time zone: basicly, this is just an offset
         // (in seconds) from GMT

-    class TimeZone
+    class WXDLLEXPORT TimeZone

     {
     public:
         TimeZone(TZ tz);
     {
     public:
         TimeZone(TZ tz);

diff --git a/include/wx/memory.h b/include/wx/memory.h
index 94356b2dd85b318fc961774f57a52df843278fc6..21b9545a961b818e48fd0212b1149c6da340be85 100644 (file)
--- a/include/wx/memory.h
+++ b/include/wx/memory.h
@@ -68,21 +68,22 @@ void wxDebugFree(void * buf, bool isVect = FALSE);
 
 // Added JACS 25/11/98: needed for some compilers
 void * operator new (size_t size);
 
 // Added JACS 25/11/98: needed for some compilers
 void * operator new (size_t size);

-void * operator new (size_t size, wxChar * fileName, int lineNum);
+WXDLLEXPORT void * operator new (size_t size, wxChar * fileName, int lineNum);
+

 #if !defined(__VISAGECPP__)
 void operator delete (void * buf);
 #endif
 
 #if wxUSE_ARRAY_MEMORY_OPERATORS
 #if !defined(__VISAGECPP__)
 void operator delete (void * buf);
 #endif
 
 #if wxUSE_ARRAY_MEMORY_OPERATORS

-    void * operator new[] (size_t size);
-    void * operator new[] (size_t size, wxChar * fileName, int lineNum);
-    void operator delete[] (void * buf);
+    WXDLLEXPORT void* operator new[] (size_t size);
+    WXDLLEXPORT void* operator new[] (size_t size, wxChar * fileName, int lineNum);
+    WXDLLEXPORT void operator delete[] (void * buf);

 #endif
 
 // VC++ 6.0
 #if defined(__VISUALC__) && (__VISUALC__ >= 1200)
 #endif
 
 // VC++ 6.0
 #if defined(__VISUALC__) && (__VISUALC__ >= 1200)

-    void operator delete(void *buf, wxChar*, int);
-    void operator delete[](void *buf, wxChar*, int);
+    WXDLLEXPORT void operator delete(void *buf, wxChar*, int);
+    WXDLLEXPORT void operator delete[](void *buf, wxChar*, int);

 #endif
 
 #endif
 #endif
 
 #endif

diff --git a/samples/forty/scorefil.cpp b/samples/forty/scorefil.cpp
index 348be7cfe75b3e92a1a419072c3707c9858f46ba..cb871efde08232c90af3ebf896e371bc988b8647 100644 (file)
--- a/samples/forty/scorefil.cpp
+++ b/samples/forty/scorefil.cpp
@@ -171,7 +171,7 @@ void ScoreFile::WritePlayersScore(const char* player, int wins, int games, int s
     if (player)
        {
                m_config->SetPath("/General");
     if (player)
        {
                m_config->SetPath("/General");

-               m_config->Write("LastPlayer", player);
+               m_config->Write("LastPlayer", wxString(player)); // Without wxString tmp, thinks it's bool in VC++

 
                m_config->SetPath("/Players");
                m_config->SetPath(player);
 
                m_config->SetPath("/Players");
                m_config->SetPath(player);

diff --git a/src/common/fontmap.cpp b/src/common/fontmap.cpp
index a11228fc78ef2800d871262b94249875f2c4314a..98495ceba95f7f2706d843398eb9ce32f8a75013 100644 (file)
--- a/src/common/fontmap.cpp
+++ b/src/common/fontmap.cpp
@@ -146,7 +146,7 @@ static const wxChar* gs_encodingNames[] =
 static wxFontMapper gs_fontMapper;
 
 // and public pointer
 static wxFontMapper gs_fontMapper;
 
 // and public pointer

-wxFontMapper * WXDLLEXPORT wxTheFontMapper = &gs_fontMapper;
+wxFontMapper * wxTheFontMapper = &gs_fontMapper;

 
 // ----------------------------------------------------------------------------
 // private classes
 
 // ----------------------------------------------------------------------------
 // private classes

diff --git a/src/common/memory.cpp b/src/common/memory.cpp
index a50a6013807dab5be9ca8c8e3b0820893507872d..d30fc10ee8b8e9b54e5539fbffc0d65fb48c78d0 100644 (file)
--- a/src/common/memory.cpp
+++ b/src/common/memory.cpp
@@ -1004,8 +1004,6 @@ void operator delete (void * buf)
 #if defined(__VISUALC__) && (__VISUALC__ >= 1200)
 void operator delete(void* pData, wxChar* /* fileName */, int /* lineNum */)
 {
 #if defined(__VISUALC__) && (__VISUALC__ >= 1200)
 void operator delete(void* pData, wxChar* /* fileName */, int /* lineNum */)
 {

-// ::operator delete(pData);
-  // JACS 21/11/1998: surely we need to call wxDebugFree?

   wxDebugFree(pData, FALSE);
 }
 // New operator 21/11/1998
   wxDebugFree(pData, FALSE);
 }
 // New operator 21/11/1998

diff --git a/src/wxvc.dsp b/src/wxvc.dsp
index e26de63aa28eda7aa101366cfe4461926fd61ffd..c3a3150655f85ba138d9741828cc17303d25057b 100644 (file)
--- a/src/wxvc.dsp
+++ b/src/wxvc.dsp
@@ -500,6 +500,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

diff --git a/src/wxvc_dll.dsp b/src/wxvc_dll.dsp
index 90d29108931a52e1578bfb43543236bb4b357adb..b03faf5cb637d940f72b7459dd7ae9cbd1c9ebaa 100644 (file)
--- a/src/wxvc_dll.dsp
+++ b/src/wxvc_dll.dsp
@@ -264,21 +264,21 @@ SOURCE=.\common\imaggif.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=.\common\imagpcx.cpp
+SOURCE=.\common\imagjpeg.cpp
+# ADD CPP /I "../src/jpeg"

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=.\common\imagpnm.cpp
+SOURCE=.\common\imagpcx.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=.\common\imagjpeg.cpp
-# ADD CPP /I "../src/jpeg"
+SOURCE=.\common\imagpng.cpp
+# ADD CPP /I "png" /I "zlib"

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=.\common\imagpng.cpp
-# ADD CPP /I "png" /I "zlib"
+SOURCE=.\common\imagpnm.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 


@@ -502,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


@@ -626,6 +630,10 @@ 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_fonts.cpp
 # End Source File
 # Begin Source File
 SOURCE=.\html\m_fonts.cpp
 # End Source File
 # Begin Source File


@@ -650,10 +658,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


@@ -1400,7 +1404,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"
 


@@ -1417,7 +1421,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"
 


@@ -1434,7 +1438,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"
 


@@ -1451,7 +1455,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"
 


@@ -1468,7 +1472,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"
 


@@ -1485,7 +1489,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"
 


@@ -1502,7 +1506,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"
 


@@ -1519,7 +1523,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"
 


@@ -1536,7 +1540,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"
 


@@ -1553,7 +1557,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"
 


@@ -1570,7 +1574,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"
 


@@ -1587,7 +1591,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"
 


@@ -1604,7 +1608,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"
 


@@ -1621,7 +1625,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"
 


@@ -1638,7 +1642,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"
 


@@ -1655,7 +1659,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"
 


@@ -1672,7 +1676,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"
 


@@ -1689,7 +1693,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"
 


@@ -1706,7 +1710,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"
 


@@ -1723,7 +1727,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"
 


@@ -1740,7 +1744,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"
 


@@ -1757,7 +1761,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"
 


@@ -1774,7 +1778,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"
 


@@ -1791,7 +1795,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"
 


@@ -1808,7 +1812,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"
 


@@ -1825,7 +1829,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"
 


@@ -1842,7 +1846,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"
 


@@ -1859,7 +1863,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"
 


@@ -1876,7 +1880,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"
 


@@ -1893,7 +1897,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"
 


@@ -1910,7 +1914,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"
 


@@ -1927,7 +1931,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"
 


@@ -1944,7 +1948,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"
 


@@ -1961,7 +1965,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"
 


@@ -1978,7 +1982,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"
 


@@ -1995,7 +1999,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"
 


@@ -2012,7 +2016,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"
 


@@ -2029,7 +2033,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"
 


@@ -2046,7 +2050,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"
 


@@ -2063,7 +2067,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"
 


@@ -2080,7 +2084,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"
 


@@ -2097,7 +2101,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"
 


@@ -2114,7 +2118,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"
 


@@ -2131,7 +2135,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"
 


@@ -2148,7 +2152,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"
 


@@ -2165,7 +2169,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"