Update of /cvsroot/wxlua/wxLua/bindings
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv2839/wxLua/bindings
Modified Files:
Makefile
Log Message:
Fix Makefiles to work for genwxbind.lua w/ cygwin in MSW
Make all the %override comments in the bindings uniform and fix
the parameters actually used for them.
Index: Makefile
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Makefile 31 May 2007 17:18:45 -0000 1.1
--- Makefile 1 Jun 2007 18:19:46 -0000 1.2
***************
*** 6,15 ****
WXLUA_DIR = ../
! LUA = $(WXLUA_DIR)/bin/lua
all: wxwidgets wxstc wxluasocket wxluacan
wxwidgets:
! @echo Building wxWidgets
@($(LUA) -e"rulesFilename=\"wxwidgets/wx_rules.lua\"" genwxbind.lua > wxwidgets/error.txt)
# @(cd $(WXLUA_DIR)/bindings/wxwidgets && make -B)
--- 6,23 ----
WXLUA_DIR = ../
!
!
! # If we're using cygwin, lua maybe somewhere else, try some common places
! # note some other variables cygwin sets don't seem to be exported
! ifeq (Cygwin, $(findstring Cygwin, $(XTERM_VERSION)))
! LUA=$(WXLUA_DIR)/bin/vc_lib/lua.exe
! else
! LUA=$(WXLUA_DIR)/bin/lua
! endif
all: wxwidgets wxstc wxluasocket wxluacan
wxwidgets:
! @echo Building wxWidgets $(LUA)
@($(LUA) -e"rulesFilename=\"wxwidgets/wx_rules.lua\"" genwxbind.lua > wxwidgets/error.txt)
# @(cd $(WXLUA_DIR)/bindings/wxwidgets && make -B)
***************
*** 25,29 ****
wxluacan:
@echo "Building wxLuaCan (ps. did you forget to run make -B)"
! @(cd $(WXLUA_DIR)/apps/wxluacan/src && make genwxbind)
--- 33,40 ----
wxluacan:
@echo "Building wxLuaCan (ps. did you forget to run make -B)"
! @(cd $(WXLUA_DIR)/apps/wxluacan/src && make -e LUA=../../$(LUA) genwxbind)
!
! genidocs:
! @($(LUA) -e"rulesFilename=\"wxwidgets/wx_rules.lua\"" genidocs.lua)
|
