Menu
▾
▴
[Wxlua-commit] wxLua/modules/build/msw makefile.bcc, 1.72, 1.73 makefile.gcc, 1.71, 1.72 makefile.vc, 1.71, 1.72 makefile.wat, 1.71, 1.72
|
From: John L. <jr...@us...> - 2007-08-01 03:21:28
|
Update of /cvsroot/wxlua/wxLua/modules/build/msw In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv14531/wxLua/modules/build/msw Modified Files: makefile.bcc makefile.gcc makefile.vc makefile.wat Log Message: Add the gl lib as a default fix some bindings that take int *var and return the value Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.vc,v retrieving revision 1.71 retrieving revision 1.72 diff -C2 -d -r1.71 -r1.72 *** makefile.vc 16 Jul 2007 20:29:54 -0000 1.71 --- makefile.vc 1 Aug 2007 03:21:24 -0000 1.72 *************** *** 1024,1039 **** __RUNTIME_LIBS_435 = $(__THREADING) !endif - !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" - __WXLIB_GL_NAME_p = wxmsw$(WX_VERSION)d_gl.lib - !endif - !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" - __WXLIB_GL_NAME_p = wxmsw$(WX_VERSION)ud_gl.lib - !endif - !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" - __WXLIB_GL_NAME_p = wxmsw$(WX_VERSION)_gl.lib - !endif - !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" - __WXLIB_GL_NAME_p = wxmsw$(WX_VERSION)u_gl.lib - !endif !if "$(SHARED)" == "0" VAR_195 = lib --- 1024,1027 ---- *************** *** 1172,1175 **** --- 1160,1175 ---- !endif !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" + __WXLIB_GL_NAME_p = wxmsw$(WX_VERSION)d_gl.lib + !endif + !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" + __WXLIB_GL_NAME_p = wxmsw$(WX_VERSION)ud_gl.lib + !endif + !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" + __WXLIB_GL_NAME_p = wxmsw$(WX_VERSION)_gl.lib + !endif + !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" + __WXLIB_GL_NAME_p = wxmsw$(WX_VERSION)u_gl.lib + !endif + !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" __WXLIB_MEDIA_NAME_p = wxmsw$(WX_VERSION)d_media.lib !endif *************** *** 1686,1690 **** ..\..\..\lib\vc_$(VAR_202)\wx.dll: make_dir_mod_luamodule $(MOD_LUAMODULE_OBJECTS) link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(WXLIBPATH) $(VAR_197) /LIBPATH:..\..\..\lib\vc_$(VAR_195) /LIBPATH:$(LUA_DIR)\lib @<< ! $(MOD_LUAMODULE_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxrc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindnet.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindmedia.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindhtml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindgl.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindadv.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).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 oleacc.lib << !endif --- 1686,1690 ---- ..\..\..\lib\vc_$(VAR_202)\wx.dll: make_dir_mod_luamodule $(MOD_LUAMODULE_OBJECTS) link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(WXLIBPATH) $(VAR_197) /LIBPATH:..\..\..\lib\vc_$(VAR_195) /LIBPATH:$(LUA_DIR)\lib @<< ! $(MOD_LUAMODULE_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxrc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindnet.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindmedia.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindhtml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindgl.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindadv.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_GL_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).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 oleacc.lib << !endif Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.bcc,v retrieving revision 1.72 retrieving revision 1.73 diff -C2 -d -r1.72 -r1.73 *** makefile.bcc 16 Jul 2007 20:29:53 -0000 1.72 --- makefile.bcc 1 Aug 2007 03:21:23 -0000 1.73 *************** *** 825,840 **** __mod_luamodule___depname = ..\..\..\lib\bcc_$(VAR_140)\wx.dll !endif - !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" - __WXLIB_GL_NAME_p = wxmsw$(WX_VERSION)d_gl.lib - !endif - !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" - __WXLIB_GL_NAME_p = wxmsw$(WX_VERSION)ud_gl.lib - !endif - !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" - __WXLIB_GL_NAME_p = wxmsw$(WX_VERSION)_gl.lib - !endif - !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" - __WXLIB_GL_NAME_p = wxmsw$(WX_VERSION)u_gl.lib - !endif !if "$(SHARED)" == "0" VAR_134 = lib --- 825,828 ---- *************** *** 967,970 **** --- 955,970 ---- !endif !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" + __WXLIB_GL_NAME_p = wxmsw$(WX_VERSION)d_gl.lib + !endif + !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" + __WXLIB_GL_NAME_p = wxmsw$(WX_VERSION)ud_gl.lib + !endif + !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" + __WXLIB_GL_NAME_p = wxmsw$(WX_VERSION)_gl.lib + !endif + !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" + __WXLIB_GL_NAME_p = wxmsw$(WX_VERSION)u_gl.lib + !endif + !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" __WXLIB_MEDIA_NAME_p = wxmsw$(WX_VERSION)d_media.lib !endif *************** *** 1554,1558 **** ..\..\..\lib\bcc_$(VAR_140)\wx.dll: make_dir_mod_luamodule $(MOD_LUAMODULE_OBJECTS) ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(WXLIBPATH) $(VAR_138) -L..\..\..\lib\bcc_$(VAR_134) -L$(LUA_DIR)\lib @&&| ! c0d32.obj $(MOD_LUAMODULE_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxrc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindnet.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindmedia.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindhtml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindgl.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindadv.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32$(__THREADING_14)$(__RUNTIME_LIBS_15).lib,, | !endif --- 1554,1558 ---- ..\..\..\lib\bcc_$(VAR_140)\wx.dll: make_dir_mod_luamodule $(MOD_LUAMODULE_OBJECTS) ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(WXLIBPATH) $(VAR_138) -L..\..\..\lib\bcc_$(VAR_134) -L$(LUA_DIR)\lib @&&| ! c0d32.obj $(MOD_LUAMODULE_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxrc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindnet.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindmedia.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindhtml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindgl.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindadv.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_GL_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32$(__THREADING_14)$(__RUNTIME_LIBS_15).lib,, | !endif Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.wat,v retrieving revision 1.71 retrieving revision 1.72 diff -C2 -d -r1.71 -r1.72 *** makefile.wat 16 Jul 2007 20:29:54 -0000 1.71 --- makefile.wat 1 Aug 2007 03:21:24 -0000 1.72 *************** *** 391,423 **** !endif !endif - __WXLIB_GL_NAME_p = - !ifeq BUILD debug - !ifeq WX_MONOLITHIC 0 - !ifeq UNICODE 0 - __WXLIB_GL_NAME_p = wxmsw$(WX_VERSION)d_gl.lib - !endif - !endif - !endif - !ifeq BUILD debug - !ifeq WX_MONOLITHIC 0 - !ifeq UNICODE 1 - __WXLIB_GL_NAME_p = wxmsw$(WX_VERSION)ud_gl.lib - !endif - !endif - !endif - !ifeq BUILD release - !ifeq WX_MONOLITHIC 0 - !ifeq UNICODE 0 - __WXLIB_GL_NAME_p = wxmsw$(WX_VERSION)_gl.lib - !endif - !endif - !endif - !ifeq BUILD release - !ifeq WX_MONOLITHIC 0 - !ifeq UNICODE 1 - __WXLIB_GL_NAME_p = wxmsw$(WX_VERSION)u_gl.lib - !endif - !endif - !endif VAR_135 = !ifeq SHARED 0 --- 391,394 ---- *************** *** 666,669 **** --- 637,669 ---- !endif !endif + __WXLIB_GL_NAME_p = + !ifeq BUILD debug + !ifeq WX_MONOLITHIC 0 + !ifeq UNICODE 0 + __WXLIB_GL_NAME_p = wxmsw$(WX_VERSION)d_gl.lib + !endif + !endif + !endif + !ifeq BUILD debug + !ifeq WX_MONOLITHIC 0 + !ifeq UNICODE 1 + __WXLIB_GL_NAME_p = wxmsw$(WX_VERSION)ud_gl.lib + !endif + !endif + !endif + !ifeq BUILD release + !ifeq WX_MONOLITHIC 0 + !ifeq UNICODE 0 + __WXLIB_GL_NAME_p = wxmsw$(WX_VERSION)_gl.lib + !endif + !endif + !endif + !ifeq BUILD release + !ifeq WX_MONOLITHIC 0 + !ifeq UNICODE 1 + __WXLIB_GL_NAME_p = wxmsw$(WX_VERSION)u_gl.lib + !endif + !endif + !endif __WXLIB_MEDIA_NAME_p = !ifeq BUILD debug *************** *** 1820,1824 **** @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule.lbc $(LDFLAGS) libpath $(WX_DIR)$(WXLIBPATH) $(VAR_137) libpath ..\..\..\lib\wat_$(VAR_135) libpath $(LUA_DIR)\lib @for %i in ($(MOD_LUAMODULE_OBJECTS)) do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule.lbc file %i ! @for %i in ( wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxrc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindnet.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindmedia.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindhtml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindgl.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindadv.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).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) do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule.lbc library %i @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule.lbc @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule.lbc system nt_dll --- 1820,1824 ---- @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule.lbc $(LDFLAGS) libpath $(WX_DIR)$(WXLIBPATH) $(VAR_137) libpath ..\..\..\lib\wat_$(VAR_135) libpath $(LUA_DIR)\lib @for %i in ($(MOD_LUAMODULE_OBJECTS)) do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule.lbc file %i ! @for %i in ( wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxrc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindnet.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindmedia.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindhtml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindgl.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindadv.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_GL_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).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) do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule.lbc library %i @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule.lbc @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule.lbc system nt_dll Index: makefile.gcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.gcc,v retrieving revision 1.71 retrieving revision 1.72 diff -C2 -d -r1.71 -r1.72 *** makefile.gcc 16 Jul 2007 20:29:53 -0000 1.71 --- makefile.gcc 1 Aug 2007 03:21:23 -0000 1.72 *************** *** 744,775 **** endif endif - ifeq ($(BUILD),debug) - ifeq ($(WX_MONOLITHIC),0) - ifeq ($(UNICODE),0) - __WXLIB_GL_NAME_p = -lwxmsw$(WX_VERSION)d_gl - endif - endif - endif - ifeq ($(BUILD),debug) - ifeq ($(WX_MONOLITHIC),0) - ifeq ($(UNICODE),1) - __WXLIB_GL_NAME_p = -lwxmsw$(WX_VERSION)ud_gl - endif - endif - endif - ifeq ($(BUILD),release) - ifeq ($(WX_MONOLITHIC),0) - ifeq ($(UNICODE),0) - __WXLIB_GL_NAME_p = -lwxmsw$(WX_VERSION)_gl - endif - endif - endif - ifeq ($(BUILD),release) - ifeq ($(WX_MONOLITHIC),0) - ifeq ($(UNICODE),1) - __WXLIB_GL_NAME_p = -lwxmsw$(WX_VERSION)u_gl - endif - endif - endif ifeq ($(SHARED),0) VAR_134 = lib --- 744,747 ---- *************** *** 982,985 **** --- 954,985 ---- ifeq ($(WX_MONOLITHIC),0) ifeq ($(UNICODE),0) + __WXLIB_GL_NAME_p = -lwxmsw$(WX_VERSION)d_gl + endif + endif + endif + ifeq ($(BUILD),debug) + ifeq ($(WX_MONOLITHIC),0) + ifeq ($(UNICODE),1) + __WXLIB_GL_NAME_p = -lwxmsw$(WX_VERSION)ud_gl + endif + endif + endif + ifeq ($(BUILD),release) + ifeq ($(WX_MONOLITHIC),0) + ifeq ($(UNICODE),0) + __WXLIB_GL_NAME_p = -lwxmsw$(WX_VERSION)_gl + endif + endif + endif + ifeq ($(BUILD),release) + ifeq ($(WX_MONOLITHIC),0) + ifeq ($(UNICODE),1) + __WXLIB_GL_NAME_p = -lwxmsw$(WX_VERSION)u_gl + endif + endif + endif + ifeq ($(BUILD),debug) + ifeq ($(WX_MONOLITHIC),0) + ifeq ($(UNICODE),0) __WXLIB_MEDIA_NAME_p = -lwxmsw$(WX_VERSION)d_media endif *************** *** 1539,1543 **** ifeq ($(USE_LUAMODULE),1) ..\..\..\lib\gcc_$(VAR_140)\wx.dll: make_dir_mod_luamodule $(MOD_LUAMODULE_OBJECTS) ! $(CXX) -shared -fPIC -o $@ $(MOD_LUAMODULE_OBJECTS) $(LDFLAGS) -mthreads -L$(WX_DIR)$(WXLIBPATH) $(VAR_138) $(__THREADING) -L..\..\..\lib\gcc_$(VAR_134) -L$(LUA_DIR)\lib -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxrc -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindnet -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindmedia -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindhtml -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindgl -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindadv -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxml -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua -llua5.1 $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) -lwxtiff$(WX3RDPARTYLIBPOSTFIX) -lwxjpeg$(WX3RDPARTYLIBPOSTFIX) -lwxpng$(WX3RDPARTYLIBPOSTFIX) -lwxzlib$(WX3RDPARTYLIBPOSTFIX) -lwxregex$(WXLIBPOSTFIX) -lwxexpat$(WX3RDPARTYLIBPOSTFIX) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 endif endif --- 1539,1543 ---- ifeq ($(USE_LUAMODULE),1) ..\..\..\lib\gcc_$(VAR_140)\wx.dll: make_dir_mod_luamodule $(MOD_LUAMODULE_OBJECTS) ! $(CXX) -shared -fPIC -o $@ $(MOD_LUAMODULE_OBJECTS) $(LDFLAGS) -mthreads -L$(WX_DIR)$(WXLIBPATH) $(VAR_138) $(__THREADING) -L..\..\..\lib\gcc_$(VAR_134) -L$(LUA_DIR)\lib -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxrc -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindnet -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindmedia -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindhtml -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindgl -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindadv -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxml -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua -llua5.1 $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_GL_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) -lwxtiff$(WX3RDPARTYLIBPOSTFIX) -lwxjpeg$(WX3RDPARTYLIBPOSTFIX) -lwxpng$(WX3RDPARTYLIBPOSTFIX) -lwxzlib$(WX3RDPARTYLIBPOSTFIX) -lwxregex$(WXLIBPOSTFIX) -lwxexpat$(WX3RDPARTYLIBPOSTFIX) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 endif endif |
