Menu
▾
▴
[Wxlua-commit] wxLua/build/msw makefile.bcc, 1.36, 1.37 makefile.gcc, 1.37, 1.38 makefile.vc, 1.39, 1.40 makefile.wat, 1.38, 1.39 wxLua.dsw, 1.16, 1.17
|
From: Francesco M. <fr...@us...> - 2006-12-19 22:24:16
|
Update of /cvsroot/wxlua/wxLua/build/msw In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv21377/build/msw Modified Files: makefile.bcc makefile.gcc makefile.vc makefile.wat wxLua.dsw Log Message: get rid of WX_UNICODE and WX_DEBUG (again); removed the 'verbatim' name from modules and apps; added explanatory comments about the naming of our vanilla lua; renamed our lua interpreter to just 'lua' (as for the standard lua distro); now LUA_DIR is set correctly for windows builds; now USE_SYSTEM_LUA and LUA_DIR are passed through subprojects Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.vc,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** makefile.vc 19 Dec 2006 21:12:00 -0000 1.39 --- makefile.vc 19 Dec 2006 22:24:11 -0000 1.40 *************** *** 49,61 **** WX_SHARED = 0 - # Compile Unicode build of wxWidgets? [0,1] - # 1 - Unicode - WX_UNICODE = 0 - - # Use debug build of wxWidgets (define __WXDEBUG__)? [0,1] - # 0 - Release - # 1 - Debug - WX_DEBUG = 1 - # Version of the wx library to build against. WX_VERSION = 28 --- 49,52 ---- *************** *** 69,72 **** --- 60,69 ---- USE_APPS = 1 + # Should wxLua use the system-wide Lua library ? [0,1] + USE_SYSTEM_LUA = 0 + + # The path to the Lua library + LUA_DIR = ..\..\..\modules\lua + # Does the wxLua bindings for STC need to be compiled ? [0,1] USE_WXBINDSTC = 1 *************** *** 107,118 **** CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" BUILD="$(BUILD)" \ UNICODE="$(UNICODE)" SHARED="$(SHARED)" WX_DIR="$(WX_DIR)" \ ! WX_SHARED="$(WX_SHARED)" WX_UNICODE="$(WX_UNICODE)" WX_DEBUG="$(WX_DEBUG)" \ ! WX_VERSION="$(WX_VERSION)" WX_MONOLITHIC="$(WX_MONOLITHIC)" \ ! USE_APPS="$(USE_APPS)" USE_SYSTEM_LUA="$(USE_SYSTEM_LUA)" \ ! LUA_DIR="$(LUA_DIR)" 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)" --- 104,114 ---- CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" BUILD="$(BUILD)" \ UNICODE="$(UNICODE)" SHARED="$(SHARED)" WX_DIR="$(WX_DIR)" \ ! WX_SHARED="$(WX_SHARED)" WX_VERSION="$(WX_VERSION)" \ ! WX_MONOLITHIC="$(WX_MONOLITHIC)" USE_APPS="$(USE_APPS)" \ ! USE_SYSTEM_LUA="$(USE_SYSTEM_LUA)" LUA_DIR="$(LUA_DIR)" \ ! 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)" *************** *** 134,146 **** __apps___depname = sub_apps !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_UNICODE)" == "1" ! WXLIBPOSTFIX = u ! !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_UNICODE)" == "0" WXLIBPOSTFIX = d !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_UNICODE)" == "1" WXLIBPOSTFIX = ud !endif --- 130,142 ---- __apps___depname = sub_apps !endif ! !if "$(BUILD)" == "debug" && "$(UNICODE)" == "0" WXLIBPOSTFIX = d !endif ! !if "$(BUILD)" == "debug" && "$(UNICODE)" == "1" WXLIBPOSTFIX = ud !endif + !if "$(BUILD)" == "release" && "$(UNICODE)" == "1" + WXLIBPOSTFIX = u + !endif Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.bcc,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** makefile.bcc 19 Dec 2006 21:12:00 -0000 1.36 --- makefile.bcc 19 Dec 2006 22:24:11 -0000 1.37 *************** *** 75,88 **** !endif - # Compile Unicode build of wxWidgets? [0,1] - !ifndef WX_UNICODE - WX_UNICODE = 0 - !endif - - # Use debug build of wxWidgets (define __WXDEBUG__)? [0,1] - !ifndef WX_DEBUG - WX_DEBUG = 1 - !endif - # Version of the wx library to build against. !ifndef WX_VERSION --- 75,78 ---- *************** *** 107,111 **** # The path to the Lua library !ifndef LUA_DIR ! LUA_DIR = modules\lua !endif --- 97,101 ---- # The path to the Lua library !ifndef LUA_DIR ! LUA_DIR = ..\..\..\modules\lua !endif *************** *** 167,171 **** -DBUILD="$(BUILD)" -DUNICODE="$(UNICODE)" -DSHARED="$(SHARED)" \ -DWX_DIR="$(WX_DIR)" -DWX_SHARED="$(WX_SHARED)" \ - -DWX_UNICODE="$(WX_UNICODE)" -DWX_DEBUG="$(WX_DEBUG)" \ -DWX_VERSION="$(WX_VERSION)" -DWX_MONOLITHIC="$(WX_MONOLITHIC)" \ -DUSE_APPS="$(USE_APPS)" -DUSE_SYSTEM_LUA="$(USE_SYSTEM_LUA)" \ --- 157,160 ---- *************** *** 179,194 **** ### Conditionally set variables: ### - !if "$(BUILD)" == "debug" - WX_DEBUG = 1 - !endif - !if "$(BUILD)" == "release" - WX_DEBUG = 0 - !endif - !if "$(UNICODE)" == "0" - WX_UNICODE = 0 - !endif - !if "$(UNICODE)" == "1" - WX_UNICODE = 1 - !endif !if "$(SHARED)" == "0" SHARED_SUFFIX = --- 168,171 ---- *************** *** 206,218 **** __apps___depname = apps !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_UNICODE)" == "1" ! WXLIBPOSTFIX = u ! !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_UNICODE)" == "0" WXLIBPOSTFIX = d !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_UNICODE)" == "1" WXLIBPOSTFIX = ud !endif --- 183,195 ---- __apps___depname = apps !endif ! !if "$(BUILD)" == "debug" && "$(UNICODE)" == "0" WXLIBPOSTFIX = d !endif ! !if "$(BUILD)" == "debug" && "$(UNICODE)" == "1" WXLIBPOSTFIX = ud !endif + !if "$(BUILD)" == "release" && "$(UNICODE)" == "1" + WXLIBPOSTFIX = u + !endif Index: wxLua.dsw =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/wxLua.dsw,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** wxLua.dsw 11 Dec 2006 15:29:43 -0000 1.16 --- wxLua.dsw 19 Dec 2006 22:24:11 -0000 1.17 *************** *** 4,8 **** ############################################################################### ! Project: "app_lua"=..\..\apps\build\msw\apps_app_verbatimlua.dsp - Package Owner=<4> Package=<5> --- 4,8 ---- ############################################################################### ! Project: "app_lua"=..\..\apps\build\msw\apps_app_lua.dsp - Package Owner=<4> Package=<5> *************** *** 13,17 **** {{{ Begin Project Dependency ! Project_Dep_Name mod_verbatimlua End Project Dependency }}} --- 13,17 ---- {{{ Begin Project Dependency ! Project_Dep_Name mod_lua End Project Dependency }}} *************** *** 28,32 **** {{{ Begin Project Dependency ! Project_Dep_Name mod_verbatimlua End Project Dependency Begin Project Dependency --- 28,32 ---- {{{ Begin Project Dependency ! Project_Dep_Name mod_lua End Project Dependency Begin Project Dependency *************** *** 58,62 **** {{{ Begin Project Dependency ! Project_Dep_Name mod_verbatimlua End Project Dependency Begin Project Dependency --- 58,62 ---- {{{ Begin Project Dependency ! Project_Dep_Name mod_lua End Project Dependency Begin Project Dependency *************** *** 85,89 **** {{{ Begin Project Dependency ! Project_Dep_Name mod_verbatimlua End Project Dependency Begin Project Dependency --- 85,89 ---- {{{ Begin Project Dependency ! Project_Dep_Name mod_lua End Project Dependency Begin Project Dependency *************** *** 115,119 **** {{{ Begin Project Dependency ! Project_Dep_Name mod_verbatimlua End Project Dependency Begin Project Dependency --- 115,119 ---- {{{ Begin Project Dependency ! Project_Dep_Name mod_lua End Project Dependency Begin Project Dependency *************** *** 136,140 **** ############################################################################### ! Project: "mod_verbatimlua"=..\..\modules\build\msw\modules_mod_verbatimlua.dsp - Package Owner=<4> Package=<5> --- 136,140 ---- ############################################################################### ! Project: "mod_lua"=..\..\modules\build\msw\modules_mod_lua.dsp - Package Owner=<4> Package=<5> *************** *** 157,161 **** {{{ Begin Project Dependency ! Project_Dep_Name mod_verbatimlua End Project Dependency }}} --- 157,161 ---- {{{ Begin Project Dependency ! Project_Dep_Name mod_lua End Project Dependency }}} *************** *** 172,176 **** {{{ Begin Project Dependency ! Project_Dep_Name mod_verbatimlua End Project Dependency Begin Project Dependency --- 172,176 ---- {{{ Begin Project Dependency ! Project_Dep_Name mod_lua End Project Dependency Begin Project Dependency *************** *** 190,194 **** {{{ Begin Project Dependency ! Project_Dep_Name mod_verbatimlua End Project Dependency Begin Project Dependency --- 190,194 ---- {{{ Begin Project Dependency ! Project_Dep_Name mod_lua End Project Dependency Begin Project Dependency *************** *** 211,215 **** {{{ Begin Project Dependency ! Project_Dep_Name mod_verbatimlua End Project Dependency Begin Project Dependency --- 211,215 ---- {{{ Begin Project Dependency ! Project_Dep_Name mod_lua End Project Dependency Begin Project Dependency *************** *** 229,233 **** {{{ Begin Project Dependency ! Project_Dep_Name mod_verbatimlua End Project Dependency Begin Project Dependency --- 229,233 ---- {{{ Begin Project Dependency ! Project_Dep_Name mod_lua End Project Dependency Begin Project Dependency *************** *** 250,254 **** {{{ Begin Project Dependency ! Project_Dep_Name mod_verbatimlua End Project Dependency Begin Project Dependency --- 250,254 ---- {{{ Begin Project Dependency ! Project_Dep_Name mod_lua End Project Dependency Begin Project Dependency Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.wat,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** makefile.wat 19 Dec 2006 21:12:00 -0000 1.38 --- makefile.wat 19 Dec 2006 22:24:11 -0000 1.39 *************** *** 49,61 **** WX_SHARED = 0 - # Compile Unicode build of wxWidgets? [0,1] - # 1 - Unicode - WX_UNICODE = 0 - - # Use debug build of wxWidgets (define __WXDEBUG__)? [0,1] - # 0 - Release - # 1 - Debug - WX_DEBUG = 1 - # Version of the wx library to build against. WX_VERSION = 28 --- 49,52 ---- *************** *** 69,72 **** --- 60,69 ---- USE_APPS = 1 + # Should wxLua use the system-wide Lua library ? [0,1] + USE_SYSTEM_LUA = 0 + + # The path to the Lua library + LUA_DIR = ..\..\..\modules\lua + # Does the wxLua bindings for STC need to be compiled ? [0,1] USE_WXBINDSTC = 1 *************** *** 138,156 **** !endif WXLIBPOSTFIX = ! !ifeq WX_DEBUG 0 ! !ifeq WX_UNICODE 1 ! WXLIBPOSTFIX = u ! !endif ! !endif ! !ifeq WX_DEBUG 1 ! !ifeq WX_UNICODE 0 WXLIBPOSTFIX = d !endif !endif ! !ifeq WX_DEBUG 1 ! !ifeq WX_UNICODE 1 WXLIBPOSTFIX = ud !endif !endif ### Variables: ### --- 135,153 ---- !endif WXLIBPOSTFIX = ! !ifeq BUILD debug ! !ifeq UNICODE 0 WXLIBPOSTFIX = d !endif !endif ! !ifeq BUILD debug ! !ifeq UNICODE 1 WXLIBPOSTFIX = ud !endif !endif + !ifeq BUILD release + !ifeq UNICODE 1 + WXLIBPOSTFIX = u + !endif + !endif ### Variables: ### *************** *** 159,170 **** CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" BUILD="$(BUILD)" & UNICODE="$(UNICODE)" SHARED="$(SHARED)" WX_DIR="$(WX_DIR)" & ! WX_SHARED="$(WX_SHARED)" WX_UNICODE="$(WX_UNICODE)" WX_DEBUG="$(WX_DEBUG)" & ! WX_VERSION="$(WX_VERSION)" WX_MONOLITHIC="$(WX_MONOLITHIC)" & ! USE_APPS="$(USE_APPS)" USE_SYSTEM_LUA="$(USE_SYSTEM_LUA)" & ! LUA_DIR="$(LUA_DIR)" 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)" --- 156,166 ---- CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" BUILD="$(BUILD)" & UNICODE="$(UNICODE)" SHARED="$(SHARED)" WX_DIR="$(WX_DIR)" & ! WX_SHARED="$(WX_SHARED)" WX_VERSION="$(WX_VERSION)" & ! WX_MONOLITHIC="$(WX_MONOLITHIC)" USE_APPS="$(USE_APPS)" & ! USE_SYSTEM_LUA="$(USE_SYSTEM_LUA)" LUA_DIR="$(LUA_DIR)" & ! 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.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** makefile.gcc 19 Dec 2006 21:12:00 -0000 1.37 --- makefile.gcc 19 Dec 2006 22:24:11 -0000 1.38 *************** *** 44,53 **** WX_SHARED = 0 - # Compile Unicode build of wxWidgets? [0,1] - WX_UNICODE = 0 - - # Use debug build of wxWidgets (define __WXDEBUG__)? [0,1] - WX_DEBUG = 1 - # Version of the wx library to build against. WX_VERSION = 28 --- 44,47 ---- *************** *** 59,62 **** --- 53,62 ---- USE_APPS = 1 + # Should wxLua use the system-wide Lua library ? [0,1] + USE_SYSTEM_LUA = 0 + + # The path to the Lua library + LUA_DIR = ..\..\..\modules\lua + # Does the wxLua bindings for STC need to be compiled ? [0,1] USE_WXBINDSTC = 1 *************** *** 97,108 **** CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" BUILD="$(BUILD)" \ UNICODE="$(UNICODE)" SHARED="$(SHARED)" WX_DIR="$(WX_DIR)" \ ! WX_SHARED="$(WX_SHARED)" WX_UNICODE="$(WX_UNICODE)" WX_DEBUG="$(WX_DEBUG)" \ ! WX_VERSION="$(WX_VERSION)" WX_MONOLITHIC="$(WX_MONOLITHIC)" \ ! USE_APPS="$(USE_APPS)" USE_SYSTEM_LUA="$(USE_SYSTEM_LUA)" \ ! LUA_DIR="$(LUA_DIR)" 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)" --- 97,107 ---- CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" BUILD="$(BUILD)" \ UNICODE="$(UNICODE)" SHARED="$(SHARED)" WX_DIR="$(WX_DIR)" \ ! WX_SHARED="$(WX_SHARED)" WX_VERSION="$(WX_VERSION)" \ ! WX_MONOLITHIC="$(WX_MONOLITHIC)" USE_APPS="$(USE_APPS)" \ ! USE_SYSTEM_LUA="$(USE_SYSTEM_LUA)" LUA_DIR="$(LUA_DIR)" \ ! 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)" *************** *** 124,142 **** __apps___depname = apps endif ! ifeq ($(WX_DEBUG),0) ! ifeq ($(WX_UNICODE),1) ! WXLIBPOSTFIX = u ! endif ! endif ! ifeq ($(WX_DEBUG),1) ! ifeq ($(WX_UNICODE),0) WXLIBPOSTFIX = d endif endif ! ifeq ($(WX_DEBUG),1) ! ifeq ($(WX_UNICODE),1) WXLIBPOSTFIX = ud endif endif --- 123,141 ---- __apps___depname = apps endif ! ifeq ($(BUILD),debug) ! ifeq ($(UNICODE),0) WXLIBPOSTFIX = d endif endif ! ifeq ($(BUILD),debug) ! ifeq ($(UNICODE),1) WXLIBPOSTFIX = ud endif endif + ifeq ($(BUILD),release) + ifeq ($(UNICODE),1) + WXLIBPOSTFIX = u + endif + endif |
