Update of /cvsroot/wxlua/wxLua/modules/build/bakefiles
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv23562/wxLua/modules/build/bakefiles
Modified Files:
common.bkl modules.bkl
Log Message:
Add var LUAMODULEMONO_SRC for the mono build of the Lua module so we don't have
duplicate dummy.cpp files.
Note: it would be nice to use the existing vars and remove the duplicate dummy.cpp files.
Index: common.bkl
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/build/bakefiles/common.bkl,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** common.bkl 10 Jan 2008 17:04:25 -0000 1.17
--- common.bkl 21 Jan 2008 03:09:49 -0000 1.18
***************
*** 97,100 ****
--- 97,141 ----
<set var="LUAMODULE_HDR">$(fileList('luamodule/src/*.h'))</set>
+ <set var="LUAMODULEMONO_SRC">
+ $(LUAMODULE_SRC)
+
+ <!-- don't duplicate the dummy.cpp files - FIXME is there a better way? removeDuplicates with safeSplit?
+ $(WXBINDADV_SRC)
+ $(WXBINDAUI_SRC)
+ $(WXBINDBASE_SRC)
+ $(WXBINDCORE_SRC)
+ $(WXBINDGL_SRC)
+ $(WXBINDHTML_SRC)
+ $(WXBINDMEDIA_SRC)
+ $(WXBINDNET_SRC)
+ $(WXBINDRICHTEXT_SRC)
+ $(WXBINDSTC_SRC)
+ $(WXBINDXML_SRC)
+ $(WXBINDXRC_SRC)
+
+ $(WXLUASOCKET_SRC)
+ $(WXLUADEBUG_SRC)
+ $(WXLUA_SRC)
+ -->
+
+ $(fileList('wxbind/src/*.cpp'))
+
+ wxluasocket/src/wxldserv.cpp
+ wxluasocket/src/wxldtarg.cpp
+ wxluasocket/src/wxlsock.cpp
+ wxluasocket/src/wxluasocket_bind.cpp
+ wxluasocket/src/wxluasocket.cpp
+
+ wxluadebug/src/wxldebug.cpp
+ wxluadebug/src/wxlstack.cpp
+
+ wxlua/src/wxlbind.cpp
+ wxlua/src/wxlcallb.cpp
+ wxlua/src/wxlstate.cpp
+ wxlua/src/wxlua_bind.cpp
+ wxlua/src/wxlua.cpp
+ </set>
+ <set var="LUAMODULEMONO_HDR">$(LUAMODULE_HDR)</set>
+
<!-- ================================================================== -->
<!-- The list of wxLua OPTIONS -->
Index: modules.bkl
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/build/bakefiles/modules.bkl,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -d -r1.51 -r1.52
*** modules.bkl 19 Jan 2008 21:37:10 -0000 1.51
--- modules.bkl 21 Jan 2008 03:09:49 -0000 1.52
***************
*** 345,370 ****
<include>$(WXLUA_BASEDIR)/modules/wxbind/setup</include>
! <headers>$(LUAMODULE_HDR)</headers>
<define>WXMAKINGDLL_LUAMODULE</define>
- <sources>
- $(LUAMODULE_SRC)
- $(WXBINDADV_SRC)
- $(WXBINDAUI_SRC)
- $(WXBINDBASE_SRC)
- $(WXBINDCORE_SRC)
- $(WXBINDGL_SRC)
- $(WXBINDHTML_SRC)
- $(WXBINDMEDIA_SRC)
- $(WXBINDNET_SRC)
- $(WXBINDRICHTEXT_SRC)
- $(WXBINDSTC_SRC)
- $(WXBINDXML_SRC)
- $(WXBINDXRC_SRC)
- $(WXLUASOCKET_SRC)
- $(WXLUADEBUG_SRC)
- $(WXLUA_SRC)
- </sources>
-
<!-- It's important to keep the module name 'wx' to make require("wx") work -->
<dllname>wx</dllname>
--- 345,352 ----
<include>$(WXLUA_BASEDIR)/modules/wxbind/setup</include>
! <headers>$(LUAMODULEMONO_HDR)</headers>
! <sources>$(LUAMODULEMONO_SRC)</sources>
<define>WXMAKINGDLL_LUAMODULE</define>
<!-- It's important to keep the module name 'wx' to make require("wx") work -->
<dllname>wx</dllname>
|
