Update of /cvsroot/wxlua/wxLua/build/msw
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv478/wxLua/build/msw
Modified Files:
makefile.bcc makefile.gcc makefile.vc makefile.wat
Log Message:
Add wxAUI library and rebuild all build files
Cleanup Makefiles using wx-config and include common bits to simplify them
Index: makefile.vc
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.vc,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** makefile.vc 24 Apr 2007 14:39:53 -0000 1.46
--- makefile.vc 4 Jul 2007 05:39:15 -0000 1.47
***************
*** 71,75 ****
RUNTIME_LIBS = dynamic
! # Does the wxLua bindings for STC need to be compiled ? [0,1]
USE_WXBINDSTC = 1
--- 71,75 ----
RUNTIME_LIBS = dynamic
! # Does the wxLua bindings for wxSTC need to be compiled ? [0,1]
USE_WXBINDSTC = 1
***************
*** 113,120 ****
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)"
--- 113,121 ----
USE_SYSTEM_LUA="$(USE_SYSTEM_LUA)" LUA_DIR="$(LUA_DIR)" \
RUNTIME_LIBS="$(RUNTIME_LIBS)" THREADING="$(THREADING)" \
! USE_WXBINDAUI="$(USE_WXBINDAUI)" 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.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** makefile.bcc 24 Apr 2007 13:48:47 -0000 1.41
--- makefile.bcc 4 Jul 2007 05:39:15 -0000 1.42
***************
*** 115,119 ****
!endif
! # Does the wxLua bindings for STC need to be compiled ? [0,1]
!ifndef USE_WXBINDSTC
USE_WXBINDSTC = 1
--- 115,124 ----
!endif
! # Does the wxLua bindings for wxAUI need to be compiled ? [0,1]
! !ifndef USE_WXBINDAUI
! USE_WXBINDAUI = 1
! !endif
!
! # Does the wxLua bindings for wxSTC need to be compiled ? [0,1]
!ifndef USE_WXBINDSTC
USE_WXBINDSTC = 1
***************
*** 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)" \
--- 180,185 ----
-DUSE_APPS="$(USE_APPS)" -DUSE_SYSTEM_LUA="$(USE_SYSTEM_LUA)" \
-DLUA_DIR="$(LUA_DIR)" -DRUNTIME_LIBS="$(RUNTIME_LIBS)" \
! -DTHREADING="$(THREADING)" -DUSE_WXBINDAUI="$(USE_WXBINDAUI)" \
! -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.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** makefile.wat 24 Apr 2007 14:39:54 -0000 1.45
--- makefile.wat 4 Jul 2007 05:39:15 -0000 1.46
***************
*** 71,75 ****
RUNTIME_LIBS = dynamic
! # Does the wxLua bindings for STC need to be compiled ? [0,1]
USE_WXBINDSTC = 1
--- 71,75 ----
RUNTIME_LIBS = dynamic
! # Does the wxLua bindings for wxSTC need to be compiled ? [0,1]
USE_WXBINDSTC = 1
***************
*** 165,172 ****
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)"
--- 165,173 ----
USE_SYSTEM_LUA="$(USE_SYSTEM_LUA)" LUA_DIR="$(LUA_DIR)" &
RUNTIME_LIBS="$(RUNTIME_LIBS)" THREADING="$(THREADING)" &
! USE_WXBINDAUI="$(USE_WXBINDAUI)" 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.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** makefile.gcc 24 Apr 2007 13:48:47 -0000 1.43
--- makefile.gcc 4 Jul 2007 05:39:15 -0000 1.44
***************
*** 65,69 ****
RUNTIME_LIBS := dynamic
! # Does the wxLua bindings for STC need to be compiled ? [0,1]
USE_WXBINDSTC := 1
--- 65,69 ----
RUNTIME_LIBS := dynamic
! # Does the wxLua bindings for wxSTC need to be compiled ? [0,1]
USE_WXBINDSTC := 1
***************
*** 107,114 ****
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)"
--- 107,115 ----
USE_SYSTEM_LUA="$(USE_SYSTEM_LUA)" LUA_DIR="$(LUA_DIR)" \
RUNTIME_LIBS="$(RUNTIME_LIBS)" THREADING="$(THREADING)" \
! USE_WXBINDAUI="$(USE_WXBINDAUI)" 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)"
|
