]> git.saurik.com Git - wxWidgets.git/commitdiff
Define MY_DLL_BUILDING symbol for dll sample DLL build.
authorVadim Zeitlin <vadim@wxwidgets.org>
Mon, 7 Dec 2009 03:04:39 +0000 (03:04 +0000)
committerVadim Zeitlin <vadim@wxwidgets.org>
Mon, 7 Dec 2009 03:04:39 +0000 (03:04 +0000)
This is necessary to properly define MY_DLL_DECL as either WXIMPORT or
WXEXPORT depending on whether my_dll.h is included from DLL itself or from
outside it. Without this, MSVC generated warnings about inconsistent dll
linkage.

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

12 files changed:
samples/dll/Makefile.in
samples/dll/dll.bkl
samples/dll/dll_my_dll.dsp
samples/dll/dll_vc7_my_dll.vcproj
samples/dll/dll_vc8_my_dll.vcproj
samples/dll/dll_vc9_my_dll.vcproj
samples/dll/makefile.bcc
samples/dll/makefile.gcc
samples/dll/makefile.vc
samples/dll/makefile.wat
samples/dll/my_dll.cpp
samples/dll/my_dll.h

index f2faf24e21679688c9ec04963ac2e6bc476bba99..e81bca99b9230d9fec75fe57e3216141ed74ca43 100644 (file)
@@ -50,7 +50,8 @@ WX_VERSION = $(WX_RELEASE).1
 LIBDIRNAME = $(wx_top_builddir)/lib
 MY_DLL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
 LIBDIRNAME = $(wx_top_builddir)/lib
 MY_DLL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
-       $(__DLLFLAG_p) -I$(srcdir) $(PIC_FLAG) $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
+       $(__DLLFLAG_p) -DMY_DLL_BUILDING -I$(srcdir) $(PIC_FLAG) $(CXXWARNINGS) \
+       $(CPPFLAGS) $(CXXFLAGS)
 MY_DLL_OBJECTS =  \
        my_dll_my_dll.o
 WX_EXE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 MY_DLL_OBJECTS =  \
        my_dll_my_dll.o
 WX_EXE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
index 2eeb512a5937a125f6a7cc3fa223910187c4854a..8c7c3e5ad5d8fe0a8ec70bf04f44387bbfa02735 100644 (file)
@@ -8,6 +8,7 @@
          cond="PLATFORM_WIN32=='1'">
 
         <define>$(DLLFLAG)</define>
          cond="PLATFORM_WIN32=='1'">
 
         <define>$(DLLFLAG)</define>
+        <define>MY_DLL_BUILDING</define>
         <include>$(SRCDIR)</include>
 
         <sources>my_dll.cpp</sources>
         <include>$(SRCDIR)</include>
 
         <sources>my_dll.cpp</sources>
index 5e4708f0ab66d860a20eed86ec731efa8036d117..2231de66109a2c9c45cde70e66609b6c0d29409e 100644 (file)
@@ -47,12 +47,12 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\my_dll"\r
 # PROP Target_Dir ""\r
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\my_dll"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\my_dll.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\my_dll.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /c\r
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /d "WXUSINGDLL" /i .\r
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /d "WXUSINGDLL" /i .\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\my_dll.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "MY_DLL_BUILDING" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\my_dll.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "MY_DLL_BUILDING" /c\r
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "MY_DLL_BUILDING" /mktyplib203 /win32\r
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "MY_DLL_BUILDING" /mktyplib203 /win32\r
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /d "WXUSINGDLL" /d "MY_DLL_BUILDING" /i .\r
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /d "WXUSINGDLL" /d "MY_DLL_BUILDING" /i .\r
 BSC32=bscmake.exe\r
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 BSC32=bscmake.exe\r
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
@@ -72,12 +72,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivuddll"\r
 # PROP Intermediate_Dir "vc_mswunivuddll\my_dll"\r
 # PROP Target_Dir ""\r
 # PROP Output_Dir "vc_mswunivuddll"\r
 # PROP Intermediate_Dir "vc_mswunivuddll\my_dll"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /Zi /Fdvc_mswunivuddll\my_dll.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivud" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /c\r
-# ADD CPP /nologo /FD /MDd /Zi /Fdvc_mswunivuddll\my_dll.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivud" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /c\r
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivud" /i ".\..\..\include" /d "WXUSINGDLL" /i .\r
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivud" /i ".\..\..\include" /d "WXUSINGDLL" /i .\r
+# ADD BASE CPP /nologo /FD /MDd /Zi /Fdvc_mswunivuddll\my_dll.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivud" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "MY_DLL_BUILDING" /c\r
+# ADD CPP /nologo /FD /MDd /Zi /Fdvc_mswunivuddll\my_dll.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivud" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "MY_DLL_BUILDING" /c\r
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "MY_DLL_BUILDING" /mktyplib203 /win32\r
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "MY_DLL_BUILDING" /mktyplib203 /win32\r
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivud" /i ".\..\..\include" /d "WXUSINGDLL" /d "MY_DLL_BUILDING" /i .\r
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivud" /i ".\..\..\include" /d "WXUSINGDLL" /d "MY_DLL_BUILDING" /i .\r
 BSC32=bscmake.exe\r
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 BSC32=bscmake.exe\r
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
@@ -97,12 +97,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\my_dll"\r
 # PROP Target_Dir ""\r
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\my_dll"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\my_dll.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\my_dll.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /c\r
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /d "WXUSINGDLL" /i .\r
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /d "WXUSINGDLL" /i .\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\my_dll.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "MY_DLL_BUILDING" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\my_dll.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "MY_DLL_BUILDING" /c\r
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "MY_DLL_BUILDING" /mktyplib203 /win32\r
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "MY_DLL_BUILDING" /mktyplib203 /win32\r
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /d "WXUSINGDLL" /d "MY_DLL_BUILDING" /i .\r
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /d "WXUSINGDLL" /d "MY_DLL_BUILDING" /i .\r
 BSC32=bscmake.exe\r
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 BSC32=bscmake.exe\r
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
@@ -122,12 +122,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswuddll"\r
 # PROP Intermediate_Dir "vc_mswuddll\my_dll"\r
 # PROP Target_Dir ""\r
 # PROP Output_Dir "vc_mswuddll"\r
 # PROP Intermediate_Dir "vc_mswuddll\my_dll"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /Zi /Fdvc_mswuddll\my_dll.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_dll\mswud" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /c\r
-# ADD CPP /nologo /FD /MDd /Zi /Fdvc_mswuddll\my_dll.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_dll\mswud" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /c\r
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswud" /i ".\..\..\include" /d "WXUSINGDLL" /i .\r
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswud" /i ".\..\..\include" /d "WXUSINGDLL" /i .\r
+# ADD BASE CPP /nologo /FD /MDd /Zi /Fdvc_mswuddll\my_dll.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_dll\mswud" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "MY_DLL_BUILDING" /c\r
+# ADD CPP /nologo /FD /MDd /Zi /Fdvc_mswuddll\my_dll.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_dll\mswud" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "MY_DLL_BUILDING" /c\r
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "MY_DLL_BUILDING" /mktyplib203 /win32\r
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "MY_DLL_BUILDING" /mktyplib203 /win32\r
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswud" /i ".\..\..\include" /d "WXUSINGDLL" /d "MY_DLL_BUILDING" /i .\r
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswud" /i ".\..\..\include" /d "WXUSINGDLL" /d "MY_DLL_BUILDING" /i .\r
 BSC32=bscmake.exe\r
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 BSC32=bscmake.exe\r
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
@@ -147,12 +147,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"\r
 # PROP Intermediate_Dir "vc_mswunivu\my_dll"\r
 # PROP Target_Dir ""\r
 # PROP Output_Dir "vc_mswunivu"\r
 # PROP Intermediate_Dir "vc_mswunivu\my_dll"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\my_dll.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\my_dll.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /c\r
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i .\r
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i .\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\my_dll.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "MY_DLL_BUILDING" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\my_dll.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "MY_DLL_BUILDING" /c\r
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "MY_DLL_BUILDING" /mktyplib203 /win32\r
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "MY_DLL_BUILDING" /mktyplib203 /win32\r
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /d "MY_DLL_BUILDING" /i .\r
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /d "MY_DLL_BUILDING" /i .\r
 BSC32=bscmake.exe\r
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 BSC32=bscmake.exe\r
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
@@ -172,12 +172,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivud"\r
 # PROP Intermediate_Dir "vc_mswunivud\my_dll"\r
 # PROP Target_Dir ""\r
 # PROP Output_Dir "vc_mswunivud"\r
 # PROP Intermediate_Dir "vc_mswunivud\my_dll"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /Zi /Fdvc_mswunivud\my_dll.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivud" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /c\r
-# ADD CPP /nologo /FD /MDd /Zi /Fdvc_mswunivud\my_dll.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivud" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /c\r
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivud" /i ".\..\..\include" /i .\r
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivud" /i ".\..\..\include" /i .\r
+# ADD BASE CPP /nologo /FD /MDd /Zi /Fdvc_mswunivud\my_dll.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivud" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "MY_DLL_BUILDING" /c\r
+# ADD CPP /nologo /FD /MDd /Zi /Fdvc_mswunivud\my_dll.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivud" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "MY_DLL_BUILDING" /c\r
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "MY_DLL_BUILDING" /mktyplib203 /win32\r
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "MY_DLL_BUILDING" /mktyplib203 /win32\r
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivud" /i ".\..\..\include" /d "MY_DLL_BUILDING" /i .\r
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivud" /i ".\..\..\include" /d "MY_DLL_BUILDING" /i .\r
 BSC32=bscmake.exe\r
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 BSC32=bscmake.exe\r
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
@@ -197,12 +197,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"\r
 # PROP Intermediate_Dir "vc_mswu\my_dll"\r
 # PROP Target_Dir ""\r
 # PROP Output_Dir "vc_mswu"\r
 # PROP Intermediate_Dir "vc_mswu\my_dll"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\my_dll.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\my_dll.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /c\r
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i .\r
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i .\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\my_dll.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "MY_DLL_BUILDING" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\my_dll.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "MY_DLL_BUILDING" /c\r
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "MY_DLL_BUILDING" /mktyplib203 /win32\r
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "MY_DLL_BUILDING" /mktyplib203 /win32\r
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /d "MY_DLL_BUILDING" /i .\r
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /d "MY_DLL_BUILDING" /i .\r
 BSC32=bscmake.exe\r
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 BSC32=bscmake.exe\r
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
@@ -222,12 +222,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswud"\r
 # PROP Intermediate_Dir "vc_mswud\my_dll"\r
 # PROP Target_Dir ""\r
 # PROP Output_Dir "vc_mswud"\r
 # PROP Intermediate_Dir "vc_mswud\my_dll"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /Zi /Fdvc_mswud\my_dll.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_lib\mswud" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /c\r
-# ADD CPP /nologo /FD /MDd /Zi /Fdvc_mswud\my_dll.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_lib\mswud" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /c\r
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswud" /i ".\..\..\include" /i .\r
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswud" /i ".\..\..\include" /i .\r
+# ADD BASE CPP /nologo /FD /MDd /Zi /Fdvc_mswud\my_dll.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_lib\mswud" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "MY_DLL_BUILDING" /c\r
+# ADD CPP /nologo /FD /MDd /Zi /Fdvc_mswud\my_dll.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_lib\mswud" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "MY_DLL_BUILDING" /c\r
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "MY_DLL_BUILDING" /mktyplib203 /win32\r
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "MY_DLL_BUILDING" /mktyplib203 /win32\r
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswud" /i ".\..\..\include" /d "MY_DLL_BUILDING" /i .\r
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswud" /i ".\..\..\include" /d "MY_DLL_BUILDING" /i .\r
 BSC32=bscmake.exe\r
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 BSC32=bscmake.exe\r
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
index f711a087acf2022df0d00d091067ef8f5fc67a77..9426329bc7ea8ad7c1a01305b2511c5f5a6478e3 100644 (file)
@@ -28,7 +28,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;."\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;."\r
-                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;_UNICODE"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;_UNICODE;MY_DLL_BUILDING"\r
                                MinimalRebuild="TRUE"\r
                                ExceptionHandling="TRUE"\r
                                BasicRuntimeChecks="3"\r
                                MinimalRebuild="TRUE"\r
                                ExceptionHandling="TRUE"\r
                                BasicRuntimeChecks="3"\r
@@ -57,7 +57,7 @@
                                TargetMachine="1"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                TargetMachine="1"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;_UNICODE"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;_UNICODE;MY_DLL_BUILDING"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;."/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;."/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
@@ -67,7 +67,7 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;MY_DLL_BUILDING"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;."/>\r
                        <Tool\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;."/>\r
                        <Tool\r
@@ -93,7 +93,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;."\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;."\r
-                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;MY_DLL_BUILDING"\r
                                ExceptionHandling="TRUE"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="TRUE"\r
                                ExceptionHandling="TRUE"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="TRUE"\r
                                EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;MY_DLL_BUILDING"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;."/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;."/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE"\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;MY_DLL_BUILDING"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;."/>\r
                        <Tool\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;."/>\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;."\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;."\r
-                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;MY_DLL_BUILDING"\r
                                MinimalRebuild="TRUE"\r
                                ExceptionHandling="TRUE"\r
                                BasicRuntimeChecks="3"\r
                                MinimalRebuild="TRUE"\r
                                ExceptionHandling="TRUE"\r
                                BasicRuntimeChecks="3"\r
                                TargetMachine="1"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                TargetMachine="1"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;MY_DLL_BUILDING"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;."/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;."/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;MY_DLL_BUILDING"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;."/>\r
                        <Tool\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;."/>\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;."\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;."\r
-                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;MY_DLL_BUILDING"\r
                                ExceptionHandling="TRUE"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="TRUE"\r
                                ExceptionHandling="TRUE"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="TRUE"\r
                                EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;MY_DLL_BUILDING"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;."/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;."/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;MY_DLL_BUILDING"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;."/>\r
                        <Tool\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;."/>\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;."\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;."\r
-                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;MY_DLL_BUILDING"\r
                                MinimalRebuild="TRUE"\r
                                ExceptionHandling="TRUE"\r
                                BasicRuntimeChecks="3"\r
                                MinimalRebuild="TRUE"\r
                                ExceptionHandling="TRUE"\r
                                BasicRuntimeChecks="3"\r
                                TargetMachine="1"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                TargetMachine="1"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;MY_DLL_BUILDING"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;."/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;."/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;MY_DLL_BUILDING"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;."/>\r
                        <Tool\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;."/>\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;."\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;."\r
-                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXUSINGDLL"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXUSINGDLL;MY_DLL_BUILDING"\r
                                ExceptionHandling="TRUE"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="TRUE"\r
                                ExceptionHandling="TRUE"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="TRUE"\r
                                EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXUSINGDLL"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXUSINGDLL;MY_DLL_BUILDING"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;."/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;."/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL"\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;MY_DLL_BUILDING"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;."/>\r
                        <Tool\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;."/>\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;."\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;."\r
-                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;MY_DLL_BUILDING"\r
                                MinimalRebuild="TRUE"\r
                                ExceptionHandling="TRUE"\r
                                BasicRuntimeChecks="3"\r
                                MinimalRebuild="TRUE"\r
                                ExceptionHandling="TRUE"\r
                                BasicRuntimeChecks="3"\r
                                TargetMachine="1"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                TargetMachine="1"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;MY_DLL_BUILDING"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;."/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;."/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;MY_DLL_BUILDING"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;."/>\r
                        <Tool\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;."/>\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;."\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;."\r
-                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;MY_DLL_BUILDING"\r
                                ExceptionHandling="TRUE"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="TRUE"\r
                                ExceptionHandling="TRUE"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="TRUE"\r
                                EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;MY_DLL_BUILDING"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;."/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;."/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;MY_DLL_BUILDING"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;."/>\r
                        <Tool\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;."/>\r
                        <Tool\r
index 6b3a2fca886a1f9b70c47a41a7a37f369d1936ba..24e3f2921bfae130830a6bd1604c4e7f878f5b8e 100644 (file)
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;_UNICODE"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;_UNICODE;MY_DLL_BUILDING"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;."\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;."\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;."\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;."\r
-                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;_UNICODE"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;_UNICODE;MY_DLL_BUILDING"\r
                                MinimalRebuild="true"\r
                                ExceptionHandling="1"\r
                                BasicRuntimeChecks="3"\r
                                MinimalRebuild="true"\r
                                ExceptionHandling="1"\r
                                BasicRuntimeChecks="3"\r
@@ -70,7 +70,7 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;MY_DLL_BUILDING"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;."\r
                        />\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;."\r
                        />\r
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;MY_DLL_BUILDING"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;."\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;."\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;."\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;."\r
-                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;MY_DLL_BUILDING"\r
                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE"\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;MY_DLL_BUILDING"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;."\r
                        />\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;."\r
                        />\r
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;MY_DLL_BUILDING"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;."\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;."\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;."\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;."\r
-                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;MY_DLL_BUILDING"\r
                                MinimalRebuild="true"\r
                                ExceptionHandling="1"\r
                                BasicRuntimeChecks="3"\r
                                MinimalRebuild="true"\r
                                ExceptionHandling="1"\r
                                BasicRuntimeChecks="3"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;MY_DLL_BUILDING"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;."\r
                        />\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;."\r
                        />\r
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;MY_DLL_BUILDING"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;."\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;."\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;."\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;."\r
-                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;MY_DLL_BUILDING"\r
                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;MY_DLL_BUILDING"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;."\r
                        />\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;."\r
                        />\r
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;MY_DLL_BUILDING"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;."\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;."\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;."\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;."\r
-                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;MY_DLL_BUILDING"\r
                                MinimalRebuild="true"\r
                                ExceptionHandling="1"\r
                                BasicRuntimeChecks="3"\r
                                MinimalRebuild="true"\r
                                ExceptionHandling="1"\r
                                BasicRuntimeChecks="3"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;MY_DLL_BUILDING"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;."\r
                        />\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;."\r
                        />\r
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXUSINGDLL"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXUSINGDLL;MY_DLL_BUILDING"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;."\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;."\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;."\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;."\r
-                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXUSINGDLL"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXUSINGDLL;MY_DLL_BUILDING"\r
                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL"\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;MY_DLL_BUILDING"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;."\r
                        />\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;."\r
                        />\r
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;MY_DLL_BUILDING"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;."\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;."\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;."\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;."\r
-                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;MY_DLL_BUILDING"\r
                                MinimalRebuild="true"\r
                                ExceptionHandling="1"\r
                                BasicRuntimeChecks="3"\r
                                MinimalRebuild="true"\r
                                ExceptionHandling="1"\r
                                BasicRuntimeChecks="3"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;MY_DLL_BUILDING"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;."\r
                        />\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;."\r
                        />\r
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;MY_DLL_BUILDING"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;."\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;."\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;."\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;."\r
-                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;MY_DLL_BUILDING"\r
                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;MY_DLL_BUILDING"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;."\r
                        />\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;."\r
                        />\r
index bb31b098f08dd195199a601324f5a5504793d769..01d5e356d61741265721e92da8a72e5a809a6731 100644 (file)
@@ -44,7 +44,7 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;_UNICODE"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;_UNICODE;MY_DLL_BUILDING"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;."\r
                        />\r
                        <Tool\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;."\r
                        />\r
                        <Tool\r
@@ -52,7 +52,7 @@
                                AdditionalOptions="/MP"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;."\r
                                AdditionalOptions="/MP"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;."\r
-                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;_UNICODE"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;_UNICODE;MY_DLL_BUILDING"\r
                                ExceptionHandling="1"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
                                ExceptionHandling="1"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
@@ -69,7 +69,7 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;MY_DLL_BUILDING"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;."\r
                        />\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;."\r
                        />\r
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;MY_DLL_BUILDING"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;."\r
                        />\r
                        <Tool\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;."\r
                        />\r
                        <Tool\r
                                AdditionalOptions="/MP"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;."\r
                                AdditionalOptions="/MP"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;."\r
-                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;MY_DLL_BUILDING"\r
                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE"\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;MY_DLL_BUILDING"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;."\r
                        />\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;."\r
                        />\r
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;MY_DLL_BUILDING"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;."\r
                        />\r
                        <Tool\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;."\r
                        />\r
                        <Tool\r
                                AdditionalOptions="/MP"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;."\r
                                AdditionalOptions="/MP"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;."\r
-                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;MY_DLL_BUILDING"\r
                                ExceptionHandling="1"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
                                ExceptionHandling="1"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;MY_DLL_BUILDING"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;."\r
                        />\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;."\r
                        />\r
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;MY_DLL_BUILDING"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;."\r
                        />\r
                        <Tool\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;."\r
                        />\r
                        <Tool\r
                                AdditionalOptions="/MP"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;."\r
                                AdditionalOptions="/MP"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;."\r
-                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;MY_DLL_BUILDING"\r
                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;MY_DLL_BUILDING"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;."\r
                        />\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;."\r
                        />\r
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;MY_DLL_BUILDING"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;."\r
                        />\r
                        <Tool\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;."\r
                        />\r
                        <Tool\r
                                AdditionalOptions="/MP"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;."\r
                                AdditionalOptions="/MP"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;."\r
-                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;MY_DLL_BUILDING"\r
                                ExceptionHandling="1"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
                                ExceptionHandling="1"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;MY_DLL_BUILDING"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;."\r
                        />\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;."\r
                        />\r
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXUSINGDLL"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXUSINGDLL;MY_DLL_BUILDING"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;."\r
                        />\r
                        <Tool\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;."\r
                        />\r
                        <Tool\r
                                AdditionalOptions="/MP"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;."\r
                                AdditionalOptions="/MP"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;."\r
-                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXUSINGDLL"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXUSINGDLL;MY_DLL_BUILDING"\r
                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL"\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;MY_DLL_BUILDING"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;."\r
                        />\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;."\r
                        />\r
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;MY_DLL_BUILDING"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;."\r
                        />\r
                        <Tool\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;."\r
                        />\r
                        <Tool\r
                                AdditionalOptions="/MP"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;."\r
                                AdditionalOptions="/MP"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;."\r
-                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;MY_DLL_BUILDING"\r
                                ExceptionHandling="1"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
                                ExceptionHandling="1"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;MY_DLL_BUILDING"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;."\r
                        />\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;."\r
                        />\r
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;MY_DLL_BUILDING"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;."\r
                        />\r
                        <Tool\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;."\r
                        />\r
                        <Tool\r
                                AdditionalOptions="/MP"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;."\r
                                AdditionalOptions="/MP"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;."\r
-                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;MY_DLL_BUILDING"\r
                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;MY_DLL_BUILDING"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;."\r
                        />\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;."\r
                        />\r
index bef956cafd0161860b8b52b7dfedde08d4375e80..61882c82995755e8bbe0f352ac53ac9ee1d4e31a 100644 (file)
@@ -33,7 +33,8 @@ MY_DLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
        $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
        $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
        $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \\r
        $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
        $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
        $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \\r
-       $(____CAIRO_INCLUDEDIR_FILENAMES) $(__DLLFLAG_p) -I. $(CPPFLAGS) $(CXXFLAGS)\r
+       $(____CAIRO_INCLUDEDIR_FILENAMES) $(__DLLFLAG_p) -DMY_DLL_BUILDING -I. \\r
+       $(CPPFLAGS) $(CXXFLAGS)\r
 MY_DLL_OBJECTS =  \\r
        $(OBJS)\my_dll_my_dll.obj\r
 WX_EXE_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
 MY_DLL_OBJECTS =  \\r
        $(OBJS)\my_dll_my_dll.obj\r
 WX_EXE_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
index e6e4db6d09b8a097e9b0fda1dec796f139841418..d48e2e38f70423d22d69a318f9a9cc694df1f718 100644 (file)
@@ -25,8 +25,8 @@ MY_DLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS)
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \\r
        $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \\r
        -I$(SETUPHDIR) -I.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -W -Wall \\r
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \\r
        $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \\r
        -I$(SETUPHDIR) -I.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -W -Wall \\r
-       $(__DLLFLAG_p) -I. $(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy \\r
-       $(CPPFLAGS) $(CXXFLAGS)\r
+       $(__DLLFLAG_p) -DMY_DLL_BUILDING -I. $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \\r
+       -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
 MY_DLL_OBJECTS =  \\r
        $(OBJS)\my_dll_my_dll.o\r
 WX_EXE_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \\r
 MY_DLL_OBJECTS =  \\r
        $(OBJS)\my_dll_my_dll.o\r
 WX_EXE_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \\r
index ac4d06d553cdb399d3877cfcc9211e9620ab6a3d..f9f109b622e92591445033ccfc3b3206a2320f58 100644 (file)
@@ -26,8 +26,8 @@ MY_DLL_CXXFLAGS = /M$(__RUNTIME_LIBS_11)$(__DEBUGRUNTIME) /DWIN32 \
        $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
        $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
        $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include \\r
        $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
        $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
        $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include \\r
-       $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 $(__DLLFLAG_p) /I. $(__RTTIFLAG) \\r
-       $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)\r
+       $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 $(__DLLFLAG_p) /DMY_DLL_BUILDING /I. \\r
+       $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)\r
 MY_DLL_OBJECTS =  \\r
        $(OBJS)\my_dll_my_dll.obj\r
 WX_EXE_CXXFLAGS = /M$(__RUNTIME_LIBS_25)$(__DEBUGRUNTIME) /DWIN32 \\r
 MY_DLL_OBJECTS =  \\r
        $(OBJS)\my_dll_my_dll.obj\r
 WX_EXE_CXXFLAGS = /M$(__RUNTIME_LIBS_25)$(__DEBUGRUNTIME) /DWIN32 \\r
index 33482a7c81b7c7127d30e01bd9962dfa8260ba70..4becc28d7adf21d15a53b1e30104d689bfce8e8a 100644 (file)
@@ -234,8 +234,8 @@ MY_DLL_CXXFLAGS = -bd $(__DEBUGINFO_1) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
        $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &\r
        -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx -wcd=549 -wcd=656 &\r
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
        $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &\r
        -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx -wcd=549 -wcd=656 &\r
-       -wcd=657 -wcd=667 $(__DLLFLAG_p) -i=. $(__RTTIFLAG) $(__EXCEPTIONSFLAG) &\r
-       $(CPPFLAGS) $(CXXFLAGS)\r
+       -wcd=657 -wcd=667 $(__DLLFLAG_p) -dMY_DLL_BUILDING -i=. $(__RTTIFLAG) &\r
+       $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)\r
 MY_DLL_OBJECTS =  &\r
        $(OBJS)\my_dll_my_dll.obj\r
 WX_EXE_CXXFLAGS = $(__DEBUGINFO_1) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &\r
 MY_DLL_OBJECTS =  &\r
        $(OBJS)\my_dll_my_dll.obj\r
 WX_EXE_CXXFLAGS = $(__DEBUGINFO_1) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &\r
index 8097479b7bf84634e708b68102253a10b9ef61e4..4b67d6d04e55a569707c531dd1c3ac562c2619a9 100644 (file)
@@ -231,7 +231,9 @@ unsigned wxSTDCALL MyAppLauncher(void* event)
 // public DLL interface
 // ----------------------------------------------------------------------------
 
 // public DLL interface
 // ----------------------------------------------------------------------------
 
-extern "C" WXEXPORT
+extern "C"
+{
+
 void run_wx_gui_from_dll(const char *title)
 {
     // In order to prevent conflicts with hosting app's event loop, we
 void run_wx_gui_from_dll(const char *title)
 {
     // In order to prevent conflicts with hosting app's event loop, we
@@ -291,9 +293,7 @@ void run_wx_gui_from_dll(const char *title)
     wxQueueEvent(wxApp::GetInstance(), event);
 }
 
     wxQueueEvent(wxApp::GetInstance(), event);
 }
 
-
-extern "C" WXEXPORT
-void wx_dll_cleanup(void)
+void wx_dll_cleanup()
 {
     wxCriticalSectionLocker lock(gs_wxStartupCS);
 
 {
     wxCriticalSectionLocker lock(gs_wxStartupCS);
 
@@ -311,3 +311,5 @@ void wx_dll_cleanup(void)
     CloseHandle(gs_wxMainThread);
     gs_wxMainThread = NULL;
 }
     CloseHandle(gs_wxMainThread);
     gs_wxMainThread = NULL;
 }
+
+} // extern "C"
index ffb53a1053a62b53d455512fd0acf5919a5881a8..0ec954f22ca01e5d20f10c22408464ca9f0e773b 100644 (file)
 extern "C" {
 #endif
 
 extern "C" {
 #endif
 
+#ifdef MY_DLL_BUILDING
+    #define MY_DLL_DECL WXEXPORT
+#else
+    #define MY_DLL_DECL WXIMPORT
+#endif
+
 // launch wx UI from some application that may or may not be written in wx
 // launch wx UI from some application that may or may not be written in wx
-WXIMPORT void run_wx_gui_from_dll(const char *title);
+MY_DLL_DECL void run_wx_gui_from_dll(const char *title);
 
 // run this to shutdown running threads etc.
 
 // run this to shutdown running threads etc.
-WXIMPORT void wx_dll_cleanup(void);
+MY_DLL_DECL void wx_dll_cleanup();
 
 
 #ifdef __cplusplus
 
 
 #ifdef __cplusplus