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/make | |
| 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/make')
| -rw-r--r-- | src/actions/make/make_cpp.lua | 4 | ||||
| -rw-r--r-- | src/actions/make/make_csharp.lua | 6 |
2 files changed, 5 insertions, 5 deletions
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" |