[Wxlua-commit] wxLua/apps/wxlua/src Makefile,1.2,1.3 Makefile_import,1.1,1.2

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

Update of /cvsroot/wxlua/wxLua/apps/wxlua/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7199/wxLua/apps/wxlua/src

Modified Files:
	Makefile Makefile_import 
Log Message:
update for wx26/27
Add bindings for builtin (global) functions
Handle %if statements for enums


Index: Makefile
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/wxlua/src/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Makefile	7 Jun 2005 04:42:49 -0000	1.2
--- Makefile	17 Nov 2005 05:51:20 -0000	1.3
***************
*** 22,25 ****
--- 22,27 ----
  PROGRAM = wxLua
  
+ WXLUA = ../../..
+ 
  LUA_LIBS  = ../../../lib/liblua.a ../../../lib/liblualib.a 
  WXLUA_LIB = $(WXLIBBASE)_wxlua-$(WXRELEASE)
***************
*** 39,50 ****
  APPEXTRALIBS=-L$(WXLIBDIR) -l$(WXLUA_LIB) -l$(WXLUADEBUG_LIB) -l$(WXLUASOCKET_LIB) -l$(WXSTC_LIB) -l$(WXXRC_LIB) $(LUA_LIBS)
  
! OBJECTS=wxlua.o wxluawrap.o
  
  DEPFILES=$(OBJECTS:.o=.d)
  
  .cpp.o:
  	$(CXX) -c $(CXXFLAGS) $(APPEXTRADEFS) -o $@ $<
  
! all: lua wxLuaLib wxLuaDebugLib wxLuaSocketLib luawrappers $(PROGRAM)  
  
  $(PROGRAM): $(OBJECTS) $(LUA_LIBS)
--- 41,93 ----
  APPEXTRALIBS=-L$(WXLIBDIR) -l$(WXLUA_LIB) -l$(WXLUADEBUG_LIB) -l$(WXLUASOCKET_LIB) -l$(WXSTC_LIB) -l$(WXXRC_LIB) $(LUA_LIBS)
  
! OBJECTS=wxlua.o $(WXLUABINDINGS)
! #wxluawrap.o ../../../modules/wxbind/src/wxlhtmlwin.o ../../../modules/wxbind/src/wxlprint.o
  
  DEPFILES=$(OBJECTS:.o=.d)
  
+ WXLUABINDINGS = \
+     ../../../modules/wxbind/src/appframe.o \
+     ../../../modules/wxbind/src/clipdrag.o \
+     ../../../modules/wxbind/src/config.o \
+     ../../../modules/wxbind/src/controls.o \
+     ../../../modules/wxbind/src/data.o \
+     ../../../modules/wxbind/src/datetime.o \
+     ../../../modules/wxbind/src/defsutil.o \
+     ../../../modules/wxbind/src/dialogs.o\
+     ../../../modules/wxbind/src/event.o \
+     ../../../modules/wxbind/src/file.o \
+     ../../../modules/wxbind/src/fl.o \
+     ../../../modules/wxbind/src/gdi.o \
+     ../../../modules/wxbind/src/geometry.o \
+     ../../../modules/wxbind/src/grid.o \
+     ../../../modules/wxbind/src/help.o \
+     ../../../modules/wxbind/src/html.o \
+     ../../../modules/wxbind/src/image.o \
+     ../../../modules/wxbind/src/mdi.o \
+     ../../../modules/wxbind/src/menutool.o \
+     ../../../modules/wxbind/src/plot.o \
+     ../../../modules/wxbind/src/print.o \
+     ../../../modules/wxbind/src/regex.o \
+     ../../../modules/wxbind/src/sizer.o \
+     ../../../modules/wxbind/src/socket.o \
+     ../../../modules/wxbind/src/stc.o \
+     ../../../modules/wxbind/src/thread.o \
+     ../../../modules/wxbind/src/wave.o \
+     ../../../modules/wxbind/src/windows.o \
+     ../../../modules/wxbind/src/wx_builtin.o \
+     ../../../modules/wxbind/src/wx_class.o \
+     ../../../modules/wxbind/src/wx_define.o \
+     ../../../modules/wxbind/src/wx_event.o \
+     ../../../modules/wxbind/src/wxlhtmlwin.o \
+     ../../../modules/wxbind/src/wxlprint.o \
+     ../../../modules/wxbind/src/wxlua.o \
+     ../../../modules/wxbind/src/wx_object.o \
+     ../../../modules/wxbind/src/xml.o
+ 
+ 
  .cpp.o:
  	$(CXX) -c $(CXXFLAGS) $(APPEXTRADEFS) -o $@ $<
  
! all: lua bindings wxLuaLib wxLuaDebugLib wxLuaSocketLib $(PROGRAM)  
  
  $(PROGRAM): $(OBJECTS) $(LUA_LIBS)
***************
*** 54,60 ****
  	@(cd $(LUADIR) && make)
  
! luawrappers:
  	make -f Makefile_import
  
  wxLuaLib:
  	@(cd ../../../modules/wxlua/src && make)
--- 97,106 ----
  	@(cd $(LUADIR) && make)
  
! bindings: 
  	make -f Makefile_import
  
+ wxLuaBindings: $(WXLUABINDINGS)
+ 	$(CXX) -o $@ $(WXLUABINDINGS) $(LDLIBS) $(APPEXTRALIBS) 
+ 
  wxLuaLib:
  	@(cd ../../../modules/wxlua/src && make)

Index: Makefile_import
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/wxlua/src/Makefile_import,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Makefile_import	7 Jun 2005 04:17:29 -0000	1.1
--- Makefile_import	17 Nov 2005 05:51:20 -0000	1.2
***************
*** 19,31 ****
  THEWRAPPERS=$(addprefix $(WXLUA)/bindings/wxwidgets/, $(WRAPPERS))
  
! all: wxluawrap.cpp
  
! DEPFILES = wrap.lua luasetup.h.in $(WXLUA)/bindings/wxluawrap.lua $(WXLUA)/bindings/wxwidgets/override.hpp $(THEWRAPPERS)
  
  wxluawrap.cpp: $(DEPFILES)
  	$(WXLUA)/bin/lua -e"target=\"gtk\"; wxWinDir=\"$(WXDIR)\"; wxCxxFlags=\"$(WXCXXFLAGS)\"" wrap.lua
  
! clean:
! 	rm -f wxluawrap.cpp 
  	
  
--- 19,35 ----
  THEWRAPPERS=$(addprefix $(WXLUA)/bindings/wxwidgets/, $(WRAPPERS))
  
! all: genwxbind
  
! DEPFILES = luasetup.h.in # $(WXLUA)/bindings/genwxbind.lua $(WXLUA)/bindings/wxwidgets/override.hpp # $(THEWRAPPERS)
  
+ # This is depricated and does not currenly generate bindings that work with wxLua
  wxluawrap.cpp: $(DEPFILES)
  	$(WXLUA)/bin/lua -e"target=\"gtk\"; wxWinDir=\"$(WXDIR)\"; wxCxxFlags=\"$(WXCXXFLAGS)\"" wrap.lua
  
! genwxbind: $(DEPFILES)
! 	@(cd ../../../bindings && ../bin/lua -e"rulesFilename=\"wxwidgets/wx.rules\"" genwxbind.lua > wxwidgets/error.txt)
! 
! #clean:
! #	rm -f wxluawrap.cpp