[Wxlua-commit] wxLua/apps/wxlua/src Makefile,1.10,1.11

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

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

Modified Files:
	Makefile 
Log Message:
separated wxSTC contrib from the wxWidgets binding, create new module for it


Index: Makefile
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/wxlua/src/Makefile,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Makefile	31 Jan 2006 04:31:09 -0000	1.10
--- Makefile	2 Feb 2006 15:49:24 -0000	1.11
***************
*** 42,45 ****
--- 42,46 ----
  WXLUASOCKET_LIB = $(WXBASENAME)_wxluasocket-$(WXRELEASE)
  WXLUABIND_LIB   = $(WXBASENAME)_wxluabind-$(WXRELEASE)
+ WXLUASTC_LIB    = $(WXBASENAME)_wxluastc-$(WXRELEASE)
  WXSTC_LIB       = $(WXBASENAME)_stc-$(WXRELEASE)
  WXXRC_LIB       = $(WXBASENAME)_xrc-$(WXRELEASE)
***************
*** 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$(WXLUA_LIB) -l$(WXLUADEBUG_LIB) -l$(WXLUASOCKET_LIB) $(LUA_LIBS)
  
  OBJECTS=wxlua.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) $(LUA_LIBS)
  
  OBJECTS=wxlua.o
***************
*** 61,65 ****
  	$(CXX) -c $(CXXFLAGS) $(APPEXTRADEFS) -o $@ $<
  
! all: lua wxLuaLib wxLuaDebugLib wxLuaSocketLib wxLuaBindings $(PROGRAM)
  
  $(PROGRAM): $(OBJECTS) $(LUA_LIBS) wxLuaLib wxLuaDebugLib wxLuaSocketLib wxLuaBindings
--- 62,66 ----
  	$(CXX) -c $(CXXFLAGS) $(APPEXTRADEFS) -o $@ $<
  
! all: lua wxLuaLib wxLuaDebugLib wxLuaSocketLib wxLuaBindings wxSTCBindings $(PROGRAM)
  
  $(PROGRAM): $(OBJECTS) $(LUA_LIBS) wxLuaLib wxLuaDebugLib wxLuaSocketLib wxLuaBindings
***************
*** 69,73 ****
  	@(cd $(WXLUA_DIR)/modules/lua && make)
  
! bindings:
  	@(cd $(WXLUA_DIR)/bindings/wxwidgets && make)
  
--- 70,77 ----
  	@(cd $(WXLUA_DIR)/modules/lua && make)
  
! wxwidgets_bindings:
! 	@(cd $(WXLUA_DIR)/bindings/wxwidgets && make)
! 
! wxstc_bindings:
  	@(cd $(WXLUA_DIR)/bindings/wxwidgets && make)
  
***************
*** 78,81 ****
--- 82,88 ----
  	@(cd $(WXLUA_DIR)/modules/wxbind/src && make)
  
+ wxSTCBindings:
+ 	@(cd $(WXLUA_DIR)/modules/wxstc/src && make)
+ 
  wxLuaLib:
  	@(cd $(WXLUA_DIR)/modules/wxlua/src && make)