Update of /cvsroot/wxlua/wxLua/build/msw
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv8228/wxLua/build/msw
Modified Files:
makefile.bcc makefile.gcc makefile.vc makefile.wat
Log Message:
Add MONOLITHIC_LUAMODULE to build a single wx.so/dll that contains everything.
configure has been updated to add the option --enable-monolithic-luamodule
Move VARS_DONT_ELIMINATE=THREADING to wxlua.bkl from modules/../options.bkl
Index: makefile.vc
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.vc,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -d -r1.52 -r1.53
*** makefile.vc 18 Jan 2008 03:43:00 -0000 1.52
--- makefile.vc 19 Jan 2008 21:37:09 -0000 1.53
***************
*** 124,127 ****
--- 124,130 ----
USE_LUAMODULE = 1
+ # Build a monolithic Lua module ? [0,1]
+ MONOLITHIC_LUAMODULE = 0
+
# Compile the wxLua app ? [0,1]
USE_WXLUAAPP = 1
***************
*** 163,166 ****
--- 166,170 ----
USE_WXBINDXRC="$(USE_WXBINDXRC)" USE_WXLUADEBUG="$(USE_WXLUADEBUG)" \
USE_WXLUASOCKET="$(USE_WXLUASOCKET)" USE_LUAMODULE="$(USE_LUAMODULE)" \
+ MONOLITHIC_LUAMODULE="$(MONOLITHIC_LUAMODULE)" \
USE_WXLUAAPP="$(USE_WXLUAAPP)" USE_WXLUACANAPP="$(USE_WXLUACANAPP)" \
WXSTEDIT_DIR="$(WXSTEDIT_DIR)" USE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" \
Index: makefile.bcc
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.bcc,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** makefile.bcc 15 Jan 2008 18:37:27 -0000 1.45
--- makefile.bcc 19 Jan 2008 21:37:09 -0000 1.46
***************
*** 195,198 ****
--- 195,203 ----
!endif
+ # Build a monolithic Lua module ? [0,1]
+ !ifndef MONOLITHIC_LUAMODULE
+ MONOLITHIC_LUAMODULE = 0
+ !endif
+
# Compile the wxLua app ? [0,1]
!ifndef USE_WXLUAAPP
***************
*** 244,247 ****
--- 249,253 ----
-DUSE_WXBINDXRC="$(USE_WXBINDXRC)" -DUSE_WXLUADEBUG="$(USE_WXLUADEBUG)" \
-DUSE_WXLUASOCKET="$(USE_WXLUASOCKET)" -DUSE_LUAMODULE="$(USE_LUAMODULE)" \
+ -DMONOLITHIC_LUAMODULE="$(MONOLITHIC_LUAMODULE)" \
-DUSE_WXLUAAPP="$(USE_WXLUAAPP)" -DUSE_WXLUACANAPP="$(USE_WXLUACANAPP)" \
-DWXSTEDIT_DIR="$(WXSTEDIT_DIR)" -DUSE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" \
Index: makefile.wat
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.wat,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -d -r1.51 -r1.52
*** makefile.wat 18 Jan 2008 03:43:00 -0000 1.51
--- makefile.wat 19 Jan 2008 21:37:09 -0000 1.52
***************
*** 124,127 ****
--- 124,130 ----
USE_LUAMODULE = 1
+ # Build a monolithic Lua module ? [0,1]
+ MONOLITHIC_LUAMODULE = 0
+
# Compile the wxLua app ? [0,1]
USE_WXLUAAPP = 1
***************
*** 215,218 ****
--- 218,222 ----
USE_WXBINDXRC="$(USE_WXBINDXRC)" USE_WXLUADEBUG="$(USE_WXLUADEBUG)" &
USE_WXLUASOCKET="$(USE_WXLUASOCKET)" USE_LUAMODULE="$(USE_LUAMODULE)" &
+ MONOLITHIC_LUAMODULE="$(MONOLITHIC_LUAMODULE)" &
USE_WXLUAAPP="$(USE_WXLUAAPP)" USE_WXLUACANAPP="$(USE_WXLUACANAPP)" &
WXSTEDIT_DIR="$(WXSTEDIT_DIR)" USE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" &
Index: makefile.gcc
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.gcc,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** makefile.gcc 18 Jan 2008 03:42:59 -0000 1.49
--- makefile.gcc 19 Jan 2008 21:37:09 -0000 1.50
***************
*** 118,121 ****
--- 118,124 ----
USE_LUAMODULE := 1
+ # Build a monolithic Lua module ? [0,1]
+ MONOLITHIC_LUAMODULE := 0
+
# Compile the wxLua app ? [0,1]
USE_WXLUAAPP := 1
***************
*** 158,161 ****
--- 161,165 ----
USE_WXBINDXRC="$(USE_WXBINDXRC)" USE_WXLUADEBUG="$(USE_WXLUADEBUG)" \
USE_WXLUASOCKET="$(USE_WXLUASOCKET)" USE_LUAMODULE="$(USE_LUAMODULE)" \
+ MONOLITHIC_LUAMODULE="$(MONOLITHIC_LUAMODULE)" \
USE_WXLUAAPP="$(USE_WXLUAAPP)" USE_WXLUACANAPP="$(USE_WXLUACANAPP)" \
WXSTEDIT_DIR="$(WXSTEDIT_DIR)" USE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" \
|
