[Wxlua-commit] wxLua/apps/wxluacan/src Makefile, 1.8, 1.9 canlua.h, 1.7, 1.8

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

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

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


Index: Makefile
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/Makefile,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Makefile	13 May 2006 21:05:35 -0000	1.8
--- Makefile	21 Dec 2006 06:02:02 -0000	1.9
***************
*** 8,21 ****
  
  # --- wxLua parameters -------------------------------------------------------
! WXLUA_LIBVERSION_CURRENT  = 1
! WXLUA_LIBVERSION_REVISION = 5
  WXLUA_LIBVERSION_AGE      = 0
  
  WXLUA_DIR    = ../../..
  WXLUA_LIBDIR = $(WXEXECDIR)
  
  LUA = $(WXLUA_DIR)/bin/lua
  
- WXLUASETUP_DIR =  $(WXLUA_DIR)/modules/wxbind/setup
  # ----------------------------------------------------------------------------
  
--- 8,21 ----
  
  # --- wxLua parameters -------------------------------------------------------
! WXLUA_LIBVERSION_CURRENT  = 2
! WXLUA_LIBVERSION_REVISION = 8
  WXLUA_LIBVERSION_AGE      = 0
  
  WXLUA_DIR    = ../../..
  WXLUA_LIBDIR = $(WXEXECDIR)
+ WXLUA_WXLUASETUP_DIR = $(WXLUA_DIR)/modules/wxbind/setup
  
  LUA = $(WXLUA_DIR)/bin/lua
  
  # ----------------------------------------------------------------------------
  
***************
*** 48,52 ****
  WXFL_LIB        = $(WXBASENAME)_fl-$(WXRELEASE)
  
! APPEXTRADEFS = -I$(WXLUA_DIR) -I$(WXLUA_DIR)/modules -I$(WXLUASETUP_DIR) -I$(WXPREFIX)/contrib/include -fexceptions -DLUACALL= -DWXLUA_LUA_NEWTHREAD
  
  # This will build a static wxLua app, staticly linked to .a libs
--- 48,52 ----
  WXFL_LIB        = $(WXBASENAME)_fl-$(WXRELEASE)
  
! APPEXTRADEFS = -I$(WXLUA_WXLUASETUP_DIR) -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

Index: canlua.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/canlua.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** canlua.h	28 Aug 2006 05:26:19 -0000	1.7
--- canlua.h	21 Dec 2006 06:02:02 -0000	1.8
***************
*** 47,51 ****
      ~wxlCanObj();
  
! 	//! sets the position of teh object relative to its parent object.
  	void SetPos( double x, double y ) { m_x = x; m_y = y; SetPending( true ); }
  
--- 47,51 ----
      ~wxlCanObj();
  
! 	//! sets the position of the object relative to its parent object.
  	void SetPos( double x, double y ) { m_x = x; m_y = y; SetPending( true ); }