wxlua-commit

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

Update of /cvsroot/wxlua/wxLua/build/msw
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv27490/build/msw

Modified Files:
	makefile.bcc makefile.gcc makefile.vc makefile.wat 
Log Message:
rebaked after THREADING option addition

Index: makefile.vc
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.vc,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** makefile.vc	3 Feb 2007 19:47:41 -0000	1.42
--- makefile.vc	13 Feb 2007 18:43:11 -0000	1.43
***************
*** 113,121 ****
  	WX_MONOLITHIC="$(WX_MONOLITHIC)" USE_APPS="$(USE_APPS)" \
  	USE_SYSTEM_LUA="$(USE_SYSTEM_LUA)" LUA_DIR="$(LUA_DIR)" \
! 	RUNTIME_LIBS="$(RUNTIME_LIBS)" USE_WXBINDSTC="$(USE_WXBINDSTC)" \
! 	USE_WXLUADEBUG="$(USE_WXLUADEBUG)" USE_WXLUASOCKET="$(USE_WXLUASOCKET)" \
! 	USE_LUAMODULE="$(USE_LUAMODULE)" USE_WXLUAAPP="$(USE_WXLUAAPP)" \
! 	USE_WXLUACANAPP="$(USE_WXLUACANAPP)" WXSTEDIT_DIR="$(WXSTEDIT_DIR)" \
! 	USE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" \
  	USE_WXLUAFREEZEAPP="$(USE_WXLUAFREEZEAPP)"
  
--- 113,121 ----
  	WX_MONOLITHIC="$(WX_MONOLITHIC)" USE_APPS="$(USE_APPS)" \
  	USE_SYSTEM_LUA="$(USE_SYSTEM_LUA)" LUA_DIR="$(LUA_DIR)" \
! 	RUNTIME_LIBS="$(RUNTIME_LIBS)" THREADING="$(THREADING)" \
! 	USE_WXBINDSTC="$(USE_WXBINDSTC)" USE_WXLUADEBUG="$(USE_WXLUADEBUG)" \
! 	USE_WXLUASOCKET="$(USE_WXLUASOCKET)" USE_LUAMODULE="$(USE_LUAMODULE)" \
! 	USE_WXLUAAPP="$(USE_WXLUAAPP)" USE_WXLUACANAPP="$(USE_WXLUACANAPP)" \
! 	WXSTEDIT_DIR="$(WXSTEDIT_DIR)" USE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" \
  	USE_WXLUAFREEZEAPP="$(USE_WXLUAFREEZEAPP)"
  

Index: makefile.bcc
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.bcc,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** makefile.bcc	3 Feb 2007 19:12:22 -0000	1.38
--- makefile.bcc	13 Feb 2007 18:43:11 -0000	1.39
***************
*** 108,111 ****
--- 108,118 ----
  !endif
  
+ # This is an advanced option. Handle with care.
+ # The thread model to use: use 'multi' default to allow
+ # multi-threading. [multi,single]
+ !ifndef THREADING
+ THREADING = multi
+ !endif
+ 
  # Does the wxLua bindings for STC need to be compiled ? [0,1]
  !ifndef USE_WXBINDSTC
***************
*** 168,172 ****
  	-DUSE_APPS="$(USE_APPS)" -DUSE_SYSTEM_LUA="$(USE_SYSTEM_LUA)" \
  	-DLUA_DIR="$(LUA_DIR)" -DRUNTIME_LIBS="$(RUNTIME_LIBS)" \
! 	-DUSE_WXBINDSTC="$(USE_WXBINDSTC)" -DUSE_WXLUADEBUG="$(USE_WXLUADEBUG)" \
  	-DUSE_WXLUASOCKET="$(USE_WXLUASOCKET)" -DUSE_LUAMODULE="$(USE_LUAMODULE)" \
  	-DUSE_WXLUAAPP="$(USE_WXLUAAPP)" -DUSE_WXLUACANAPP="$(USE_WXLUACANAPP)" \
--- 175,180 ----
  	-DUSE_APPS="$(USE_APPS)" -DUSE_SYSTEM_LUA="$(USE_SYSTEM_LUA)" \
  	-DLUA_DIR="$(LUA_DIR)" -DRUNTIME_LIBS="$(RUNTIME_LIBS)" \
! 	-DTHREADING="$(THREADING)" -DUSE_WXBINDSTC="$(USE_WXBINDSTC)" \
! 	-DUSE_WXLUADEBUG="$(USE_WXLUADEBUG)" \
  	-DUSE_WXLUASOCKET="$(USE_WXLUASOCKET)" -DUSE_LUAMODULE="$(USE_LUAMODULE)" \
  	-DUSE_WXLUAAPP="$(USE_WXLUAAPP)" -DUSE_WXLUACANAPP="$(USE_WXLUACANAPP)" \

Index: makefile.wat
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.wat,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** makefile.wat	3 Feb 2007 19:47:41 -0000	1.41
--- makefile.wat	13 Feb 2007 18:43:11 -0000	1.42
***************
*** 165,173 ****
  	WX_MONOLITHIC="$(WX_MONOLITHIC)" USE_APPS="$(USE_APPS)" &
  	USE_SYSTEM_LUA="$(USE_SYSTEM_LUA)" LUA_DIR="$(LUA_DIR)" &
! 	RUNTIME_LIBS="$(RUNTIME_LIBS)" USE_WXBINDSTC="$(USE_WXBINDSTC)" &
! 	USE_WXLUADEBUG="$(USE_WXLUADEBUG)" USE_WXLUASOCKET="$(USE_WXLUASOCKET)" &
! 	USE_LUAMODULE="$(USE_LUAMODULE)" USE_WXLUAAPP="$(USE_WXLUAAPP)" &
! 	USE_WXLUACANAPP="$(USE_WXLUACANAPP)" WXSTEDIT_DIR="$(WXSTEDIT_DIR)" &
! 	USE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" &
  	USE_WXLUAFREEZEAPP="$(USE_WXLUAFREEZEAPP)"
  
--- 165,173 ----
  	WX_MONOLITHIC="$(WX_MONOLITHIC)" USE_APPS="$(USE_APPS)" &
  	USE_SYSTEM_LUA="$(USE_SYSTEM_LUA)" LUA_DIR="$(LUA_DIR)" &
! 	RUNTIME_LIBS="$(RUNTIME_LIBS)" THREADING="$(THREADING)" &
! 	USE_WXBINDSTC="$(USE_WXBINDSTC)" USE_WXLUADEBUG="$(USE_WXLUADEBUG)" &
! 	USE_WXLUASOCKET="$(USE_WXLUASOCKET)" USE_LUAMODULE="$(USE_LUAMODULE)" &
! 	USE_WXLUAAPP="$(USE_WXLUAAPP)" USE_WXLUACANAPP="$(USE_WXLUACANAPP)" &
! 	WXSTEDIT_DIR="$(WXSTEDIT_DIR)" USE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" &
  	USE_WXLUAFREEZEAPP="$(USE_WXLUAFREEZEAPP)"
  

Index: makefile.gcc
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.gcc,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** makefile.gcc	3 Feb 2007 19:47:41 -0000	1.40
--- makefile.gcc	13 Feb 2007 18:43:11 -0000	1.41
***************
*** 12,61 ****
  
  # C compiler 
! CC = gcc
  
  # C++ compiler 
! CXX = g++
  
  # Standard flags for CC 
! CFLAGS = 
  
  # Standard flags for C++ 
! CXXFLAGS = 
  
  # Standard preprocessor flags (common for CC and CXX) 
! CPPFLAGS = 
  
  # Standard linker flags 
! LDFLAGS = 
  
  # Builds in debug mode [debug,release]
! BUILD = debug
  
  # Builds in Unicode mode [0,1]
! UNICODE = 0
  
  # Builds in shared mode [0,1]
! SHARED = 0
  
  # The directory where wxWidgets library is installed 
! WX_DIR = $(WXWIN)
  
  # Use DLL build of wx library to use? [0,1]
! WX_SHARED = 0
  
  # Version of the wx library to build against. 
! WX_VERSION = 28
  
  # Use monolithic build of wxWidgets? [0,1]
! WX_MONOLITHIC = 0
  
  # Should the wxLua applications be compiled ? [0,1]
! USE_APPS = 1
  
  # Should wxLua use the system-wide Lua library ? [0,1]
! USE_SYSTEM_LUA = 0
  
  # The path to the Lua library 
! LUA_DIR = ..\..\..\modules\lua
  
  # This is an advanced option. Handle with care.
--- 12,61 ----
  
  # C compiler 
! CC := gcc
  
  # C++ compiler 
! CXX := g++
  
  # Standard flags for CC 
! CFLAGS := 
  
  # Standard flags for C++ 
! CXXFLAGS := 
  
  # Standard preprocessor flags (common for CC and CXX) 
! CPPFLAGS := 
  
  # Standard linker flags 
! LDFLAGS := 
  
  # Builds in debug mode [debug,release]
! BUILD := debug
  
  # Builds in Unicode mode [0,1]
! UNICODE := 0
  
  # Builds in shared mode [0,1]
! SHARED := 0
  
  # The directory where wxWidgets library is installed 
! WX_DIR := $(WXWIN)
  
  # Use DLL build of wx library to use? [0,1]
! WX_SHARED := 0
  
  # Version of the wx library to build against. 
! WX_VERSION := 28
  
  # Use monolithic build of wxWidgets? [0,1]
! WX_MONOLITHIC := 0
  
  # Should the wxLua applications be compiled ? [0,1]
! USE_APPS := 1
  
  # Should wxLua use the system-wide Lua library ? [0,1]
! USE_SYSTEM_LUA := 0
  
  # The path to the Lua library 
! LUA_DIR := ..\..\..\modules\lua
  
  # This is an advanced option. Handle with care.
***************
*** 63,94 ****
  # static if SHARED=0, but it is highly recommended to not do
  # it if SHARED=1 unless you know what you are doing. [dynamic,static]
! RUNTIME_LIBS = dynamic
  
  # Does the wxLua bindings for STC need to be compiled ? [0,1]
! USE_WXBINDSTC = 1
  
  # Does the wxLua debug support need to be compiled ? [0,1]
! USE_WXLUADEBUG = 1
  
  # Does the wxLua socket support need to be compiled ? [0,1]
! USE_WXLUASOCKET = 1
  
  # Compile the lua module ? [0,1]
! USE_LUAMODULE = 1
  
  # Compile the wxLua app ? [0,1]
! USE_WXLUAAPP = 1
  
  # Compile the wxLuaCan app ? [0,1]
! USE_WXLUACANAPP = 1
  
  # The path to the wxStEdit component (meaningful only when USE_WXLUAEDITAPP==1) 
! WXSTEDIT_DIR = $(WXSTEDIT)
  
  # Compile the wxLuaEditor app ? [0,1]
! USE_WXLUAEDITAPP = 0
  
  # Compile the wxLuaFreeze app ? [0,1]
! USE_WXLUAFREEZEAPP = 1
  
  
--- 63,94 ----
  # static if SHARED=0, but it is highly recommended to not do
  # it if SHARED=1 unless you know what you are doing. [dynamic,static]
! RUNTIME_LIBS := dynamic
  
  # Does the wxLua bindings for STC need to be compiled ? [0,1]
! USE_WXBINDSTC := 1
  
  # Does the wxLua debug support need to be compiled ? [0,1]
! USE_WXLUADEBUG := 1
  
  # Does the wxLua socket support need to be compiled ? [0,1]
! USE_WXLUASOCKET := 1
  
  # Compile the lua module ? [0,1]
! USE_LUAMODULE := 1
  
  # Compile the wxLua app ? [0,1]
! USE_WXLUAAPP := 1
  
  # Compile the wxLuaCan app ? [0,1]
! USE_WXLUACANAPP := 1
  
  # The path to the wxStEdit component (meaningful only when USE_WXLUAEDITAPP==1) 
! WXSTEDIT_DIR := $(WXSTEDIT)
  
  # Compile the wxLuaEditor app ? [0,1]
! USE_WXLUAEDITAPP := 0
  
  # Compile the wxLuaFreeze app ? [0,1]
! USE_WXLUAFREEZEAPP := 1
  
  
***************
*** 106,114 ****
  	WX_MONOLITHIC="$(WX_MONOLITHIC)" USE_APPS="$(USE_APPS)" \
  	USE_SYSTEM_LUA="$(USE_SYSTEM_LUA)" LUA_DIR="$(LUA_DIR)" \
! 	RUNTIME_LIBS="$(RUNTIME_LIBS)" USE_WXBINDSTC="$(USE_WXBINDSTC)" \
! 	USE_WXLUADEBUG="$(USE_WXLUADEBUG)" USE_WXLUASOCKET="$(USE_WXLUASOCKET)" \
! 	USE_LUAMODULE="$(USE_LUAMODULE)" USE_WXLUAAPP="$(USE_WXLUAAPP)" \
! 	USE_WXLUACANAPP="$(USE_WXLUACANAPP)" WXSTEDIT_DIR="$(WXSTEDIT_DIR)" \
! 	USE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" \
  	USE_WXLUAFREEZEAPP="$(USE_WXLUAFREEZEAPP)"
  
--- 106,114 ----
  	WX_MONOLITHIC="$(WX_MONOLITHIC)" USE_APPS="$(USE_APPS)" \
  	USE_SYSTEM_LUA="$(USE_SYSTEM_LUA)" LUA_DIR="$(LUA_DIR)" \
! 	RUNTIME_LIBS="$(RUNTIME_LIBS)" THREADING="$(THREADING)" \
! 	USE_WXBINDSTC="$(USE_WXBINDSTC)" USE_WXLUADEBUG="$(USE_WXLUADEBUG)" \
! 	USE_WXLUASOCKET="$(USE_WXLUASOCKET)" USE_LUAMODULE="$(USE_LUAMODULE)" \
! 	USE_WXLUAAPP="$(USE_WXLUAAPP)" USE_WXLUACANAPP="$(USE_WXLUACANAPP)" \
! 	WXSTEDIT_DIR="$(WXSTEDIT_DIR)" USE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" \
  	USE_WXLUAFREEZEAPP="$(USE_WXLUAFREEZEAPP)"