[Wxlua-commit] wxLua/modules/wxlua/src Makefile, 1.13, 1.14 wxlstate.cpp, 1.111, 1.112

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

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

Modified Files:
	Makefile wxlstate.cpp 
Log Message:
Update build files for bindings/wxlua files in modules/wxlua
Fix calling convention for bitlib


Index: wxlstate.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlstate.cpp,v
retrieving revision 1.111
retrieving revision 1.112
diff -C2 -d -r1.111 -r1.112
*** wxlstate.cpp	14 Jun 2007 05:02:48 -0000	1.111
--- wxlstate.cpp	14 Jun 2007 12:23:04 -0000	1.112
***************
*** 42,46 ****
  wxLuaState wxNullLuaState(false);
  
! LUALIB_API int luaopen_bit (lua_State *L);
  
  // ----------------------------------------------------------------------------
--- 42,46 ----
  wxLuaState wxNullLuaState(false);
  
! int LUACALL luaopen_bit(lua_State *L);
  
  // ----------------------------------------------------------------------------
***************
*** 3808,3818 ****
  };
  
! LUALIB_API int luaopen_bit (lua_State *L) {
    luaL_openlib(L, "bit", bitlib, 0);
    return 1;
  }
  
- // FIXME - add this to the build files
- 
- #include "wxlua.cpp"
- #include "wxlua_bind.cpp"
--- 3808,3814 ----
  };
  
! int LUACALL luaopen_bit (lua_State *L) {
    luaL_openlib(L, "bit", bitlib, 0);
    return 1;
  }
  

Index: Makefile
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/Makefile,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** Makefile	12 Jun 2007 05:03:17 -0000	1.13
--- Makefile	14 Jun 2007 12:23:04 -0000	1.14
***************
*** 64,68 ****
  	wxlbind.cpp \
  	wxlcallb.cpp \
! 	wxlstate.cpp
  
  OBJECTS=$(SOURCES:.cpp=.o)
--- 64,70 ----
  	wxlbind.cpp \
  	wxlcallb.cpp \
! 	wxlstate.cpp \
! 	wxlua_bind.cpp \
! 	wxlua.cpp 
  
  OBJECTS=$(SOURCES:.cpp=.o)