[Wxlua-commit] wxLua/modules/wxluadebug/src Makefile,NONE,1.1 debug.cpp,1.1,1.2 splttree.cpp,1.1,1.2 staktree.cpp,1.1,1.2

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

Update of /cvsroot/wxlua/wxLua/modules/wxluadebug/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15118/wxLua/modules/wxluadebug/src

Modified Files:
	debug.cpp splttree.cpp staktree.cpp 
Added Files:
	Makefile 
Log Message:
still moving files to module and app directory


Index: splttree.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/src/splttree.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** splttree.cpp	6 Jun 2005 23:06:19 -0000	1.1
--- splttree.cpp	7 Jun 2005 04:17:40 -0000	1.2
***************
*** 42,46 ****
  #endif
  
! #include "wxlua/splttree.h"
  #include <math.h>
  
--- 42,46 ----
  #endif
  
! #include "wxluadebug/include/splttree.h"
  #include <math.h>
  

--- NEW FILE: Makefile ---
# File:		Makefile
# Author:	J Winwood
# Created:	2002
# Updated:	
# Copyright: (c) 2002 Lomtick Software. All rights reserved.
#
# Makefile for wxLua library using gmake

LUADIR = ../../lua

WXDIR      = $(shell wx-config --prefix)
WXBASENAME = $(shell wx-config --basename)
WXLIBBASE  = $(shell wx-config --basename)
WXVERSION  = $(shell wx-config --version)
WXRELEASE  = $(shell wx-config --release)

CXXFLAGS = $(shell wx-config --cxxflags) -MMD -g -Wall
LDLIBS   = $(shell wx-config --libs)
CXX      = $(shell wx-config --cxx) 

APPEXTRADEFS=-I../../ -I$(WXDIR)/contrib/include -fexceptions -DLUACALL= 

LIBVERSION_CURRENT=1
LIBVERSION_REVISION=5
LIBVERSION_AGE=0

TARGET_LIBNAME = lib$(WXLIBBASE)_wxluadebug-$(WXRELEASE)

TARGET_LIB_STATIC = $(WXDIR)/lib/$(TARGET_LIBNAME).a
TARGET_LIB_SHARED = $(WXDIR)/lib/$(TARGET_LIBNAME).so.$(LIBVERSION_CURRENT).$(LIBVERSION_REVISION).$(LIBVERSION_AGE)
TARGET_LIB_LINK1  = $(TARGET_LIBNAME).so.$(LIBVERSION_CURRENT)
TARGET_LIB_LINK2  = $(TARGET_LIBNAME).so

RM        = rm -f
AR        = ar
AROPTIONS = rcu
RANLIB    = ranlib
LN_S      = ln -s

HEADERS = \
	../include/debug.h \
	../include/splttree.h \
	../include/staktree.h

SOURCES = \
	debug.cpp \
	splttree.cpp \
	staktree.cpp

OBJECTS=$(SOURCES:.cpp=.o)
DEPFILES=$(OBJECTS:.o=.d)

.cpp.o:
	$(CXX) -c $(CXXFLAGS) $(APPEXTRADEFS)-o $@ $<

all:   $(TARGET_LIB_STATIC) $(TARGET_LIB_SHARED)

$(TARGET_LIB_STATIC) : $(OBJECTS)   
	@$(RM) $@
	$(AR) $(AROPTIONS) $@ $(OBJECTS)
	$(RANLIB) $@

$(TARGET_LIB_SHARED): $(OBJECTS)
	$(CXX) -shared -o $@ $(OBJECTS)
	cd $(WXDIR)/lib \
                && $(RM) $(TARGET_LIB_LINK1) $(TARGET_LIB_LINK2) \
                && $(LN_S) $(TARGET_LIB_SHARED) $(TARGET_LIB_LINK1) \
                && $(LN_S) $(TARGET_LIB_SHARED) $(TARGET_LIB_LINK2)

clean:
	rm -f core $(OBJECTS) $(DEPFILES) \
	      $(TARGET_LIB_STATIC) $(TARGET_LIB_SHARED) \
              $(WXDIR)/lib/$(TARGET_LIB_LINK1) \
              $(WXDIR)/lib/$(TARGET_LIB_LINK2) 

-include $(DEPFILES)

Index: staktree.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/src/staktree.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** staktree.cpp	6 Jun 2005 23:06:19 -0000	1.1
--- staktree.cpp	7 Jun 2005 04:17:40 -0000	1.2
***************
*** 27,40 ****
  
  #include "wx/imaglist.h"
! #include "wxlua/staktree.h"
! #include "wxlua/internal.h"
! #include "wxlua/wxlua.h"
  
! #include "wxlua/debugio.h"
! #include "wxlua/dserver.h"
! #include "wxlua/library.h"
  
  #if defined(__WXGTK__) || defined(__WXMAC__) || defined(__WXMOTIF__)
!     #include "../wxLua.xpm"
  #endif
  
--- 27,40 ----
  
  #include "wx/imaglist.h"
! #include "wxluadebug/include/staktree.h"
! #include "wxlua/include/internal.h"
! #include "wxlua/include/wxlua.h"
  
! #include "wxluasocket/include/debugio.h"
! #include "wxluasocket/include/dserver.h"
! #include "wxlua/include/library.h"
  
  #if defined(__WXGTK__) || defined(__WXMAC__) || defined(__WXMOTIF__)
!     #include "../../../art/wxlua.xpm"
  #endif
  

Index: debug.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/src/debug.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** debug.cpp	6 Jun 2005 23:06:19 -0000	1.1
--- debug.cpp	7 Jun 2005 04:17:40 -0000	1.2
***************
*** 23,28 ****
  #endif
  
! #include "wxlua/debug.h"
! #include "wxlua/internal.h"
  
  DEFINE_EVENT_TYPE(wxEVT_DEBUG_CLIENT_CONNECTED)
--- 23,28 ----
  #endif
  
! #include "wxluadebug/include/debug.h"
! #include "wxlua/include/internal.h"
  
  DEFINE_EVENT_TYPE(wxEVT_DEBUG_CLIENT_CONNECTED)