From: John L. <jr...@us...> - 2007-08-01 03:21:27
|
Update of /cvsroot/wxlua/wxLua/modules/build/msvc8 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv14531/wxLua/modules/build/msvc8 Modified Files: modules_mod_luamodule.vcproj Log Message: Add the gl lib as a default fix some bindings that take int *var and return the value Index: modules_mod_luamodule.vcproj =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msvc8/modules_mod_luamodule.vcproj,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** modules_mod_luamodule.vcproj 16 Jul 2007 19:34:32 -0000 1.5 --- modules_mod_luamodule.vcproj 1 Aug 2007 03:21:23 -0000 1.6 *************** *** 25,29 **** <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswu,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;WXMAKINGDLL_LUAMODULE"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindgl.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wx.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wx.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 25,29 ---- <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswu,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;WXMAKINGDLL_LUAMODULE"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindgl.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wx.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wx.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 42,46 **** <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswu,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;WXMAKINGDLL_LUAMODULE"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindgl.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u_xrc.lib wxmsw28u_html.lib wxmsw28u_aui.lib wxmsw28u_media.lib wxmsw28u_adv.lib wxbase28u_net.lib wxbase28u_xml.lib wxmsw28u_core.lib wxbase28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wx.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wx.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 42,46 ---- <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswu,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;WXMAKINGDLL_LUAMODULE"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindgl.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u_xrc.lib wxmsw28u_html.lib wxmsw28u_gl.lib wxmsw28u_aui.lib wxmsw28u_media.lib wxmsw28u_adv.lib wxbase28u_net.lib wxbase28u_xml.lib wxmsw28u_core.lib wxbase28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wx.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wx.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 59,63 **** <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\msw,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;WXMAKINGDLL_LUAMODULE"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindxrc.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxbindmedia.lib wxlua_msw28_wxbindhtml.lib wxlua_msw28_wxbindgl.lib wxlua_msw28_wxbindadv.lib wxlua_msw28_wxbindxml.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wx.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wx.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 59,63 ---- <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\msw,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;WXMAKINGDLL_LUAMODULE"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindxrc.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxbindmedia.lib wxlua_msw28_wxbindhtml.lib wxlua_msw28_wxbindgl.lib wxlua_msw28_wxbindadv.lib wxlua_msw28_wxbindxml.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wx.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wx.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 76,80 **** <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\msw,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;WXMAKINGDLL_LUAMODULE"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindxrc.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxbindmedia.lib wxlua_msw28_wxbindhtml.lib wxlua_msw28_wxbindgl.lib wxlua_msw28_wxbindadv.lib wxlua_msw28_wxbindxml.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28_xrc.lib wxmsw28_html.lib wxmsw28_aui.lib wxmsw28_media.lib wxmsw28_adv.lib wxbase28_net.lib wxbase28_xml.lib wxmsw28_core.lib wxbase28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wx.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wx.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 76,80 ---- <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\msw,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;WXMAKINGDLL_LUAMODULE"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindxrc.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxbindmedia.lib wxlua_msw28_wxbindhtml.lib wxlua_msw28_wxbindgl.lib wxlua_msw28_wxbindadv.lib wxlua_msw28_wxbindxml.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28_xrc.lib wxmsw28_html.lib wxmsw28_gl.lib wxmsw28_aui.lib wxmsw28_media.lib wxmsw28_adv.lib wxbase28_net.lib wxbase28_xml.lib wxmsw28_core.lib wxbase28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wx.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wx.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 93,97 **** <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswud,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_LUAMODULE;_DEBUG"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28ud_wxbindstc.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindxrc.lib wxlua_msw28ud_wxbindnet.lib wxlua_msw28ud_wxbindmedia.lib wxlua_msw28ud_wxbindhtml.lib wxlua_msw28ud_wxbindgl.lib wxlua_msw28ud_wxbindadv.lib wxlua_msw28ud_wxbindxml.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateDebugInformation="true" GenerateManifest="true" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wx.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wx.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 93,97 ---- <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswud,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_LUAMODULE;_DEBUG"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28ud_wxbindstc.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindxrc.lib wxlua_msw28ud_wxbindnet.lib wxlua_msw28ud_wxbindmedia.lib wxlua_msw28ud_wxbindhtml.lib wxlua_msw28ud_wxbindgl.lib wxlua_msw28ud_wxbindadv.lib wxlua_msw28ud_wxbindxml.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateDebugInformation="true" GenerateManifest="true" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wx.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wx.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 110,114 **** <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswud,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_LUAMODULE;_DEBUG"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28ud_wxbindstc.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindxrc.lib wxlua_msw28ud_wxbindnet.lib wxlua_msw28ud_wxbindmedia.lib wxlua_msw28ud_wxbindhtml.lib wxlua_msw28ud_wxbindgl.lib wxlua_msw28ud_wxbindadv.lib wxlua_msw28ud_wxbindxml.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud_xrc.lib wxmsw28ud_html.lib wxmsw28ud_aui.lib wxmsw28ud_media.lib wxmsw28ud_adv.lib wxbase28ud_net.lib wxbase28ud_xml.lib wxmsw28ud_core.lib wxbase28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateDebugInformation="true" GenerateManifest="true" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wx.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wx.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 110,114 ---- <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswud,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_LUAMODULE;_DEBUG"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28ud_wxbindstc.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindxrc.lib wxlua_msw28ud_wxbindnet.lib wxlua_msw28ud_wxbindmedia.lib wxlua_msw28ud_wxbindhtml.lib wxlua_msw28ud_wxbindgl.lib wxlua_msw28ud_wxbindadv.lib wxlua_msw28ud_wxbindxml.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud_xrc.lib wxmsw28ud_html.lib wxmsw28ud_gl.lib wxmsw28ud_aui.lib wxmsw28ud_media.lib wxmsw28ud_adv.lib wxbase28ud_net.lib wxbase28ud_xml.lib wxmsw28ud_core.lib wxbase28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateDebugInformation="true" GenerateManifest="true" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wx.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wx.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 127,131 **** <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswd,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_LUAMODULE;_DEBUG"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28d_wxbindstc.lib wxlua_msw28d_wxbindaui.lib wxlua_msw28d_wxbindxrc.lib wxlua_msw28d_wxbindnet.lib wxlua_msw28d_wxbindmedia.lib wxlua_msw28d_wxbindhtml.lib wxlua_msw28d_wxbindgl.lib wxlua_msw28d_wxbindadv.lib wxlua_msw28d_wxbindxml.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxmsw28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateDebugInformation="true" GenerateManifest="true" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wx.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wx.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 127,131 ---- <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswd,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_LUAMODULE;_DEBUG"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28d_wxbindstc.lib wxlua_msw28d_wxbindaui.lib wxlua_msw28d_wxbindxrc.lib wxlua_msw28d_wxbindnet.lib wxlua_msw28d_wxbindmedia.lib wxlua_msw28d_wxbindhtml.lib wxlua_msw28d_wxbindgl.lib wxlua_msw28d_wxbindadv.lib wxlua_msw28d_wxbindxml.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxmsw28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateDebugInformation="true" GenerateManifest="true" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wx.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wx.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 144,148 **** <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswd,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_LUAMODULE;_DEBUG"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28d_wxbindstc.lib wxlua_msw28d_wxbindaui.lib wxlua_msw28d_wxbindxrc.lib wxlua_msw28d_wxbindnet.lib wxlua_msw28d_wxbindmedia.lib wxlua_msw28d_wxbindhtml.lib wxlua_msw28d_wxbindgl.lib wxlua_msw28d_wxbindadv.lib wxlua_msw28d_wxbindxml.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxmsw28d_xrc.lib wxmsw28d_html.lib wxmsw28d_aui.lib wxmsw28d_media.lib wxmsw28d_adv.lib wxbase28d_net.lib wxbase28d_xml.lib wxmsw28d_core.lib wxbase28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateDebugInformation="true" GenerateManifest="true" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wx.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wx.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 144,148 ---- <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswd,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_LUAMODULE;_DEBUG"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28d_wxbindstc.lib wxlua_msw28d_wxbindaui.lib wxlua_msw28d_wxbindxrc.lib wxlua_msw28d_wxbindnet.lib wxlua_msw28d_wxbindmedia.lib wxlua_msw28d_wxbindhtml.lib wxlua_msw28d_wxbindgl.lib wxlua_msw28d_wxbindadv.lib wxlua_msw28d_wxbindxml.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxmsw28d_xrc.lib wxmsw28d_html.lib wxmsw28d_gl.lib wxmsw28d_aui.lib wxmsw28d_media.lib wxmsw28d_adv.lib wxbase28d_net.lib wxbase28d_xml.lib wxmsw28d_core.lib wxbase28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateDebugInformation="true" GenerateManifest="true" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wx.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wx.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> |