Menu
▾
▴
[Wxlua-commit] wxLua/build/msw makefile.bcc, 1.44, 1.45 makefile.gcc, 1.47, 1.48 makefile.vc, 1.50, 1.51 makefile.wat, 1.49, 1.50
|
From: John L. <jr...@us...> - 2008-01-15 18:37:31
|
Update of /cvsroot/wxlua/wxLua/build/msw In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv26453/wxLua/build/msw Modified Files: makefile.bcc makefile.gcc makefile.vc makefile.wat Log Message: Updated bakefiles to separate LUA_DIR to LUA_INCLUDE_DIR and LUA_LIB_DIR so a system Lua's include path can be specified exactly. Used bakefile-0.2.3 Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.vc,v retrieving revision 1.50 retrieving revision 1.51 diff -C2 -d -r1.50 -r1.51 *** makefile.vc 15 Jan 2008 00:08:18 -0000 1.50 --- makefile.vc 15 Jan 2008 18:37:27 -0000 1.51 *************** *** 62,67 **** USE_SYSTEM_LUA = 0 ! # The path to the Lua library ! LUA_DIR = ..\..\..\modules\lua # This is an advanced option. Handle with care. --- 62,70 ---- USE_SYSTEM_LUA = 0 ! # The path to the Lua library includes ! LUA_INCLUDE_DIR = ..\..\..\modules\lua\include ! ! # The path to the Lua library libs ! LUA_LIB_DIR = ..\..\..\modules\lua\lib # This is an advanced option. Handle with care. *************** *** 144,153 **** WX_VERSION="$(WX_VERSION)" WX_MONOLITHIC="$(WX_MONOLITHIC)" \ WX_DIR="$(WX_DIR)" USE_APPS="$(USE_APPS)" \ ! USE_SYSTEM_LUA="$(USE_SYSTEM_LUA)" LUA_DIR="$(LUA_DIR)" \ ! RUNTIME_LIBS="$(RUNTIME_LIBS)" THREADING="$(THREADING)" \ ! USE_WXBINDADV="$(USE_WXBINDADV)" USE_WXBINDAUI="$(USE_WXBINDAUI)" \ ! USE_WXBINDBASE="$(USE_WXBINDBASE)" USE_WXBINDCORE="$(USE_WXBINDCORE)" \ ! USE_WXBINDGL="$(USE_WXBINDGL)" USE_WXBINDHTML="$(USE_WXBINDHTML)" \ ! USE_WXBINDMEDIA="$(USE_WXBINDMEDIA)" USE_WXBINDNET="$(USE_WXBINDNET)" \ USE_WXBINDRICHTEXT="$(USE_WXBINDRICHTEXT)" \ USE_WXBINDSTC="$(USE_WXBINDSTC)" USE_WXBINDXML="$(USE_WXBINDXML)" \ --- 147,157 ---- WX_VERSION="$(WX_VERSION)" WX_MONOLITHIC="$(WX_MONOLITHIC)" \ WX_DIR="$(WX_DIR)" USE_APPS="$(USE_APPS)" \ ! USE_SYSTEM_LUA="$(USE_SYSTEM_LUA)" LUA_INCLUDE_DIR="$(LUA_INCLUDE_DIR)" \ ! LUA_LIB_DIR="$(LUA_LIB_DIR)" RUNTIME_LIBS="$(RUNTIME_LIBS)" \ ! THREADING="$(THREADING)" USE_WXBINDADV="$(USE_WXBINDADV)" \ ! USE_WXBINDAUI="$(USE_WXBINDAUI)" USE_WXBINDBASE="$(USE_WXBINDBASE)" \ ! USE_WXBINDCORE="$(USE_WXBINDCORE)" USE_WXBINDGL="$(USE_WXBINDGL)" \ ! USE_WXBINDHTML="$(USE_WXBINDHTML)" USE_WXBINDMEDIA="$(USE_WXBINDMEDIA)" \ ! USE_WXBINDNET="$(USE_WXBINDNET)" \ USE_WXBINDRICHTEXT="$(USE_WXBINDRICHTEXT)" \ USE_WXBINDSTC="$(USE_WXBINDSTC)" USE_WXBINDXML="$(USE_WXBINDXML)" \ Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.bcc,v retrieving revision 1.44 retrieving revision 1.45 diff -C2 -d -r1.44 -r1.45 *** makefile.bcc 15 Jan 2008 00:08:18 -0000 1.44 --- makefile.bcc 15 Jan 2008 18:37:27 -0000 1.45 *************** *** 95,101 **** !endif ! # The path to the Lua library ! !ifndef LUA_DIR ! LUA_DIR = ..\..\..\modules\lua !endif --- 95,106 ---- !endif ! # The path to the Lua library includes ! !ifndef LUA_INCLUDE_DIR ! LUA_INCLUDE_DIR = ..\..\..\modules\lua\include ! !endif ! ! # The path to the Lua library libs ! !ifndef LUA_LIB_DIR ! LUA_LIB_DIR = ..\..\..\modules\lua\lib !endif *************** *** 229,237 **** -DWX_MONOLITHIC="$(WX_MONOLITHIC)" -DWX_DIR="$(WX_DIR)" \ -DUSE_APPS="$(USE_APPS)" -DUSE_SYSTEM_LUA="$(USE_SYSTEM_LUA)" \ ! -DLUA_DIR="$(LUA_DIR)" -DRUNTIME_LIBS="$(RUNTIME_LIBS)" \ ! -DTHREADING="$(THREADING)" -DUSE_WXBINDADV="$(USE_WXBINDADV)" \ ! -DUSE_WXBINDAUI="$(USE_WXBINDAUI)" -DUSE_WXBINDBASE="$(USE_WXBINDBASE)" \ ! -DUSE_WXBINDCORE="$(USE_WXBINDCORE)" -DUSE_WXBINDGL="$(USE_WXBINDGL)" \ ! -DUSE_WXBINDHTML="$(USE_WXBINDHTML)" \ -DUSE_WXBINDMEDIA="$(USE_WXBINDMEDIA)" -DUSE_WXBINDNET="$(USE_WXBINDNET)" \ -DUSE_WXBINDRICHTEXT="$(USE_WXBINDRICHTEXT)" \ --- 234,242 ---- -DWX_MONOLITHIC="$(WX_MONOLITHIC)" -DWX_DIR="$(WX_DIR)" \ -DUSE_APPS="$(USE_APPS)" -DUSE_SYSTEM_LUA="$(USE_SYSTEM_LUA)" \ ! -DLUA_INCLUDE_DIR="$(LUA_INCLUDE_DIR)" -DLUA_LIB_DIR="$(LUA_LIB_DIR)" \ ! -DRUNTIME_LIBS="$(RUNTIME_LIBS)" -DTHREADING="$(THREADING)" \ ! -DUSE_WXBINDADV="$(USE_WXBINDADV)" -DUSE_WXBINDAUI="$(USE_WXBINDAUI)" \ ! -DUSE_WXBINDBASE="$(USE_WXBINDBASE)" -DUSE_WXBINDCORE="$(USE_WXBINDCORE)" \ ! -DUSE_WXBINDGL="$(USE_WXBINDGL)" -DUSE_WXBINDHTML="$(USE_WXBINDHTML)" \ -DUSE_WXBINDMEDIA="$(USE_WXBINDMEDIA)" -DUSE_WXBINDNET="$(USE_WXBINDNET)" \ -DUSE_WXBINDRICHTEXT="$(USE_WXBINDRICHTEXT)" \ Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.wat,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** makefile.wat 15 Jan 2008 00:08:19 -0000 1.49 --- makefile.wat 15 Jan 2008 18:37:27 -0000 1.50 *************** *** 62,67 **** USE_SYSTEM_LUA = 0 ! # The path to the Lua library ! LUA_DIR = ..\..\..\modules\lua # This is an advanced option. Handle with care. --- 62,70 ---- USE_SYSTEM_LUA = 0 ! # The path to the Lua library includes ! LUA_INCLUDE_DIR = ..\..\..\modules\lua\include ! ! # The path to the Lua library libs ! LUA_LIB_DIR = ..\..\..\modules\lua\lib # This is an advanced option. Handle with care. *************** *** 196,205 **** WX_VERSION="$(WX_VERSION)" WX_MONOLITHIC="$(WX_MONOLITHIC)" & WX_DIR="$(WX_DIR)" USE_APPS="$(USE_APPS)" & ! USE_SYSTEM_LUA="$(USE_SYSTEM_LUA)" LUA_DIR="$(LUA_DIR)" & ! RUNTIME_LIBS="$(RUNTIME_LIBS)" THREADING="$(THREADING)" & ! USE_WXBINDADV="$(USE_WXBINDADV)" USE_WXBINDAUI="$(USE_WXBINDAUI)" & ! USE_WXBINDBASE="$(USE_WXBINDBASE)" USE_WXBINDCORE="$(USE_WXBINDCORE)" & ! USE_WXBINDGL="$(USE_WXBINDGL)" USE_WXBINDHTML="$(USE_WXBINDHTML)" & ! USE_WXBINDMEDIA="$(USE_WXBINDMEDIA)" USE_WXBINDNET="$(USE_WXBINDNET)" & USE_WXBINDRICHTEXT="$(USE_WXBINDRICHTEXT)" & USE_WXBINDSTC="$(USE_WXBINDSTC)" USE_WXBINDXML="$(USE_WXBINDXML)" & --- 199,209 ---- WX_VERSION="$(WX_VERSION)" WX_MONOLITHIC="$(WX_MONOLITHIC)" & WX_DIR="$(WX_DIR)" USE_APPS="$(USE_APPS)" & ! USE_SYSTEM_LUA="$(USE_SYSTEM_LUA)" LUA_INCLUDE_DIR="$(LUA_INCLUDE_DIR)" & ! LUA_LIB_DIR="$(LUA_LIB_DIR)" RUNTIME_LIBS="$(RUNTIME_LIBS)" & ! THREADING="$(THREADING)" USE_WXBINDADV="$(USE_WXBINDADV)" & ! USE_WXBINDAUI="$(USE_WXBINDAUI)" USE_WXBINDBASE="$(USE_WXBINDBASE)" & ! USE_WXBINDCORE="$(USE_WXBINDCORE)" USE_WXBINDGL="$(USE_WXBINDGL)" & ! USE_WXBINDHTML="$(USE_WXBINDHTML)" USE_WXBINDMEDIA="$(USE_WXBINDMEDIA)" & ! USE_WXBINDNET="$(USE_WXBINDNET)" & USE_WXBINDRICHTEXT="$(USE_WXBINDRICHTEXT)" & USE_WXBINDSTC="$(USE_WXBINDSTC)" USE_WXBINDXML="$(USE_WXBINDXML)" & Index: makefile.gcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.gcc,v retrieving revision 1.47 retrieving revision 1.48 diff -C2 -d -r1.47 -r1.48 *** makefile.gcc 15 Jan 2008 00:08:18 -0000 1.47 --- makefile.gcc 15 Jan 2008 18:37:27 -0000 1.48 *************** *** 56,61 **** USE_SYSTEM_LUA := 0 ! # The path to the Lua library ! LUA_DIR := ..\..\..\modules\lua # This is an advanced option. Handle with care. --- 56,64 ---- USE_SYSTEM_LUA := 0 ! # The path to the Lua library includes ! LUA_INCLUDE_DIR := ..\..\..\modules\lua\include ! ! # The path to the Lua library libs ! LUA_LIB_DIR := ..\..\..\modules\lua\lib # This is an advanced option. Handle with care. *************** *** 139,148 **** SHARED="$(SHARED)" WX_SHARED="$(WX_SHARED)" WX_VERSION="$(WX_VERSION)" \ WX_MONOLITHIC="$(WX_MONOLITHIC)" WX_DIR="$(WX_DIR)" USE_APPS="$(USE_APPS)" \ ! USE_SYSTEM_LUA="$(USE_SYSTEM_LUA)" LUA_DIR="$(LUA_DIR)" \ ! RUNTIME_LIBS="$(RUNTIME_LIBS)" THREADING="$(THREADING)" \ ! USE_WXBINDADV="$(USE_WXBINDADV)" USE_WXBINDAUI="$(USE_WXBINDAUI)" \ ! USE_WXBINDBASE="$(USE_WXBINDBASE)" USE_WXBINDCORE="$(USE_WXBINDCORE)" \ ! USE_WXBINDGL="$(USE_WXBINDGL)" USE_WXBINDHTML="$(USE_WXBINDHTML)" \ ! USE_WXBINDMEDIA="$(USE_WXBINDMEDIA)" USE_WXBINDNET="$(USE_WXBINDNET)" \ USE_WXBINDRICHTEXT="$(USE_WXBINDRICHTEXT)" \ USE_WXBINDSTC="$(USE_WXBINDSTC)" USE_WXBINDXML="$(USE_WXBINDXML)" \ --- 142,152 ---- SHARED="$(SHARED)" WX_SHARED="$(WX_SHARED)" WX_VERSION="$(WX_VERSION)" \ WX_MONOLITHIC="$(WX_MONOLITHIC)" WX_DIR="$(WX_DIR)" USE_APPS="$(USE_APPS)" \ ! USE_SYSTEM_LUA="$(USE_SYSTEM_LUA)" LUA_INCLUDE_DIR="$(LUA_INCLUDE_DIR)" \ ! LUA_LIB_DIR="$(LUA_LIB_DIR)" RUNTIME_LIBS="$(RUNTIME_LIBS)" \ ! THREADING="$(THREADING)" USE_WXBINDADV="$(USE_WXBINDADV)" \ ! USE_WXBINDAUI="$(USE_WXBINDAUI)" USE_WXBINDBASE="$(USE_WXBINDBASE)" \ ! USE_WXBINDCORE="$(USE_WXBINDCORE)" USE_WXBINDGL="$(USE_WXBINDGL)" \ ! USE_WXBINDHTML="$(USE_WXBINDHTML)" USE_WXBINDMEDIA="$(USE_WXBINDMEDIA)" \ ! USE_WXBINDNET="$(USE_WXBINDNET)" \ USE_WXBINDRICHTEXT="$(USE_WXBINDRICHTEXT)" \ USE_WXBINDSTC="$(USE_WXBINDSTC)" USE_WXBINDXML="$(USE_WXBINDXML)" \ |
