[Wxlua-commit] wxLua/apps Makefile.in,1.1,1.2

[Francesco <fr...@us...>]

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

Modified Files:
	Makefile.in 
Log Message:
Fixed modules compilation

Index: Makefile.in
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/Makefile.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Makefile.in	14 Jun 2005 20:22:49 -0000	1.1
--- Makefile.in	14 Jun 2005 21:44:39 -0000	1.2
***************
*** 12,21 ****
--- 12,25 ----
  INSTALL = @INSTALL@
  EXEEXT = @EXEEXT@
+ RESCOMP = @RESCOMP@
  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@
***************
*** 24,42 ****
  
  DESTDIR = 
  WXLUA_CXXFLAGS =  -I../modules   $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
  WXLUA_OBJECTS =  \
  	wxlua_wxlua.o \
! 	wxlua_lconsole.o
  
  ### Conditionally set variables: ###
  
! @COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
  @COND_PLATFORM_MAC_1@__wxlua___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@	$(SETFILE) -t APPL wxlua$(EXEEXT)
  
  ### Targets: ###
  
! all: ../bin/wxlua$(EXEEXT)
  
  install: all
--- 28,52 ----
  
  DESTDIR = 
+ WXLUA_CFLAGS =  -I../modules   $(WX_CFLAGS) $(CPPFLAGS) $(CFLAGS)
  WXLUA_CXXFLAGS =  -I../modules   $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
  WXLUA_OBJECTS =  \
  	wxlua_wxlua.o \
! 	wxlua_lconsole.o \
! 	$(__wxlua___win32rc) \
! 	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@__wxlua___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@	$(SETFILE) -t APPL wxlua$(EXEEXT)
+ @COND_PLATFORM_WIN32_1@__wxlua___win32rc = wxlua_wxlua_rc.o
  
  ### Targets: ###
  
! all: wrap ../bin/wxlua$(EXEEXT)
  
  install: all
***************
*** 54,67 ****
  	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
! ../bin/wxlua$(EXEEXT): $(WXLUA_OBJECTS)
! 	$(CXX) -o $@ $(WXLUA_OBJECTS) $(LDFLAGS) -L../lib  $(WX_LIBS)
  	
  	$(__wxlua___mac_setfilecmd)
  
! wxlua_wxlua.o: ../wxlua/src/wxlua.cpp
! 	$(CXXC) -c -o $@ $(WXLUA_CXXFLAGS) ../wxlua/src/wxlua.cpp
  
! wxlua_lconsole.o: ../wxlua/src/lconsole.cpp
! 	$(CXXC) -c -o $@ $(WXLUA_CXXFLAGS) ../wxlua/src/lconsole.cpp
  
  
--- 64,87 ----
  	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
! wrap: ..\..\..\bindings\wxwidgets\override.hpp
! 	..\..\..\bin\lua -e"target=\"msw\"" ..\..\wxlua\src\wrap.lua
! 	copy ..\..\..\bindings\wxwidgets\wxluawrap.i ..\..\..\bindings\wxwidgets\wxluawrap.c
! 
! ../bin/wxlua$(EXEEXT): $(WXLUA_OBJECTS) wrap $(__wxlua___win32rc)
! 	$(CXX) -o $@ $(WXLUA_OBJECTS) $(LDFLAGS) -L../lib  $(WX_LIBS) -lwxluadebug -lwxluasocket -lwxlua -llua
  	
  	$(__wxlua___mac_setfilecmd)
  
! wxlua_wxlua.o: ./wxlua/src/wxlua.cpp
! 	$(CXXC) -c -o $@ $(WXLUA_CXXFLAGS) ./wxlua/src/wxlua.cpp
  
! wxlua_lconsole.o: ./wxlua/src/lconsole.cpp
! 	$(CXXC) -c -o $@ $(WXLUA_CXXFLAGS) ./wxlua/src/lconsole.cpp
! 
! wxlua_wxlua_rc.o: ./wxlua/src/wxlua.rc
! 	$(RESCOMP) -i$< -o$@ --include-dir ../modules
! 
! wxlua_..\bindings\wxwidgets\wxluawrap.o: ./..\bindings\wxwidgets\wxluawrap.c
! 	$(CCC) -c -o $@ $(WXLUA_CFLAGS) ./..\bindings\wxwidgets\wxluawrap.c