[Wxlua-commit] wxLua/apps Makefile.in,1.5,1.6

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

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

Modified Files:
	Makefile.in 
Log Message:
rebaked the build files to remove the unused wxluawrap.cpp file
started docs for building wxlua


Index: Makefile.in
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/Makefile.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Makefile.in	20 Nov 2005 11:35:17 -0000	1.5
--- Makefile.in	23 Nov 2005 06:03:39 -0000	1.6
***************
*** 15,25 ****
  SETFILE = @SETFILE@
  top_builddir = @top_builddir@
- CC = @CC@
  CXX = @CXX@
- CFLAGS = @CFLAGS@
  CXXFLAGS = @CXXFLAGS@
  CPPFLAGS = @CPPFLAGS@
  LDFLAGS = @LDFLAGS@
- WX_CFLAGS = @WX_CFLAGS@
  WX_CXXFLAGS = @WX_CXXFLAGS@
  WX_LIBS = @WX_LIBS@
--- 15,22 ----
***************
*** 28,47 ****
  
  DESTDIR = 
- APP_WXLUA_CFLAGS =  -I../modules   $(WX_CFLAGS) $(CPPFLAGS) $(CFLAGS)
  APP_WXLUA_CXXFLAGS =  -I../modules   $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
  APP_WXLUA_OBJECTS =  \
  	app_wxlua_wxlua.o \
  	app_wxlua_lconsole.o \
! 	$(__app_wxlua___win32rc) \
! 	app_wxlua_..\bindings\wxwidgets\wxluawrap.o
  
  ### Conditionally set variables: ###
  
- @COND_DEPS_TRACKING_0@CCC = $(CC)
- @COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC)
- @COND_DEPS_TRACKING_0@CXXC = $(CXX)
  @COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
  @COND_PLATFORM_MAC_1@__app_wxlua___mac_setfilecmd = \
! @COND_PLATFORM_MAC_1@	$(SETFILE) -t APPL ../bin/wxlua$(EXEEXT)
  @COND_PLATFORM_WIN32_1@__app_wxlua___win32rc = app_wxlua_wxlua_rc.o
  
--- 25,40 ----
  
  DESTDIR = 
  APP_WXLUA_CXXFLAGS =  -I../modules   $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
  APP_WXLUA_OBJECTS =  \
  	app_wxlua_wxlua.o \
  	app_wxlua_lconsole.o \
! 	$(__app_wxlua___win32rc)
  
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+ @COND_DEPS_TRACKING_0@CXXC = $(CXX)
  @COND_PLATFORM_MAC_1@__app_wxlua___mac_setfilecmd = \
! @COND_PLATFORM_MAC_1@	$(SETFILE) -t APPL wxlua$(EXEEXT)
  @COND_PLATFORM_WIN32_1@__app_wxlua___win32rc = app_wxlua_wxlua_rc.o
  
***************
*** 65,69 ****
  
  ../bin/wxlua$(EXEEXT): $(APP_WXLUA_OBJECTS) $(__app_wxlua___win32rc)
! 	$(CXX) -o $@ $(APP_WXLUA_OBJECTS) $(LDFLAGS) -L../lib  -lwxluadebug -lwxluasocket -lwxlua -lwxbind -llua $(WX_LIBS)
  	
  	$(__app_wxlua___mac_setfilecmd)
--- 58,62 ----
  
  ../bin/wxlua$(EXEEXT): $(APP_WXLUA_OBJECTS) $(__app_wxlua___win32rc)
! 	$(CXX) -o $@ $(APP_WXLUA_OBJECTS) $(LDFLAGS) -L../lib  $(WX_LIBS) -lwxluadebug -lwxluasocket -lwxlua -lwxbind -llua
  	
  	$(__app_wxlua___mac_setfilecmd)
***************
*** 78,84 ****
  	$(RESCOMP) -i$< -o$@ --include-dir ../modules
  
- app_wxlua_..\bindings\wxwidgets\wxluawrap.o: ./..\bindings\wxwidgets\wxluawrap.c
- 	$(CCC) -c -o $@ $(APP_WXLUA_CFLAGS) ./..\bindings\wxwidgets\wxluawrap.c
- 
  
  # Include dependency info, if present:
--- 71,74 ----