From: John L. <jr...@us...> - 2008-01-21 04:05:23
|
Update of /cvsroot/wxlua/wxLua/modules/build/msvc8 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv13737/wxLua/modules/build/msvc8 Modified Files: modules_mod_luamodule_mono.vcproj Log Message: Add WXMAKINGDLL_XXX for all the objects we link to for the luamodule_mono otherwise they are set for WXIMPORT. Note, ideally we wouldn't export them. Index: modules_mod_luamodule_mono.vcproj =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msvc8/modules_mod_luamodule_mono.vcproj,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** modules_mod_luamodule_mono.vcproj 21 Jan 2008 03:09:50 -0000 1.3 --- modules_mod_luamodule_mono.vcproj 21 Jan 2008 04:05:18 -0000 1.4 *************** *** 55,59 **** AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;_UNICODE;__WXMSW__;WXMAKINGDLL_LUAMODULE" BasicRuntimeChecks="0" DebugInformationFormat="0" --- 55,59 ---- AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;_UNICODE;__WXMSW__;WXMAKINGDLL_LUAMODULE;WXMAKINGDLL_ADV;WXMAKINGDLL_AUI;WXMAKINGDLL_BASE;WXMAKINGDLL_CORE;WXMAKINGDLL_GL;WXMAKINGDLL_HTML;WXMAKINGDLL_MEDIA;WXMAKINGDLL_NET;WXMAKINGDLL_RICHTEXT;WXMAKINGDLL_STC;WXMAKINGDLL_XML;WXMAKINGDLL_XRC;WXMAKINGDLL_DEBUG;WXMAKINGDLL_SOCKET;WXMAKINGDLL_WXLUA" BasicRuntimeChecks="0" DebugInformationFormat="0" *************** *** 73,77 **** Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswu;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;WXMAKINGDLL_LUAMODULE" /> <Tool --- 73,77 ---- Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswu;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;WXMAKINGDLL_LUAMODULE;WXMAKINGDLL_ADV;WXMAKINGDLL_AUI;WXMAKINGDLL_BASE;WXMAKINGDLL_CORE;WXMAKINGDLL_GL;WXMAKINGDLL_HTML;WXMAKINGDLL_MEDIA;WXMAKINGDLL_NET;WXMAKINGDLL_RICHTEXT;WXMAKINGDLL_STC;WXMAKINGDLL_XML;WXMAKINGDLL_XRC;WXMAKINGDLL_DEBUG;WXMAKINGDLL_SOCKET;WXMAKINGDLL_WXLUA" /> <Tool *************** *** 141,145 **** AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;_UNICODE;__WXMSW__;WXMAKINGDLL_LUAMODULE" BasicRuntimeChecks="0" DebugInformationFormat="0" --- 141,145 ---- AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;_UNICODE;__WXMSW__;WXMAKINGDLL_LUAMODULE;WXMAKINGDLL_ADV;WXMAKINGDLL_AUI;WXMAKINGDLL_BASE;WXMAKINGDLL_CORE;WXMAKINGDLL_GL;WXMAKINGDLL_HTML;WXMAKINGDLL_MEDIA;WXMAKINGDLL_NET;WXMAKINGDLL_RICHTEXT;WXMAKINGDLL_STC;WXMAKINGDLL_XML;WXMAKINGDLL_XRC;WXMAKINGDLL_DEBUG;WXMAKINGDLL_SOCKET;WXMAKINGDLL_WXLUA" BasicRuntimeChecks="0" DebugInformationFormat="0" *************** *** 159,163 **** Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswu;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;WXMAKINGDLL_LUAMODULE" /> <Tool --- 159,163 ---- Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswu;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;WXMAKINGDLL_LUAMODULE;WXMAKINGDLL_ADV;WXMAKINGDLL_AUI;WXMAKINGDLL_BASE;WXMAKINGDLL_CORE;WXMAKINGDLL_GL;WXMAKINGDLL_HTML;WXMAKINGDLL_MEDIA;WXMAKINGDLL_NET;WXMAKINGDLL_RICHTEXT;WXMAKINGDLL_STC;WXMAKINGDLL_XML;WXMAKINGDLL_XRC;WXMAKINGDLL_DEBUG;WXMAKINGDLL_SOCKET;WXMAKINGDLL_WXLUA" /> <Tool *************** *** 226,230 **** AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;__WXMSW__;WXMAKINGDLL_LUAMODULE" BasicRuntimeChecks="0" DebugInformationFormat="0" --- 226,230 ---- AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;__WXMSW__;WXMAKINGDLL_LUAMODULE;WXMAKINGDLL_ADV;WXMAKINGDLL_AUI;WXMAKINGDLL_BASE;WXMAKINGDLL_CORE;WXMAKINGDLL_GL;WXMAKINGDLL_HTML;WXMAKINGDLL_MEDIA;WXMAKINGDLL_NET;WXMAKINGDLL_RICHTEXT;WXMAKINGDLL_STC;WXMAKINGDLL_XML;WXMAKINGDLL_XRC;WXMAKINGDLL_DEBUG;WXMAKINGDLL_SOCKET;WXMAKINGDLL_WXLUA" BasicRuntimeChecks="0" DebugInformationFormat="0" *************** *** 244,248 **** Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\msw;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup" ! PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;WXMAKINGDLL_LUAMODULE" /> <Tool --- 244,248 ---- Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\msw;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup" ! PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;WXMAKINGDLL_LUAMODULE;WXMAKINGDLL_ADV;WXMAKINGDLL_AUI;WXMAKINGDLL_BASE;WXMAKINGDLL_CORE;WXMAKINGDLL_GL;WXMAKINGDLL_HTML;WXMAKINGDLL_MEDIA;WXMAKINGDLL_NET;WXMAKINGDLL_RICHTEXT;WXMAKINGDLL_STC;WXMAKINGDLL_XML;WXMAKINGDLL_XRC;WXMAKINGDLL_DEBUG;WXMAKINGDLL_SOCKET;WXMAKINGDLL_WXLUA" /> <Tool *************** *** 311,315 **** AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;__WXMSW__;WXMAKINGDLL_LUAMODULE" BasicRuntimeChecks="0" DebugInformationFormat="0" --- 311,315 ---- AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;__WXMSW__;WXMAKINGDLL_LUAMODULE;WXMAKINGDLL_ADV;WXMAKINGDLL_AUI;WXMAKINGDLL_BASE;WXMAKINGDLL_CORE;WXMAKINGDLL_GL;WXMAKINGDLL_HTML;WXMAKINGDLL_MEDIA;WXMAKINGDLL_NET;WXMAKINGDLL_RICHTEXT;WXMAKINGDLL_STC;WXMAKINGDLL_XML;WXMAKINGDLL_XRC;WXMAKINGDLL_DEBUG;WXMAKINGDLL_SOCKET;WXMAKINGDLL_WXLUA" BasicRuntimeChecks="0" DebugInformationFormat="0" *************** *** 329,333 **** Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\msw;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup" ! PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;WXMAKINGDLL_LUAMODULE" /> <Tool --- 329,333 ---- Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\msw;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup" ! PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;WXMAKINGDLL_LUAMODULE;WXMAKINGDLL_ADV;WXMAKINGDLL_AUI;WXMAKINGDLL_BASE;WXMAKINGDLL_CORE;WXMAKINGDLL_GL;WXMAKINGDLL_HTML;WXMAKINGDLL_MEDIA;WXMAKINGDLL_NET;WXMAKINGDLL_RICHTEXT;WXMAKINGDLL_STC;WXMAKINGDLL_XML;WXMAKINGDLL_XRC;WXMAKINGDLL_DEBUG;WXMAKINGDLL_SOCKET;WXMAKINGDLL_WXLUA" /> <Tool *************** *** 397,401 **** AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_LUAMODULE;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" --- 397,401 ---- AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_LUAMODULE;WXMAKINGDLL_ADV;WXMAKINGDLL_AUI;WXMAKINGDLL_BASE;WXMAKINGDLL_CORE;WXMAKINGDLL_GL;WXMAKINGDLL_HTML;WXMAKINGDLL_MEDIA;WXMAKINGDLL_NET;WXMAKINGDLL_RICHTEXT;WXMAKINGDLL_STC;WXMAKINGDLL_XML;WXMAKINGDLL_XRC;WXMAKINGDLL_DEBUG;WXMAKINGDLL_SOCKET;WXMAKINGDLL_WXLUA;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" *************** *** 415,419 **** Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswud;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_LUAMODULE;_DEBUG" /> <Tool --- 415,419 ---- Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswud;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_LUAMODULE;WXMAKINGDLL_ADV;WXMAKINGDLL_AUI;WXMAKINGDLL_BASE;WXMAKINGDLL_CORE;WXMAKINGDLL_GL;WXMAKINGDLL_HTML;WXMAKINGDLL_MEDIA;WXMAKINGDLL_NET;WXMAKINGDLL_RICHTEXT;WXMAKINGDLL_STC;WXMAKINGDLL_XML;WXMAKINGDLL_XRC;WXMAKINGDLL_DEBUG;WXMAKINGDLL_SOCKET;WXMAKINGDLL_WXLUA;_DEBUG" /> <Tool *************** *** 484,488 **** AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_LUAMODULE;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" --- 484,488 ---- AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_LUAMODULE;WXMAKINGDLL_ADV;WXMAKINGDLL_AUI;WXMAKINGDLL_BASE;WXMAKINGDLL_CORE;WXMAKINGDLL_GL;WXMAKINGDLL_HTML;WXMAKINGDLL_MEDIA;WXMAKINGDLL_NET;WXMAKINGDLL_RICHTEXT;WXMAKINGDLL_STC;WXMAKINGDLL_XML;WXMAKINGDLL_XRC;WXMAKINGDLL_DEBUG;WXMAKINGDLL_SOCKET;WXMAKINGDLL_WXLUA;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" *************** *** 502,506 **** Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswud;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_LUAMODULE;_DEBUG" /> <Tool --- 502,506 ---- Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswud;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_LUAMODULE;WXMAKINGDLL_ADV;WXMAKINGDLL_AUI;WXMAKINGDLL_BASE;WXMAKINGDLL_CORE;WXMAKINGDLL_GL;WXMAKINGDLL_HTML;WXMAKINGDLL_MEDIA;WXMAKINGDLL_NET;WXMAKINGDLL_RICHTEXT;WXMAKINGDLL_STC;WXMAKINGDLL_XML;WXMAKINGDLL_XRC;WXMAKINGDLL_DEBUG;WXMAKINGDLL_SOCKET;WXMAKINGDLL_WXLUA;_DEBUG" /> <Tool *************** *** 570,574 **** AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_LUAMODULE;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" --- 570,574 ---- AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_LUAMODULE;WXMAKINGDLL_ADV;WXMAKINGDLL_AUI;WXMAKINGDLL_BASE;WXMAKINGDLL_CORE;WXMAKINGDLL_GL;WXMAKINGDLL_HTML;WXMAKINGDLL_MEDIA;WXMAKINGDLL_NET;WXMAKINGDLL_RICHTEXT;WXMAKINGDLL_STC;WXMAKINGDLL_XML;WXMAKINGDLL_XRC;WXMAKINGDLL_DEBUG;WXMAKINGDLL_SOCKET;WXMAKINGDLL_WXLUA;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" *************** *** 588,592 **** Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswd;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup" ! PreprocessorDefinitions="WXUSINGDLL;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_LUAMODULE;_DEBUG" /> <Tool --- 588,592 ---- Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswd;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup" ! PreprocessorDefinitions="WXUSINGDLL;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_LUAMODULE;WXMAKINGDLL_ADV;WXMAKINGDLL_AUI;WXMAKINGDLL_BASE;WXMAKINGDLL_CORE;WXMAKINGDLL_GL;WXMAKINGDLL_HTML;WXMAKINGDLL_MEDIA;WXMAKINGDLL_NET;WXMAKINGDLL_RICHTEXT;WXMAKINGDLL_STC;WXMAKINGDLL_XML;WXMAKINGDLL_XRC;WXMAKINGDLL_DEBUG;WXMAKINGDLL_SOCKET;WXMAKINGDLL_WXLUA;_DEBUG" /> <Tool *************** *** 656,660 **** AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_LUAMODULE;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" --- 656,660 ---- AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_LUAMODULE;WXMAKINGDLL_ADV;WXMAKINGDLL_AUI;WXMAKINGDLL_BASE;WXMAKINGDLL_CORE;WXMAKINGDLL_GL;WXMAKINGDLL_HTML;WXMAKINGDLL_MEDIA;WXMAKINGDLL_NET;WXMAKINGDLL_RICHTEXT;WXMAKINGDLL_STC;WXMAKINGDLL_XML;WXMAKINGDLL_XRC;WXMAKINGDLL_DEBUG;WXMAKINGDLL_SOCKET;WXMAKINGDLL_WXLUA;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" *************** *** 674,678 **** Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswd;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup" ! PreprocessorDefinitions="WXUSINGDLL;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_LUAMODULE;_DEBUG" /> <Tool --- 674,678 ---- Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswd;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup" ! PreprocessorDefinitions="WXUSINGDLL;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_LUAMODULE;WXMAKINGDLL_ADV;WXMAKINGDLL_AUI;WXMAKINGDLL_BASE;WXMAKINGDLL_CORE;WXMAKINGDLL_GL;WXMAKINGDLL_HTML;WXMAKINGDLL_MEDIA;WXMAKINGDLL_NET;WXMAKINGDLL_RICHTEXT;WXMAKINGDLL_STC;WXMAKINGDLL_XML;WXMAKINGDLL_XRC;WXMAKINGDLL_DEBUG;WXMAKINGDLL_SOCKET;WXMAKINGDLL_WXLUA;_DEBUG" /> <Tool |