[Wxlua-commit] wxLua/modules/wxlua/src Makefile,NONE,1.1 internal.cpp,1.1,1.2 interp.cpp,1.1,1.2 library.cpp,1.1,1.2

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

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

Modified Files:
	internal.cpp interp.cpp library.cpp 
Added Files:
	Makefile 
Log Message:
still moving files to module and app directory


Index: interp.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/interp.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** interp.cpp	6 Jun 2005 23:06:19 -0000	1.1
--- interp.cpp	7 Jun 2005 04:17:39 -0000	1.2
***************
*** 27,32 ****
  #endif // WX_PRECOMP
  
! #include "wxlua/interp.h"
! #include "wxlua/internal.h"
  
  extern int s_wxLuaInterpreter;
--- 27,32 ----
  #endif // WX_PRECOMP
  
! #include "wxlua/include/interp.h"
! #include "wxlua/include/internal.h"
  
  extern int s_wxLuaInterpreter;
***************
*** 39,49 ****
  extern "C"
  {
!     #include "lua.h"
!     #include "lauxlib.h"
!     #include "lualib.h"
  
  #ifdef WXLUA_THREAD_INTERCEPTION
      // See lua/src/lstate.c for added hook into luaE_newthread()
!     #include "luathread.h"
  #endif //WXLUA_THREAD_INTERCEPTION
  }
--- 39,49 ----
  extern "C"
  {
!     #include "lua/include/lua.h"
!     #include "lua/include/lauxlib.h"
!     #include "lua/include/lualib.h"
  
  #ifdef WXLUA_THREAD_INTERCEPTION
      // See lua/src/lstate.c for added hook into luaE_newthread()
!     #include "lua/include/luathread.h"
  #endif //WXLUA_THREAD_INTERCEPTION
  }

Index: internal.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/internal.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** internal.cpp	6 Jun 2005 23:06:19 -0000	1.1
--- internal.cpp	7 Jun 2005 04:17:39 -0000	1.2
***************
*** 34,40 ****
  #include "wx/datetime.h"
  
! #include "../import/luasetup.h.in" // get the base library setup parameters
! #include "wxlua/internal.h"
! #include "wxlua/callback.h"
  
  class wxStyledTextCtrlDocument;   // for void* wxStyledTextCtrl::GetDocPointer()
--- 34,40 ----
  #include "wx/datetime.h"
  
! #include "../../../bindings/wxwidgets/luasetup.h.in" // get the base library setup parameters
! #include "wxlua/include/internal.h"
! #include "wxlua/include/callback.h"
  
  class wxStyledTextCtrlDocument;   // for void* wxStyledTextCtrl::GetDocPointer()
***************
*** 52,61 ****
  
  #if defined(__WXGTK__) || defined(__WXMAC__) || defined(__WXMOTIF__) 
!     #include "../wxLua.xpm"
  #endif
  
! #include "wxlua/interp.h"
! #include "wxlua/htmlwin.h"
! #include "wxlua/library.h"
  
  static int LUACALL LuaTableErrorHandler(lua_State *L)
--- 52,61 ----
  
  #if defined(__WXGTK__) || defined(__WXMAC__) || defined(__WXMOTIF__) 
!     #include "../../../art/wxlua.xpm"
  #endif
  
! #include "wxlua/include/interp.h"
! //#include "wxlua/include/htmlwin.h"
! //#include "wxlua/include/library.h"
  
  static int LUACALL LuaTableErrorHandler(lua_State *L)

--- 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)_wxlua-$(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/defs.h \
	../include/internal.h \
	../include/interp.h \
	../include/library.h \
	../include/wxlua.h

SOURCES = \
	internal.cpp \
	interp.cpp \
	library.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: library.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/library.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** library.cpp	6 Jun 2005 23:06:19 -0000	1.1
--- library.cpp	7 Jun 2005 04:17:39 -0000	1.2
***************
*** 24,30 ****
  #endif
  
! #include "wxlua/library.h"
! #include "wxlua/internal.h"
! #include "wxlua/dserver.h"
  
  // ----------------------------------------------------------------------------
--- 24,30 ----
  #endif
  
! #include "wxlua/include/library.h"
! #include "wxlua/include/internal.h"
! //#include "wxlua/include/dserver.h"
  
  // ----------------------------------------------------------------------------