diff options
author | Oliver Schneider <oliver@assarbad.net> | 2017-03-22 01:24:08 +0300 |
---|---|---|
committer | Oliver Schneider <oliver@assarbad.net> | 2017-03-22 01:24:08 +0300 |
commit | 59e79356166589c1f0164afe105507addae67cfb (patch) | |
tree | 9dfbd4feb1915ef8f240f74a52728bfbab4d1ed0 /src/actions | |
parent | b8625c05bc96cc03d1d940aa7a7682029473f228 (diff) |
Introducing os.str2uuid() as possibility to convert a string deterministically into a (pseudo-)UUID using SHA-3 (256-bit) aka Keccak
Replaced all leading spaces or mixed spaces/tabs with tabs (by rule 1 tab = 4 spaces)
Prepared premake4.lua for this project to generate XP projects and VS2017 projects
--HG--
branch : WDS-build
Diffstat (limited to 'src/actions')
-rw-r--r-- | src/actions/codeblocks/codeblocks_cbp.lua | 4 | ||||
-rw-r--r-- | src/actions/make/make_cpp.lua | 4 | ||||
-rw-r--r-- | src/actions/make/make_csharp.lua | 6 | ||||
-rw-r--r-- | src/actions/vstudio/vs200x_vcproj.lua | 14 | ||||
-rw-r--r-- | src/actions/vstudio/vs2010_vcxproj.lua | 14 |
5 files changed, 21 insertions, 21 deletions
diff --git a/src/actions/codeblocks/codeblocks_cbp.lua b/src/actions/codeblocks/codeblocks_cbp.lua index 3abd92e..9d8a4fa 100644 --- a/src/actions/codeblocks/codeblocks_cbp.lua +++ b/src/actions/codeblocks/codeblocks_cbp.lua @@ -54,7 +54,7 @@ _p(4,'</remote_debugging>') _p(3,'</debugger>') else - error('Sorry at this moment there is no support for debug environment variables with this debugger and codeblocks') + error('Sorry at this moment there is no support for debug environment variables with this debugger and codeblocks') end end @@ -173,7 +173,7 @@ codeblocks.files(prj) _p(2,'<Extensions>') - for _, platform in ipairs(platforms) do + for _, platform in ipairs(platforms) do for cfg in premake.eachconfig(prj, platform) do if cfg.debugenvs and #cfg.debugenvs > 0 then premake.codeblocks.debugenvs(cfg) diff --git a/src/actions/make/make_cpp.lua b/src/actions/make/make_cpp.lua index 2761810..4aa6fe2 100644 --- a/src/actions/make/make_cpp.lua +++ b/src/actions/make/make_cpp.lua @@ -243,8 +243,8 @@ _p(' ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CFLAGS)%s', make.list(cc.getcxxflags(cfg))) _p(' ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)%s', - make.list(table.join(cc.getdefines(cfg.resdefines), - cc.getincludedirs(cfg.resincludedirs), cfg.resoptions))) + make.list(table.join(cc.getdefines(cfg.resdefines), + cc.getincludedirs(cfg.resincludedirs), cfg.resoptions))) end diff --git a/src/actions/make/make_csharp.lua b/src/actions/make/make_csharp.lua index 12dfda5..00ba65e 100644 --- a/src/actions/make/make_csharp.lua +++ b/src/actions/make/make_csharp.lua @@ -11,9 +11,9 @@ local function getresourcefilename(cfg, fname) if path.getextension(fname) == ".resx" then - local name = cfg.buildtarget.basename .. "." - local dir = path.getdirectory(fname) - if dir ~= "." then + local name = cfg.buildtarget.basename .. "." + local dir = path.getdirectory(fname) + if dir ~= "." then name = name .. path.translate(dir, ".") .. "." end return "$(OBJDIR)/" .. _MAKE.esc(name .. path.getbasename(fname)) .. ".resources" diff --git a/src/actions/vstudio/vs200x_vcproj.lua b/src/actions/vstudio/vs200x_vcproj.lua index 90b7a1e..142e250 100644 --- a/src/actions/vstudio/vs200x_vcproj.lua +++ b/src/actions/vstudio/vs200x_vcproj.lua @@ -148,8 +148,8 @@ _p(depth, '\t>') _p(depth, '\t<Tool') _p(depth, '\t\tName="%s"', iif(cfg.system == "Xbox360", - "VCCLX360CompilerTool", - "VCCLCompilerTool")) + "VCCLX360CompilerTool", + "VCCLCompilerTool")) if needsCompileAs then _p(depth, '\t\tCompileAs="%s"', iif(path.iscfile(fname), 1, 2)) end @@ -157,8 +157,8 @@ if usePCH then if cfg.system == "PS3" then local options = table.join(premake.snc.getcflags(cfg), - premake.snc.getcxxflags(cfg), - cfg.buildoptions) + premake.snc.getcxxflags(cfg), + cfg.buildoptions) options = table.concat(options, " "); options = options .. ' --create_pch="$(IntDir)/$(TargetName).pch"' _p(depth, '\t\tAdditionalOptions="%s"', premake.esc(options)) @@ -212,9 +212,9 @@ else -- Edit-and-continue does't work for some configurations if cfg.flags.NoEditAndContinue or - vc200x.optimization(cfg) ~= 0 or - cfg.flags.Managed or - cfg.platform == "x64" then + vc200x.optimization(cfg) ~= 0 or + cfg.flags.Managed or + cfg.platform == "x64" then return 3 else return 4 diff --git a/src/actions/vstudio/vs2010_vcxproj.lua b/src/actions/vstudio/vs2010_vcxproj.lua index d6f9b7b..993bd8f 100644 --- a/src/actions/vstudio/vs2010_vcxproj.lua +++ b/src/actions/vstudio/vs2010_vcxproj.lua @@ -129,7 +129,7 @@ if cfg.kind == "SharedLib" then local ignore = (cfg.flags.NoImportLib ~= nil) - _p(2,'<IgnoreImportLibrary>%s</IgnoreImportLibrary>', tostring(ignore)) + _p(2,'<IgnoreImportLibrary>%s</IgnoreImportLibrary>', tostring(ignore)) end if cfg.kind ~= "StaticLib" then @@ -157,7 +157,7 @@ end local function precompiled_header(cfg) - if not cfg.flags.NoPCH and cfg.pchheader then + if not cfg.flags.NoPCH and cfg.pchheader then _p(3,'<PrecompiledHeader>Use</PrecompiledHeader>') _p(3,'<PrecompiledHeaderFile>%s</PrecompiledHeaderFile>', cfg.pchheader) else @@ -229,7 +229,7 @@ end local function floating_point(cfg) - if cfg.flags.FloatFast then + if cfg.flags.FloatFast then _p(3,'<FloatingPointModel>Fast</FloatingPointModel>') elseif cfg.flags.FloatStrict and not cfg.flags.Managed then _p(3,'<FloatingPointModel>Strict</FloatingPointModel>') @@ -339,19 +339,19 @@ local function event_hooks(cfg) if #cfg.postbuildcommands> 0 then - _p(2,'<PostBuildEvent>') + _p(2,'<PostBuildEvent>') _p(3,'<Command>%s</Command>',premake.esc(table.implode(cfg.postbuildcommands, "", "", "\r\n"))) _p(2,'</PostBuildEvent>') end if #cfg.prebuildcommands> 0 then - _p(2,'<PreBuildEvent>') + _p(2,'<PreBuildEvent>') _p(3,'<Command>%s</Command>',premake.esc(table.implode(cfg.prebuildcommands, "", "", "\r\n"))) _p(2,'</PreBuildEvent>') end if #cfg.prelinkcommands> 0 then - _p(2,'<PreLinkEvent>') + _p(2,'<PreLinkEvent>') _p(3,'<Command>%s</Command>',premake.esc(table.implode(cfg.prelinkcommands, "", "", "\r\n"))) _p(2,'</PreLinkEvent>') end @@ -372,7 +372,7 @@ end local function item_def_lib(cfg) - -- The Xbox360 project files are stored in another place in the project file. + -- The Xbox360 project files are stored in another place in the project file. if cfg.kind == 'StaticLib' and cfg.platform ~= "Xbox360" then _p(1,'<Lib>') _p(2,'<OutputFile>$(OutDir)%s</OutputFile>',cfg.buildtarget.name) |