Update of /cvsroot/wxlua/wxLua/modules/build/msw
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv8228/wxLua/modules/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/modules/build/msw/makefile.vc,v
retrieving revision 1.80
retrieving revision 1.81
diff -C2 -d -r1.80 -r1.81
*** makefile.vc 17 Jan 2008 00:37:39 -0000 1.80
--- makefile.vc 19 Jan 2008 21:37:13 -0000 1.81
***************
*** 115,118 ****
--- 115,121 ----
USE_LUAMODULE = 1
+ # Build a monolithic Lua module ? [0,1]
+ MONOLITHIC_LUAMODULE = 0
+
***************
*** 123,128 ****
[...2660 lines suppressed...]
+ $(CXX) /c /nologo /TP /Fo$@ $(MOD_LUAMODULE_MONO_CXXFLAGS) ..\..\wxbind\src\dummy.cpp
+
+ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_dummy.obj: ..\..\wxbind\src\dummy.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(MOD_LUAMODULE_MONO_CXXFLAGS) ..\..\wxbind\src\dummy.cpp
+
+ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_dummy.obj: ..\..\wxbind\src\dummy.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(MOD_LUAMODULE_MONO_CXXFLAGS) ..\..\wxbind\src\dummy.cpp
+
+ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_dummy.obj: ..\..\wxbind\src\dummy.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(MOD_LUAMODULE_MONO_CXXFLAGS) ..\..\wxbind\src\dummy.cpp
+
+ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_dummy.obj: ..\..\wxluasocket\src\dummy.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(MOD_LUAMODULE_MONO_CXXFLAGS) ..\..\wxluasocket\src\dummy.cpp
+
+ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_dummy.obj: ..\..\wxluadebug\src\dummy.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(MOD_LUAMODULE_MONO_CXXFLAGS) ..\..\wxluadebug\src\dummy.cpp
+
+ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_dummy.obj: ..\..\wxlua\src\dummy.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(MOD_LUAMODULE_MONO_CXXFLAGS) ..\..\wxlua\src\dummy.cpp
+
Index: makefile.bcc
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.bcc,v
retrieving revision 1.81
retrieving revision 1.82
diff -C2 -d -r1.81 -r1.82
*** makefile.bcc 17 Jan 2008 00:37:38 -0000 1.81
--- makefile.bcc 19 Jan 2008 21:37:11 -0000 1.82
***************
*** 180,183 ****
--- 180,188 ----
!endif
+ # Build a monolithic Lua module ? [0,1]
+ !ifndef MONOLITHIC_LUAMODULE
+ MONOLITHIC_LUAMODULE = 0
+ !endif
+
[...2309 lines suppressed...]
+ $(CXX) -q -c -P -o$@ $(MOD_LUAMODULE_MONO_CXXFLAGS) ..\..\wxbind\src\dummy.cpp
+
+ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_dummy.obj: ..\..\wxbind\src\dummy.cpp
+ $(CXX) -q -c -P -o$@ $(MOD_LUAMODULE_MONO_CXXFLAGS) ..\..\wxbind\src\dummy.cpp
+
+ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_dummy.obj: ..\..\wxbind\src\dummy.cpp
+ $(CXX) -q -c -P -o$@ $(MOD_LUAMODULE_MONO_CXXFLAGS) ..\..\wxbind\src\dummy.cpp
+
+ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_dummy.obj: ..\..\wxbind\src\dummy.cpp
+ $(CXX) -q -c -P -o$@ $(MOD_LUAMODULE_MONO_CXXFLAGS) ..\..\wxbind\src\dummy.cpp
+
+ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_dummy.obj: ..\..\wxluasocket\src\dummy.cpp
+ $(CXX) -q -c -P -o$@ $(MOD_LUAMODULE_MONO_CXXFLAGS) ..\..\wxluasocket\src\dummy.cpp
+
+ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_dummy.obj: ..\..\wxluadebug\src\dummy.cpp
+ $(CXX) -q -c -P -o$@ $(MOD_LUAMODULE_MONO_CXXFLAGS) ..\..\wxluadebug\src\dummy.cpp
+
+ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_dummy.obj: ..\..\wxlua\src\dummy.cpp
+ $(CXX) -q -c -P -o$@ $(MOD_LUAMODULE_MONO_CXXFLAGS) ..\..\wxlua\src\dummy.cpp
+
Index: makefile.wat
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.wat,v
retrieving revision 1.80
retrieving revision 1.81
diff -C2 -d -r1.80 -r1.81
*** makefile.wat 17 Jan 2008 00:37:41 -0000 1.80
--- makefile.wat 19 Jan 2008 21:37:13 -0000 1.81
***************
*** 115,118 ****
--- 115,121 ----
USE_LUAMODULE = 1
+ # Build a monolithic Lua module ? [0,1]
+ MONOLITHIC_LUAMODULE = 0
+
***************
*** 152,156 ****
[...2910 lines suppressed...]
+ $(CXX) -bt=nt -zq -fo=$^@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $<
+
+ watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_dummy.obj : .AUTODEPEND ..\..\wxbind\src\dummy.cpp
+ $(CXX) -bt=nt -zq -fo=$^@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $<
+
+ watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_dummy.obj : .AUTODEPEND ..\..\wxbind\src\dummy.cpp
+ $(CXX) -bt=nt -zq -fo=$^@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $<
+
+ watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_dummy.obj : .AUTODEPEND ..\..\wxbind\src\dummy.cpp
+ $(CXX) -bt=nt -zq -fo=$^@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $<
+
+ watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_dummy.obj : .AUTODEPEND ..\..\wxluasocket\src\dummy.cpp
+ $(CXX) -bt=nt -zq -fo=$^@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $<
+
+ watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_dummy.obj : .AUTODEPEND ..\..\wxluadebug\src\dummy.cpp
+ $(CXX) -bt=nt -zq -fo=$^@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $<
+
+ watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_dummy.obj : .AUTODEPEND ..\..\wxlua\src\dummy.cpp
+ $(CXX) -bt=nt -zq -fo=$^@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $<
+
Index: makefile.gcc
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.gcc,v
retrieving revision 1.80
retrieving revision 1.81
diff -C2 -d -r1.80 -r1.81
*** makefile.gcc 17 Jan 2008 00:37:39 -0000 1.80
--- makefile.gcc 19 Jan 2008 21:37:13 -0000 1.81
***************
*** 109,112 ****
--- 109,115 ----
USE_LUAMODULE := 1
+ # Build a monolithic Lua module ? [0,1]
+ MONOLITHIC_LUAMODULE := 0
+
***************
*** 118,122 ****
[...2472 lines suppressed...]
+ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_dummy.o: ../../wxbind/src/dummy.cpp
+ $(CXX) -c -o $@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $(CPPDEPS) $<
+
+ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_dummy.o: ../../wxbind/src/dummy.cpp
+ $(CXX) -c -o $@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $(CPPDEPS) $<
+
+ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_dummy.o: ../../wxbind/src/dummy.cpp
+ $(CXX) -c -o $@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $(CPPDEPS) $<
+
+ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_dummy.o: ../../wxluasocket/src/dummy.cpp
+ $(CXX) -c -o $@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $(CPPDEPS) $<
+
+ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_dummy.o: ../../wxluadebug/src/dummy.cpp
+ $(CXX) -c -o $@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $(CPPDEPS) $<
+
+ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_dummy.o: ../../wxlua/src/dummy.cpp
+ $(CXX) -c -o $@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $(CPPDEPS) $<
+
.PHONY: all clean
|
