Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2016-04-25 19:43:29 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2016-04-25 19:43:29 (GMT) |
| commit | 857791adda753a0f94da8317bbc019378b1f09bd (patch) | |
| tree | 96aa2e4d863d50888a16527f9fbb38712e97d8ee /3rdParty/Lua | |
| parent | b58ad7f4b01623a8807b8c268208bd9c8496f4e2 (diff) | |
| download | swift-857791adda753a0f94da8317bbc019378b1f09bd.zip swift-857791adda753a0f94da8317bbc019378b1f09bd.tar.bz2 | |
Convert hard tabs to four spaces in all our SConscript/*.py files
Test-Information:
Test that it still builds and unit test pass on OS X 10.11.4.
Change-Id: I2eb4a0b707991aee553db36a8cd1ae28b813acab
Diffstat (limited to '3rdParty/Lua')
| -rw-r--r-- | 3rdParty/Lua/SConscript | 128 |
1 files changed, 64 insertions, 64 deletions
diff --git a/3rdParty/Lua/SConscript b/3rdParty/Lua/SConscript index f73286f..d2475f6 100644 --- a/3rdParty/Lua/SConscript +++ b/3rdParty/Lua/SConscript @@ -6,76 +6,76 @@ if env.get("LUA_BUNDLED", False) : # Module flags ################################################################################ - if env["SCONS_STAGE"] == "flags" : - env["HAVE_LUA"] = True - cppdefines = [] - if not env["optimize"] : - cppdefines.append("LUA_USE_APICHECK") - if env["PLATFORM"] == "win32" : - pass - elif env["PLATFORM"] == "darwin" : - cppdefines += ["LUA_USE_POSIX", "LUA_USE_DLOPEN"] - else : - cppdefines += ["LUA_USE_POSIX", "LUA_USE_DLOPEN"] + if env["SCONS_STAGE"] == "flags" : + env["HAVE_LUA"] = True + cppdefines = [] + if not env["optimize"] : + cppdefines.append("LUA_USE_APICHECK") + if env["PLATFORM"] == "win32" : + pass + elif env["PLATFORM"] == "darwin" : + cppdefines += ["LUA_USE_POSIX", "LUA_USE_DLOPEN"] + else : + cppdefines += ["LUA_USE_POSIX", "LUA_USE_DLOPEN"] - env["LUA_FLAGS"] = { - "CPPDEFINES": cppdefines, - "CPPPATH": [Dir("src")], - "LIBPATH": [Dir(".")], - "LIBS": ["Swiften_Lua"], - } + env["LUA_FLAGS"] = { + "CPPDEFINES": cppdefines, + "CPPPATH": [Dir("src")], + "LIBPATH": [Dir(".")], + "LIBS": ["Swiften_Lua"], + } ################################################################################ # Build ################################################################################ - if env["SCONS_STAGE"] == "build" : - myenv = env.Clone() + if env["SCONS_STAGE"] == "build" : + myenv = env.Clone() - # Remove warn flags - myenv.Replace(CCFLAGS = [flag for flag in env["CCFLAGS"] if not flag.startswith("-W")]) - if "clang" in env["CC"] : - myenv.Append(CCFLAGS = ["-Wno-unknown-warning-option", "-Wno-empty-body"]) + # Remove warn flags + myenv.Replace(CCFLAGS = [flag for flag in env["CCFLAGS"] if not flag.startswith("-W")]) + if "clang" in env["CC"] : + myenv.Append(CCFLAGS = ["-Wno-unknown-warning-option", "-Wno-empty-body"]) - myenv.MergeFlags(myenv["LUA_FLAGS"]) - myenv.StaticLibrary("Swiften_Lua", [ - "src/lapi.c", - "src/lcode.c", - "src/ldebug.c", - "src/ldo.c", - "src/ldump.c", - "src/lfunc.c", - "src/lgc.c", - "src/llex.c", - "src/lmem.c", - "src/lobject.c", - "src/lopcodes.c", - "src/lparser.c", - "src/lstate.c", - "src/lstring.c", - "src/ltable.c", - "src/ltm.c", - "src/lundump.c", - "src/lvm.c", - "src/lzio.c", - "src/lauxlib.c", - "src/lbaselib.c", - "src/ldblib.c", - "src/liolib.c", - "src/lmathlib.c", - "src/loslib.c", - "src/ltablib.c", - "src/lstrlib.c", - "src/loadlib.c", - ]) + myenv.MergeFlags(myenv["LUA_FLAGS"]) + myenv.StaticLibrary("Swiften_Lua", [ + "src/lapi.c", + "src/lcode.c", + "src/ldebug.c", + "src/ldo.c", + "src/ldump.c", + "src/lfunc.c", + "src/lgc.c", + "src/llex.c", + "src/lmem.c", + "src/lobject.c", + "src/lopcodes.c", + "src/lparser.c", + "src/lstate.c", + "src/lstring.c", + "src/ltable.c", + "src/ltm.c", + "src/lundump.c", + "src/lvm.c", + "src/lzio.c", + "src/lauxlib.c", + "src/lbaselib.c", + "src/ldblib.c", + "src/liolib.c", + "src/lmathlib.c", + "src/loslib.c", + "src/ltablib.c", + "src/lstrlib.c", + "src/loadlib.c", + ]) - lua_env = myenv.Clone() - lua_env.MergeFlags(lua_env["LUA_FLAGS"]) - if lua_env.get("HAVE_READLINE", False) : - lua_env.Append(CPPDEFINES = ["LUA_USE_READLINE"]) - lua_env.MergeFlags(lua_env["READLINE_FLAGS"]) - lua_env.MergeFlags(myenv["PLATFORM_FLAGS"]) - lua_env.Program("lua", [ - "src/linit.c", - "src/lua.c", - ]) + lua_env = myenv.Clone() + lua_env.MergeFlags(lua_env["LUA_FLAGS"]) + if lua_env.get("HAVE_READLINE", False) : + lua_env.Append(CPPDEFINES = ["LUA_USE_READLINE"]) + lua_env.MergeFlags(lua_env["READLINE_FLAGS"]) + lua_env.MergeFlags(myenv["PLATFORM_FLAGS"]) + lua_env.Program("lua", [ + "src/linit.c", + "src/lua.c", + ]) |