[Wxlua-commit] wxLua/modules/luamodule/src Makefile,1.1,1.2

[John L. <jr...@us...>]

Update of /cvsroot/wxlua/wxLua/modules/luamodule/src
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv16241/wxLua/modules/luamodule/src

Modified Files:
	Makefile 
Log Message:
update makefiles tospecify full path to lua module


Index: Makefile
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/luamodule/src/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Makefile	20 May 2006 12:18:47 -0000	1.1
--- Makefile	21 Dec 2006 06:02:03 -0000	1.2
***************
*** 8,17 ****
  
  # --- wxLua parameters -------------------------------------------------------
! WXLUA_LIBVERSION_CURRENT  = 1
! WXLUA_LIBVERSION_REVISION = 5
  WXLUA_LIBVERSION_AGE      = 0
  
  WXLUA_DIR    = ../../..
  WXLUA_LIBDIR = $(WXPREFIX)/lib
  
  LUA = $(WXLUA_DIR)/bin/lua
--- 8,18 ----
  
  # --- wxLua parameters -------------------------------------------------------
! WXLUA_LIBVERSION_CURRENT  = 2
! WXLUA_LIBVERSION_REVISION = 8
  WXLUA_LIBVERSION_AGE      = 0
  
  WXLUA_DIR    = ../../..
  WXLUA_LIBDIR = $(WXPREFIX)/lib
+ WXLUA_WXLUASETUP_DIR = $(WXLUA_DIR)/modules/wxbind/setup
  
  LUA = $(WXLUA_DIR)/bin/lua
***************
*** 46,50 ****
  WXFL_LIB        = $(WXBASENAME)_fl-$(WXRELEASE)
  
! APPEXTRADEFS = -I$(WXLUA_DIR) -I$(WXLUA_DIR)/modules -I$(WXPREFIX)/contrib/include -fexceptions -DLUACALL= -DWXLUA_LUA_NEWTHREAD
  
  # This will build a static wxLua app, staticly linked to .a libs
--- 47,51 ----
  WXFL_LIB        = $(WXBASENAME)_fl-$(WXRELEASE)
  
! APPEXTRADEFS = -I$(WXLUA_DIR) -I$(WXLUA_DIR)/modules -I$(WXLUA_DIR)/modules/lua/include -I$(WXPREFIX)/contrib/include -fexceptions -DLUACALL=
  
  # This will build a static wxLua app, staticly linked to .a libs
***************
*** 53,57 ****
  # This will build a shared wxLua app, dynamicly linked to .so libs
  #  -l$(WXFL_LIB)
! APPEXTRALIBS=-L$(WXLIB_DIR) -L$(WXLUA_LIBDIR) -l$(WXSTC_LIB) -l$(WXXRC_LIB) -l$(WXLUABIND_LIB) -l$(WXLUASTC_LIB) -l$(WXLUA_LIB) -l$(WXLUADEBUG_LIB) -l$(WXLUASOCKET_LIB) 
  
  #OBJECTS=luamodule.o
--- 54,58 ----
  # This will build a shared wxLua app, dynamicly linked to .so libs
  #  -l$(WXFL_LIB)
! APPEXTRALIBS=-L$(WXLIB_DIR) -L$(WXLUA_LIBDIR) -l$(WXSTC_LIB) -l$(WXXRC_LIB) -l$(WXLUABIND_LIB) -l$(WXLUASTC_LIB) -l$(WXLUA_LIB) -l$(WXLUADEBUG_LIB) -l$(WXLUASOCKET_LIB)
  
  #OBJECTS=luamodule.o