[Wxlua-commit] wxLua/apps/wxluaedit/src Makefile,1.1,1.2

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

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

Modified Files:
	Makefile 
Log Message:
wxEVT_DEBUG_XXX -> wxEVT_WXLUA_DEBUG_XXX and export them for DLL
reorder libs for linking in wxluaedit
TRUE/FALSE -> true/false
EVENT_DEBUG_XXX and CMD_XXX -> wxLUA_EVENT_DEBUG_XXX wxLUA_CMD_XXX


Index: Makefile
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/wxluaedit/src/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Makefile	24 Nov 2005 06:38:17 -0000	1.1
--- Makefile	1 Dec 2005 04:17:29 -0000	1.2
***************
*** 26,30 ****
  WXCXXFLAGS = $(shell $(WXCONFIG) --cxxflags)
  WXLDLIBS   = $(shell $(WXCONFIG) --libs)
! WXCXX      = $(shell $(WXCONFIG) --cxx) 
  WXLIB_DIR  = $(WXPREFIX)/lib
  # ----------------------------------------------------------------------------
--- 26,30 ----
  WXCXXFLAGS = $(shell $(WXCONFIG) --cxxflags)
  WXLDLIBS   = $(shell $(WXCONFIG) --libs)
! WXCXX      = $(shell $(WXCONFIG) --cxx)
  WXLIB_DIR  = $(WXPREFIX)/lib
  # ----------------------------------------------------------------------------
***************
*** 36,40 ****
  PROGRAM = wxLuaEditor
  
! LUA_LIBS        = $(WXLUA_DIR)/lib/liblua.a $(WXLUA_DIR)/lib/liblualib.a 
  WXLUA_LIB       = $(WXBASENAME)_wxlua-$(WXRELEASE)
  WXLUADEBUG_LIB  = $(WXBASENAME)_wxluadebug-$(WXRELEASE)
--- 36,40 ----
  PROGRAM = wxLuaEditor
  
! LUA_LIBS        = $(WXLUA_DIR)/lib/liblua.a $(WXLUA_DIR)/lib/liblualib.a
  WXLUA_LIB       = $(WXBASENAME)_wxlua-$(WXRELEASE)
  WXLUADEBUG_LIB  = $(WXBASENAME)_wxluadebug-$(WXRELEASE)
***************
*** 47,52 ****
  # The wxSTEditor library name compiled from wxCode/components/wxstedit
  WXSTEDIT_LIB    = $(WXBASENAME)_stedit-$(WXRELEASE)
  
! APPEXTRADEFS=-I$(WXCODE)/components/wxstedit/include -I$(WXLUA_DIR)/modules -I$(WXPREFIX)/contrib/include -fexceptions -DLUACALL=
  
  # This will build a static wxLua app, staticly linked to .a libs
--- 47,53 ----
  # The wxSTEditor library name compiled from wxCode/components/wxstedit
  WXSTEDIT_LIB    = $(WXBASENAME)_stedit-$(WXRELEASE)
+ WXSTEDIT_DIR    = $(WXCODE)/components/wxstedit
  
! APPEXTRADEFS=-I$(WXSTEDIT_DIR)/include -I$(WXLUA_DIR)/modules -I$(WXPREFIX)/contrib/include -fexceptions -DLUACALL=
  
  # This will build a static wxLua app, staticly linked to .a libs
***************
*** 55,59 ****
  # This will build a shared wxLua app, dynamicly linked to .so libs
  #  -l$(WXFL_LIB)
! APPEXTRALIBS=-L$(WXLIB_DIR) -L$(WXLUA_LIBDIR) -l$(WXSTEDIT_LIB) -l$(WXLUA_LIB) -l$(WXLUADEBUG_LIB) -l$(WXLUASOCKET_LIB) -l$(WXSTC_LIB) -l$(WXXRC_LIB) $(LUA_LIBS) -l$(WXLUABIND_LIB)
  
  OBJECTS  = wxluaedit.o wxledit.o
--- 56,60 ----
  # 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$(WXSTEDIT_LIB) -l$(WXXRC_LIB) -l$(WXLUABIND_LIB) -l$(WXLUA_LIB) -l$(WXLUADEBUG_LIB) -l$(WXLUASOCKET_LIB) $(LUA_LIBS)
  
  OBJECTS  = wxluaedit.o wxledit.o
***************
*** 63,75 ****
  	$(CXX) -c $(CXXFLAGS) $(APPEXTRADEFS) -o $@ $<
  
! all: lua wxLuaLib wxLuaDebugLib wxLuaSocketLib wxLuaBindings $(PROGRAM)  
  
  $(PROGRAM): $(OBJECTS) $(LUA_LIBS)
! 	$(CXX) -o $@ $(OBJECTS) $(LDLIBS) $(APPEXTRALIBS) 
  
  lua:
  	@(cd $(WXLUA_DIR)/modules/lua && make)
  
! bindings: 
  	@(cd $(WXLUA_DIR)/bindings/wxwidgets && make)
  
--- 64,76 ----
  	$(CXX) -c $(CXXFLAGS) $(APPEXTRADEFS) -o $@ $<
  
! all: lua wxLuaLib wxLuaDebugLib wxLuaSocketLib wxLuaBindings $(PROGRAM)
  
  $(PROGRAM): $(OBJECTS) $(LUA_LIBS)
! 	$(CXX) -o $@ $(OBJECTS) $(LDLIBS) $(APPEXTRALIBS)
  
  lua:
  	@(cd $(WXLUA_DIR)/modules/lua && make)
  
! bindings:
  	@(cd $(WXLUA_DIR)/bindings/wxwidgets && make)