Update of /cvsroot/wxlua/wxLua/modules
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv8475/modules
Modified Files:
Makefile.in
Log Message:
changed luamodule to link against verbatim lua and output result in DLL dir
Index: Makefile.in
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/Makefile.in,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** Makefile.in 20 May 2006 18:22:25 -0000 1.39
--- Makefile.in 20 May 2006 20:17:56 -0000 1.40
***************
*** 186,191 ****
lua_dll_linit.o
WXLUA_LIB_CXXFLAGS = -I$(top_srcdir)/modules/wxbind/setup \
! -I$(top_srcdir)/modules -I./$(top_srcdir) $(WX_CXXFLAGS) $(CPPFLAGS) \
! $(CXXFLAGS)
WXLUA_LIB_OBJECTS = \
wxlua_lib_wxlcallb.o \
--- 186,191 ----
lua_dll_linit.o
WXLUA_LIB_CXXFLAGS = -I$(top_srcdir)/modules/wxbind/setup \
! -I$(top_srcdir)/modules -I./$(top_srcdir) -DWXLUA_LUA_NEWTHREAD \
! $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
WXLUA_LIB_OBJECTS = \
wxlua_lib_wxlcallb.o \
***************
*** 194,199 ****
wxlua_lib_internal.o
WXLUA_DLL_CXXFLAGS = -I$(top_srcdir)/modules/wxbind/setup \
! -I$(top_srcdir)/modules -I./$(top_srcdir) -DWXMAKINGDLL_WXLUA $(PIC_FLAG) \
! $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
WXLUA_DLL_OBJECTS = \
wxlua_dll_wxlcallb.o \
--- 194,199 ----
wxlua_lib_internal.o
WXLUA_DLL_CXXFLAGS = -I$(top_srcdir)/modules/wxbind/setup \
! -I$(top_srcdir)/modules -I./$(top_srcdir) -DWXMAKINGDLL_WXLUA \
! -DWXLUA_LUA_NEWTHREAD $(PIC_FLAG) $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
WXLUA_DLL_OBJECTS = \
wxlua_dll_wxlcallb.o \
***************
*** 1184,1188 ****
@COND_SHARED_1_USE_LUAMODULE_1@$(top_builddir)lib/$(DLLPREFIX_MODULE)wx.$(SO_SUFFIX_MODULE): $(MOD_LUAMODULE_OBJECTS)
! @COND_SHARED_1_USE_LUAMODULE_1@ $(SHARED_LD_MODULE_CXX) $@ $(MOD_LUAMODULE_OBJECTS) $(LDFLAGS) -L$(top_builddir)lib -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) $(WX_LIBS)
@COND_SHARED_1_USE_LUAMODULE_1@install_mod_luamodule:
--- 1184,1188 ----
@COND_SHARED_1_USE_LUAMODULE_1@$(top_builddir)lib/$(DLLPREFIX_MODULE)wx.$(SO_SUFFIX_MODULE): $(MOD_LUAMODULE_OBJECTS)
! @COND_SHARED_1_USE_LUAMODULE_1@ $(SHARED_LD_MODULE_CXX) $@ $(MOD_LUAMODULE_OBJECTS) $(LDFLAGS) -L$(top_builddir)lib -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -llua5.1 $(WX_LIBS)
@COND_SHARED_1_USE_LUAMODULE_1@install_mod_luamodule:
|
