Menu
▾
▴
wxlua-commit
|
From: Francesco M. <fr...@us...> - 2007-05-04 20:22:32
|
Update of /cvsroot/wxlua/wxLua/modules/build/msw In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv4461/modules/build/msw Modified Files: makefile.bcc makefile.gcc makefile.vc makefile.wat Log Message: fix some more path problems as reported by John Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.vc,v retrieving revision 1.64 retrieving revision 1.65 diff -C2 -d -r1.64 -r1.65 *** makefile.vc 24 Apr 2007 14:40:12 -0000 1.64 --- makefile.vc 4 May 2007 20:22:26 -0000 1.65 *************** *** 372,376 **** $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /I$(WX_DIR)\include $(VAR) \ ! $(VAR_66) $(VAR_68) /Fd..\lib\vc_$(VAR_72)\wx.pdb /I..\..\..\modules \ /I.\..\..\.. /I$(LUA_DIR)\include /DWXMAKINGDLL_LUAMODULE /GR /EHsc \ $(CPPFLAGS) $(CXXFLAGS) --- 372,376 ---- $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /I$(WX_DIR)\include $(VAR) \ ! $(VAR_66) $(VAR_68) /Fd..\..\..\lib\vc_$(VAR_72)\wx.pdb /I..\..\..\modules \ /I.\..\..\.. /I$(LUA_DIR)\include /DWXMAKINGDLL_LUAMODULE /GR /EHsc \ $(CPPFLAGS) $(CXXFLAGS) *************** *** 496,500 **** !endif !if "$(SHARED)" == "1" && "$(USE_LUAMODULE)" == "1" ! __mod_luamodule___depname = ..\lib\vc_$(VAR_72)\wx.dll !endif !if "$(RUNTIME_LIBS)" == "dynamic" --- 496,500 ---- !endif !if "$(SHARED)" == "1" && "$(USE_LUAMODULE)" == "1" ! __mod_luamodule___depname = ..\..\..\lib\vc_$(VAR_72)\wx.dll !endif !if "$(RUNTIME_LIBS)" == "dynamic" *************** *** 737,743 **** -if exist ..\..\..\lib\vc_$(VAR_65)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.pdb del ..\..\..\lib\vc_$(VAR_65)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.pdb -if exist ..\..\..\lib\vc_$(VAR_65)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib del ..\..\..\lib\vc_$(VAR_65)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib ! -if exist ..\lib\vc_$(VAR_72)\wx.dll del ..\lib\vc_$(VAR_72)\wx.dll ! -if exist ..\lib\vc_$(VAR_72)\wx.ilk del ..\lib\vc_$(VAR_72)\wx.ilk ! -if exist ..\lib\vc_$(VAR_72)\wx.pdb del ..\lib\vc_$(VAR_72)\wx.pdb test_for_selected_wxbuild: --- 737,743 ---- -if exist ..\..\..\lib\vc_$(VAR_65)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.pdb del ..\..\..\lib\vc_$(VAR_65)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.pdb -if exist ..\..\..\lib\vc_$(VAR_65)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib del ..\..\..\lib\vc_$(VAR_65)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib ! -if exist ..\..\..\lib\vc_$(VAR_72)\wx.dll del ..\..\..\lib\vc_$(VAR_72)\wx.dll ! -if exist ..\..\..\lib\vc_$(VAR_72)\wx.ilk del ..\..\..\lib\vc_$(VAR_72)\wx.ilk ! -if exist ..\..\..\lib\vc_$(VAR_72)\wx.pdb del ..\..\..\lib\vc_$(VAR_72)\wx.pdb test_for_selected_wxbuild: *************** *** 880,884 **** !if "$(SHARED)" == "1" && "$(USE_LUAMODULE)" == "1" ! ..\lib\vc_$(VAR_72)\wx.dll: make_dir_mod_luamodule $(MOD_LUAMODULE_OBJECTS) link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(WXLIBPATH) $(VAR_67) /LIBPATH:..\..\..\lib\vc_$(VAR_65) /LIBPATH:$(LUA_DIR)\lib @<< $(MOD_LUAMODULE_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_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 --- 880,884 ---- !if "$(SHARED)" == "1" && "$(USE_LUAMODULE)" == "1" ! ..\..\..\lib\vc_$(VAR_72)\wx.dll: make_dir_mod_luamodule $(MOD_LUAMODULE_OBJECTS) link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(WXLIBPATH) $(VAR_67) /LIBPATH:..\..\..\lib\vc_$(VAR_65) /LIBPATH:$(LUA_DIR)\lib @<< $(MOD_LUAMODULE_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_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 *************** *** 887,891 **** make_dir_mod_luamodule: ! if not exist ..\lib\vc_$(VAR_72) mkdir ..\lib\vc_$(VAR_72) vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\lua_lib_lapi.obj: ..\..\lua\src\lapi.c --- 887,891 ---- make_dir_mod_luamodule: ! if not exist ..\..\..\lib\vc_$(VAR_72) mkdir ..\..\..\lib\vc_$(VAR_72) vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\lua_lib_lapi.obj: ..\..\lua\src\lapi.c Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.bcc,v retrieving revision 1.65 retrieving revision 1.66 diff -C2 -d -r1.65 -r1.66 *** makefile.bcc 24 Apr 2007 14:40:03 -0000 1.65 --- makefile.bcc 4 May 2007 20:22:26 -0000 1.66 *************** *** 455,459 **** !endif !if "$(SHARED)" == "1" && "$(USE_LUAMODULE)" == "1" ! __mod_luamodule___depname = ..\lib\bcc_$(VAR_50)\wx.dll !endif !if "$(SHARED)" == "0" --- 455,459 ---- !endif !if "$(SHARED)" == "1" && "$(USE_LUAMODULE)" == "1" ! __mod_luamodule___depname = ..\..\..\lib\bcc_$(VAR_50)\wx.dll !endif !if "$(SHARED)" == "0" *************** *** 708,717 **** -if exist ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.ils del ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.ils -if exist ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib del ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib ! -if exist ..\lib\bcc_$(VAR_50)\wx.dll del ..\lib\bcc_$(VAR_50)\wx.dll ! -if exist ..\lib\bcc_$(VAR_50)\wx.tds del ..\lib\bcc_$(VAR_50)\wx.tds ! -if exist ..\lib\bcc_$(VAR_50)\wx.ilc del ..\lib\bcc_$(VAR_50)\wx.ilc ! -if exist ..\lib\bcc_$(VAR_50)\wx.ild del ..\lib\bcc_$(VAR_50)\wx.ild ! -if exist ..\lib\bcc_$(VAR_50)\wx.ilf del ..\lib\bcc_$(VAR_50)\wx.ilf ! -if exist ..\lib\bcc_$(VAR_50)\wx.ils del ..\lib\bcc_$(VAR_50)\wx.ils test_for_selected_wxbuild: --- 708,717 ---- -if exist ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.ils del ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.ils -if exist ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib del ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib ! -if exist ..\..\..\lib\bcc_$(VAR_50)\wx.dll del ..\..\..\lib\bcc_$(VAR_50)\wx.dll ! -if exist ..\..\..\lib\bcc_$(VAR_50)\wx.tds del ..\..\..\lib\bcc_$(VAR_50)\wx.tds ! -if exist ..\..\..\lib\bcc_$(VAR_50)\wx.ilc del ..\..\..\lib\bcc_$(VAR_50)\wx.ilc ! -if exist ..\..\..\lib\bcc_$(VAR_50)\wx.ild del ..\..\..\lib\bcc_$(VAR_50)\wx.ild ! -if exist ..\..\..\lib\bcc_$(VAR_50)\wx.ilf del ..\..\..\lib\bcc_$(VAR_50)\wx.ilf ! -if exist ..\..\..\lib\bcc_$(VAR_50)\wx.ils del ..\..\..\lib\bcc_$(VAR_50)\wx.ils test_for_selected_wxbuild: *************** *** 860,864 **** !if "$(SHARED)" == "1" && "$(USE_LUAMODULE)" == "1" ! ..\lib\bcc_$(VAR_50)\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_48) -L..\..\..\lib\bcc_$(VAR_44) -L$(LUA_DIR)\lib @&&| c0d32.obj $(MOD_LUAMODULE_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_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_4)$(__RUNTIME_LIBS_4).lib,, --- 860,864 ---- !if "$(SHARED)" == "1" && "$(USE_LUAMODULE)" == "1" ! ..\..\..\lib\bcc_$(VAR_50)\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_48) -L..\..\..\lib\bcc_$(VAR_44) -L$(LUA_DIR)\lib @&&| c0d32.obj $(MOD_LUAMODULE_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_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_4)$(__RUNTIME_LIBS_4).lib,, *************** *** 867,871 **** make_dir_mod_luamodule: ! if not exist ..\lib\bcc_$(VAR_50) mkdir ..\lib\bcc_$(VAR_50) bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\lua_lib_lapi.obj: ..\..\lua\src\lapi.c --- 867,871 ---- make_dir_mod_luamodule: ! if not exist ..\..\..\lib\bcc_$(VAR_50) mkdir ..\..\..\lib\bcc_$(VAR_50) bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\lua_lib_lapi.obj: ..\..\lua\src\lapi.c Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.wat,v retrieving revision 1.64 retrieving revision 1.65 diff -C2 -d -r1.64 -r1.65 *** makefile.wat 24 Apr 2007 14:40:13 -0000 1.64 --- makefile.wat 4 May 2007 20:22:27 -0000 1.65 *************** *** 196,200 **** !ifeq SHARED 1 !ifeq USE_LUAMODULE 1 ! __mod_luamodule___depname = ..\lib\wat_$(VAR_50)\wx.dll !endif !endif --- 196,200 ---- !ifeq SHARED 1 !ifeq USE_LUAMODULE 1 ! __mod_luamodule___depname = ..\..\..\lib\wat_$(VAR_50)\wx.dll !endif !endif *************** *** 826,830 **** -if exist ..\..\..\lib\wat_$(VAR_45)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.dll del ..\..\..\lib\wat_$(VAR_45)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.dll -if exist ..\..\..\lib\wat_$(VAR_45)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib del ..\..\..\lib\wat_$(VAR_45)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib ! -if exist ..\lib\wat_$(VAR_50)\wx.dll del ..\lib\wat_$(VAR_50)\wx.dll test_for_selected_wxbuild : --- 826,830 ---- -if exist ..\..\..\lib\wat_$(VAR_45)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.dll del ..\..\..\lib\wat_$(VAR_45)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.dll -if exist ..\..\..\lib\wat_$(VAR_45)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib del ..\..\..\lib\wat_$(VAR_45)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib ! -if exist ..\..\..\lib\wat_$(VAR_50)\wx.dll del ..\..\..\lib\wat_$(VAR_50)\wx.dll test_for_selected_wxbuild : *************** *** 1026,1030 **** !ifeq SHARED 1 !ifeq USE_LUAMODULE 1 ! ..\lib\wat_$(VAR_50)\wx.dll : make_dir_mod_luamodule $(MOD_LUAMODULE_OBJECTS) @%create watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule.lbc @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule.lbc option quiet --- 1026,1030 ---- !ifeq SHARED 1 !ifeq USE_LUAMODULE 1 ! ..\..\..\lib\wat_$(VAR_50)\wx.dll : make_dir_mod_luamodule $(MOD_LUAMODULE_OBJECTS) @%create watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule.lbc @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule.lbc option quiet *************** *** 1041,1045 **** make_dir_mod_luamodule : ! if not exist ..\lib\wat_$(VAR_50) mkdir ..\lib\wat_$(VAR_50) watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\lua_lib_lapi.obj : .AUTODEPEND ..\..\lua\src\lapi.c --- 1041,1045 ---- make_dir_mod_luamodule : ! if not exist ..\..\..\lib\wat_$(VAR_50) mkdir ..\..\..\lib\wat_$(VAR_50) watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\lua_lib_lapi.obj : .AUTODEPEND ..\..\lua\src\lapi.c Index: makefile.gcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.gcc,v retrieving revision 1.64 retrieving revision 1.65 diff -C2 -d -r1.64 -r1.65 *** makefile.gcc 24 Apr 2007 14:40:10 -0000 1.64 --- makefile.gcc 4 May 2007 20:22:26 -0000 1.65 *************** *** 390,394 **** ifeq ($(SHARED),1) ifeq ($(USE_LUAMODULE),1) ! __mod_luamodule___depname = ..\lib\gcc_$(VAR_50)\wx.dll endif endif --- 390,394 ---- ifeq ($(SHARED),1) ifeq ($(USE_LUAMODULE),1) ! __mod_luamodule___depname = ..\..\..\lib\gcc_$(VAR_50)\wx.dll endif endif *************** *** 745,749 **** -if exist ..\..\..\lib\gcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.dll del ..\..\..\lib\gcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.dll -if exist ..\..\..\lib\gcc_$(VAR_44)\libwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.a del ..\..\..\lib\gcc_$(VAR_44)\libwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.a ! -if exist ..\lib\gcc_$(VAR_50)\wx.dll del ..\lib\gcc_$(VAR_50)\wx.dll test_for_selected_wxbuild: --- 745,749 ---- -if exist ..\..\..\lib\gcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.dll del ..\..\..\lib\gcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.dll -if exist ..\..\..\lib\gcc_$(VAR_44)\libwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.a del ..\..\..\lib\gcc_$(VAR_44)\libwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.a ! -if exist ..\..\..\lib\gcc_$(VAR_50)\wx.dll del ..\..\..\lib\gcc_$(VAR_50)\wx.dll test_for_selected_wxbuild: *************** *** 885,889 **** ifeq ($(SHARED),1) ifeq ($(USE_LUAMODULE),1) ! ..\lib\gcc_$(VAR_50)\wx.dll: make_dir_mod_luamodule $(MOD_LUAMODULE_OBJECTS) $(CXX) -shared -fPIC -o $@ $(MOD_LUAMODULE_OBJECTS) $(LDFLAGS) -mthreads -L$(WX_DIR)$(WXLIBPATH) $(VAR_48) $(__THREADING) -L..\..\..\lib\gcc_$(VAR_44) -L$(LUA_DIR)\lib -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug -llua5.1 $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_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 --- 885,889 ---- ifeq ($(SHARED),1) ifeq ($(USE_LUAMODULE),1) ! ..\..\..\lib\gcc_$(VAR_50)\wx.dll: make_dir_mod_luamodule $(MOD_LUAMODULE_OBJECTS) $(CXX) -shared -fPIC -o $@ $(MOD_LUAMODULE_OBJECTS) $(LDFLAGS) -mthreads -L$(WX_DIR)$(WXLIBPATH) $(VAR_48) $(__THREADING) -L..\..\..\lib\gcc_$(VAR_44) -L$(LUA_DIR)\lib -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug -llua5.1 $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_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 *************** *** 891,895 **** make_dir_mod_luamodule: ! if not exist ..\lib\gcc_$(VAR_50) mkdir ..\lib\gcc_$(VAR_50) gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\lua_lib_lapi.o: ../../lua/src/lapi.c --- 891,895 ---- make_dir_mod_luamodule: ! if not exist ..\..\..\lib\gcc_$(VAR_50) mkdir ..\..\..\lib\gcc_$(VAR_50) gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\lua_lib_lapi.o: ../../lua/src/lapi.c |
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X