Making the premake4.lua a little more robust

Also working around the Premake4 issue with resource_compile(), see https://github.com/premake/premake-4.x/issues/10

27 files changed, 121 insertions, 54 deletions

diff --git a/premake4.lua b/premake4.lua
index eaff18a..146f6ea 100644
--- a/premake4.lua
+++ b/premake4.lua
@@ -136,13 +136,18 @@ do
         local orig_vc2010_link = premake.vstudio.vc2010.link

         premake.vstudio.vc2010.link = function(cfg)

             if cfg.flags.Symbols ~= nil and cfg.flags.Symbols then

-                io.capture()

+                local old_captured = io.captured -- save io.captured state

+                io.capture() -- empties io.captured

                 orig_vc2010_link(cfg)

                 local captured = io.endcapture()

                 local indent = io.indent .. io.indent .. io.indent

                 assert(io.indent ~= nil, "io.indent must not be nil at this point!")

                 captured = captured:gsub("(</GenerateDebugInformation>)", "%1\n" .. string.format("%s<FullProgramDatabaseFile>%s</FullProgramDatabaseFile>", indent, tostring(cfg.flags.Symbols ~= nil)))

-                io.write(captured)

+                if old_captured ~= nil then

+                    io.captured = old_captured .. captured -- restore outer captured state, if any

+                else

+                    io.write(captured)

+                end

             else

                 orig_vc2010_link(cfg)

             end

@@ -151,16 +156,22 @@ do
     -- We want to output the file with UTF-8 BOM

     local orig_vc2010_header = premake.vstudio.vc2010.header

     premake.vstudio.vc2010.header = function(targets)

-        io.capture()

+        local old_captured = io.captured -- save io.captured state

+        io.capture() -- empties io.captured

         orig_vc2010_header(targets)

         local captured = io.endcapture()

-        io.write("\239\187\191")

-        io.write(captured)

+        if old_captured ~= nil then

+            io.captured = old_captured .. "\239\187\191" .. captured -- restore outer captured state, if any

+        else

+            io.write("\239\187\191")

+            io.write(captured)

+        end

     end

     -- Make sure we can generate XP-compatible projects for newer Visual Studio versions

     local orig_vc2010_configurationPropertyGroup = premake.vstudio.vc2010.configurationPropertyGroup

     premake.vstudio.vc2010.configurationPropertyGroup = function(cfg, cfginfo)

-        io.capture()

+        local old_captured = io.captured -- save io.captured state

+        io.capture() -- empties io.captured

         orig_vc2010_configurationPropertyGroup(cfg, cfginfo)

         local captured = io.endcapture()

         local toolsets = { vs2012 = "v110", vs2013 = "v120", vs2015 = "v140", vs2017 = "v141" }

@@ -171,7 +182,11 @@ do
                 captured = captured:gsub("(</PlatformToolset>)", "_xp%1")

             end

         end

-        io.write(captured)

+        if old_captured ~= nil then

+            io.captured = old_captured .. captured -- restore outer captured state, if any

+        else

+            io.write(captured)

+        end

     end

     -- Override the project creation to suppress unnecessary configurations

     -- these get invoked by sln2005.generate per project ...

@@ -204,6 +219,65 @@ do
             return orig_prjgen(prj)

         end

     end

+    -- Borrowed from setLocal() at https://stackoverflow.com/a/22752379

+    local function getLocal(stkidx, name)

+        local index = 1

+        while true do

+            local var_name, var_value = debug.getlocal(stkidx, index)

+            if not var_name then break end

+            if var_name == name then 

+                return var_value

+            end

+            index = index + 1

+        end

+    end

+    -- resdefines takes no effect in VS201x solutions, let's fix that.

+    local orig_premake_vs2010_vcxproj = premake.vs2010_vcxproj

+    premake.vs2010_vcxproj = function(prj)

+        -- The whole stunt below is necessary in order to modify the resource_compile()

+        -- output. Given it's a local function we have to go through hoops.

+        local orig_p = _G._p

+        local besilent = false

+        -- We patch the global _p() function

+        _G._p = function(indent, msg, ...)

+            -- Look for indent values of 2

+            if indent == 2 and msg ~= nil then

+                -- ... with msg value of <ResourceCompile>

+                if msg == "<ResourceCompile>" then

+                    local cfg = getLocal(3, "e") -- with LuaSrcDiet

+                    if cfg == nil then

+                        cfg = getLocal(3, "cfg") -- without LuaSrcDiet

+                    end

+                    assert(type(cfg) == "table" and cfg["resdefines"] ~= nil)

+                    orig_p(indent, msg, ...) -- spit the original line out

+                    local indent = indent + 1

+                    if #cfg.defines > 0 or #cfg.resdefines then

+                        local defines = table.join(cfg.defines, cfg.resdefines)

+                        orig_p(indent,'<PreprocessorDefinitions>%s;%%(PreprocessorDefinitions)</PreprocessorDefinitions>'

+                            ,premake.esc(table.concat(premake.esc(defines), ";")))

+                    else

+                        orig_p(indent,'<PreprocessorDefinitions></PreprocessorDefinitions>')

+                    end

+                    if #cfg.includedirs > 0 or #cfg.resincludedirs > 0 then

+                        local dirs = table.join(cfg.includedirs, cfg.resincludedirs)

+                        orig_p(indent,'<AdditionalIncludeDirectories>%s;%%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>'

+                                ,premake.esc(path.translate(table.concat(dirs, ";"), '\\')))

+                    end

+                    besilent = true

+                end

+                -- ... or msg value of <ResourceCompile>

+                if msg == "</ResourceCompile>" then

+                    besilent = false

+                    -- fall through

+                end

+            end

+            if not besilent then -- should we be silent?

+                orig_p(indent, msg, ...)

+            end

+        end

+        orig_premake_vs2010_vcxproj(prj)

+        _G._p = orig_p -- restore in any case

+    end

     premake.vs2010_vcxproj = prjgen_override_factory(premake.vs2010_vcxproj)

     premake.vstudio.vc200x.generate = prjgen_override_factory(premake.vstudio.vc200x.generate)

     -- Allow us to set the project configuration to Release|Win32 for the resource DLL projects,

@@ -235,7 +309,8 @@ do
     end

     local VCManifestTool_handler = premake.vstudio.vc200x.toolmap["VCManifestTool"]

     premake.vstudio.vc200x.toolmap["VCManifestTool"] = function(cfg)

-        io.capture()

+        local old_captured = io.captured -- save io.captured state

+        io.capture() -- empties io.captured

         VCManifestTool_handler(cfg)

         local captured = io.endcapture()

         if captured:find("res/windirstat\.manifest") and cfg.name and cfg.platform then

@@ -247,7 +322,11 @@ do
             local identity = string.format(identity_fmt, assemblyName, arch, programVersion)

             captured = captured:gsub("(%\t+)AdditionalManifestFiles=\"[^\"]+\"", "%0" .. io.eol .. "%1AssemblyIdentity=\"" .. premake.esc(identity) .. "\"")

         end

-        io.write(captured)

+        if old_captured ~= nil then

+            io.captured = old_captured .. captured -- restore outer captured state, if any

+        else

+            io.write(captured)

+        end

     end

 end

 local function transformMN(input) -- transform the macro names for older Visual Studio versions

@@ -347,19 +426,19 @@ solution (iif(release, slnname, "windirstat"))
         }

 

         configuration {"Debug", "x32"}

-            defines         {"MODNAME=wds32D"}

+            resdefines      {"MODNAME=wds32D"}

             targetsuffix    ("32D")

 

         configuration {"Debug", "x64"}

-            defines         {"MODNAME=wds64D"}

+            resdefines      {"MODNAME=wds64D"}

             targetsuffix    ("64D")

 

         configuration {"Release", "x32"}

-            defines         {"MODNAME=wds32"}

+            resdefines      {"MODNAME=wds32"}

             targetsuffix    ("32")

 

         configuration {"Release", "x64"}

-            defines         {"MODNAME=wds64"}

+            resdefines      {"MODNAME=wds64"}

             targetsuffix    ("64")

 

         configuration {"Debug"}

@@ -486,7 +565,7 @@ solution (iif(release, slnname, "windirstat"))
                     targetdir       (iif(release, slnname, "build"))

                     targetname      ("wdsr" .. nmpfx)

                     targetextension (".wdslng")

-                    defines         {"WDS_RESLANG=0x" .. nmpfx, "MODNAME=wdsr" .. nmpfx}

+                    resdefines      {"WDS_RESLANG=0x" .. nmpfx, "MODNAME=wdsr" .. nmpfx}

                     resoptions      {"/nologo", "/l409"}

                     resincludedirs  {".", "$(ProjectDir)", "$(IntDir)"}

                     linkoptions     {"/noentry"}

diff --git a/windirstat/res/0405.Czech/wdsr0405.Czech.vs15.vcxproj b/windirstat/res/0405.Czech/wdsr0405.Czech.vs15.vcxproj
index fe14c19..b3bafa3 100644
--- a/windirstat/res/0405.Czech/wdsr0405.Czech.vs15.vcxproj
+++ b/windirstat/res/0405.Czech/wdsr0405.Czech.vs15.vcxproj
@@ -37,7 +37,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

     <ClCompile>

       <Optimization>Disabled</Optimization>

-      <PreprocessorDefinitions>WDS_RESLANG=0x0405;MODNAME=wdsr0405;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions></PreprocessorDefinitions>

       <MinimalRebuild>false</MinimalRebuild>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

diff --git a/windirstat/res/0405.Czech/wdsr0405.Czech.vs8.vcproj b/windirstat/res/0405.Czech/wdsr0405.Czech.vs8.vcproj
index 91c5ec5..817ef9b 100644
--- a/windirstat/res/0405.Czech/wdsr0405.Czech.vs8.vcproj
+++ b/windirstat/res/0405.Czech/wdsr0405.Czech.vs8.vcproj
@@ -41,7 +41,6 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				PreprocessorDefinitions="WDS_RESLANG=0x0405;MODNAME=wdsr0405"

 				ExceptionHandling="0"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="2"

diff --git a/windirstat/res/0407.German/wdsr0407.German.vs15.vcxproj b/windirstat/res/0407.German/wdsr0407.German.vs15.vcxproj
index cac83b7..c868579 100644
--- a/windirstat/res/0407.German/wdsr0407.German.vs15.vcxproj
+++ b/windirstat/res/0407.German/wdsr0407.German.vs15.vcxproj
@@ -37,7 +37,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

     <ClCompile>

       <Optimization>Disabled</Optimization>

-      <PreprocessorDefinitions>WDS_RESLANG=0x0407;MODNAME=wdsr0407;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions></PreprocessorDefinitions>

       <MinimalRebuild>false</MinimalRebuild>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

diff --git a/windirstat/res/0407.German/wdsr0407.German.vs8.vcproj b/windirstat/res/0407.German/wdsr0407.German.vs8.vcproj
index 03b352b..fa8d5cc 100644
--- a/windirstat/res/0407.German/wdsr0407.German.vs8.vcproj
+++ b/windirstat/res/0407.German/wdsr0407.German.vs8.vcproj
@@ -41,7 +41,6 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				PreprocessorDefinitions="WDS_RESLANG=0x0407;MODNAME=wdsr0407"

 				ExceptionHandling="0"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="2"

diff --git a/windirstat/res/040a.Spanish/wdsr040a.Spanish.vs15.vcxproj b/windirstat/res/040a.Spanish/wdsr040a.Spanish.vs15.vcxproj
index ef9a1a6..5d5c6fb 100644
--- a/windirstat/res/040a.Spanish/wdsr040a.Spanish.vs15.vcxproj
+++ b/windirstat/res/040a.Spanish/wdsr040a.Spanish.vs15.vcxproj
@@ -37,7 +37,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

     <ClCompile>

       <Optimization>Disabled</Optimization>

-      <PreprocessorDefinitions>WDS_RESLANG=0x040a;MODNAME=wdsr040a;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions></PreprocessorDefinitions>

       <MinimalRebuild>false</MinimalRebuild>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

diff --git a/windirstat/res/040a.Spanish/wdsr040a.Spanish.vs8.vcproj b/windirstat/res/040a.Spanish/wdsr040a.Spanish.vs8.vcproj
index efefa95..c1325d2 100644
--- a/windirstat/res/040a.Spanish/wdsr040a.Spanish.vs8.vcproj
+++ b/windirstat/res/040a.Spanish/wdsr040a.Spanish.vs8.vcproj
@@ -41,7 +41,6 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				PreprocessorDefinitions="WDS_RESLANG=0x040a;MODNAME=wdsr040a"

 				ExceptionHandling="0"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="2"

diff --git a/windirstat/res/040b.Finnish/wdsr040b.Finnish.vs15.vcxproj b/windirstat/res/040b.Finnish/wdsr040b.Finnish.vs15.vcxproj
index 013e8af..2656d0a 100644
--- a/windirstat/res/040b.Finnish/wdsr040b.Finnish.vs15.vcxproj
+++ b/windirstat/res/040b.Finnish/wdsr040b.Finnish.vs15.vcxproj
@@ -37,7 +37,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

     <ClCompile>

       <Optimization>Disabled</Optimization>

-      <PreprocessorDefinitions>WDS_RESLANG=0x040b;MODNAME=wdsr040b;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions></PreprocessorDefinitions>

       <MinimalRebuild>false</MinimalRebuild>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

diff --git a/windirstat/res/040b.Finnish/wdsr040b.Finnish.vs8.vcproj b/windirstat/res/040b.Finnish/wdsr040b.Finnish.vs8.vcproj
index 1c24ba5..6ab56bc 100644
--- a/windirstat/res/040b.Finnish/wdsr040b.Finnish.vs8.vcproj
+++ b/windirstat/res/040b.Finnish/wdsr040b.Finnish.vs8.vcproj
@@ -41,7 +41,6 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				PreprocessorDefinitions="WDS_RESLANG=0x040b;MODNAME=wdsr040b"

 				ExceptionHandling="0"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="2"

diff --git a/windirstat/res/040c.French/wdsr040c.French.vs15.vcxproj b/windirstat/res/040c.French/wdsr040c.French.vs15.vcxproj
index 98a6411..04ef51c 100644
--- a/windirstat/res/040c.French/wdsr040c.French.vs15.vcxproj
+++ b/windirstat/res/040c.French/wdsr040c.French.vs15.vcxproj
@@ -37,7 +37,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

     <ClCompile>

       <Optimization>Disabled</Optimization>

-      <PreprocessorDefinitions>WDS_RESLANG=0x040c;MODNAME=wdsr040c;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions></PreprocessorDefinitions>

       <MinimalRebuild>false</MinimalRebuild>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

diff --git a/windirstat/res/040c.French/wdsr040c.French.vs8.vcproj b/windirstat/res/040c.French/wdsr040c.French.vs8.vcproj
index beae2ee..ec5075b 100644
--- a/windirstat/res/040c.French/wdsr040c.French.vs8.vcproj
+++ b/windirstat/res/040c.French/wdsr040c.French.vs8.vcproj
@@ -41,7 +41,6 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				PreprocessorDefinitions="WDS_RESLANG=0x040c;MODNAME=wdsr040c"

 				ExceptionHandling="0"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="2"

diff --git a/windirstat/res/040e.Hungarian/wdsr040e.Hungarian.vs15.vcxproj b/windirstat/res/040e.Hungarian/wdsr040e.Hungarian.vs15.vcxproj
index 5559eef..8987ebb 100644
--- a/windirstat/res/040e.Hungarian/wdsr040e.Hungarian.vs15.vcxproj
+++ b/windirstat/res/040e.Hungarian/wdsr040e.Hungarian.vs15.vcxproj
@@ -37,7 +37,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

     <ClCompile>

       <Optimization>Disabled</Optimization>

-      <PreprocessorDefinitions>WDS_RESLANG=0x040e;MODNAME=wdsr040e;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions></PreprocessorDefinitions>

       <MinimalRebuild>false</MinimalRebuild>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

diff --git a/windirstat/res/040e.Hungarian/wdsr040e.Hungarian.vs8.vcproj b/windirstat/res/040e.Hungarian/wdsr040e.Hungarian.vs8.vcproj
index 7060799..d2f31b5 100644
--- a/windirstat/res/040e.Hungarian/wdsr040e.Hungarian.vs8.vcproj
+++ b/windirstat/res/040e.Hungarian/wdsr040e.Hungarian.vs8.vcproj
@@ -41,7 +41,6 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				PreprocessorDefinitions="WDS_RESLANG=0x040e;MODNAME=wdsr040e"

 				ExceptionHandling="0"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="2"

diff --git a/windirstat/res/0410.Italian/wdsr0410.Italian.vs15.vcxproj b/windirstat/res/0410.Italian/wdsr0410.Italian.vs15.vcxproj
index e18b02d..651af97 100644
--- a/windirstat/res/0410.Italian/wdsr0410.Italian.vs15.vcxproj
+++ b/windirstat/res/0410.Italian/wdsr0410.Italian.vs15.vcxproj
@@ -37,7 +37,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

     <ClCompile>

       <Optimization>Disabled</Optimization>

-      <PreprocessorDefinitions>WDS_RESLANG=0x0410;MODNAME=wdsr0410;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions></PreprocessorDefinitions>

       <MinimalRebuild>false</MinimalRebuild>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

diff --git a/windirstat/res/0410.Italian/wdsr0410.Italian.vs8.vcproj b/windirstat/res/0410.Italian/wdsr0410.Italian.vs8.vcproj
index 5ffe5e0..80095cf 100644
--- a/windirstat/res/0410.Italian/wdsr0410.Italian.vs8.vcproj
+++ b/windirstat/res/0410.Italian/wdsr0410.Italian.vs8.vcproj
@@ -41,7 +41,6 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				PreprocessorDefinitions="WDS_RESLANG=0x0410;MODNAME=wdsr0410"

 				ExceptionHandling="0"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="2"

diff --git a/windirstat/res/0413.Dutch/wdsr0413.Dutch.vs15.vcxproj b/windirstat/res/0413.Dutch/wdsr0413.Dutch.vs15.vcxproj
index b9a34d4..0181fcd 100644
--- a/windirstat/res/0413.Dutch/wdsr0413.Dutch.vs15.vcxproj
+++ b/windirstat/res/0413.Dutch/wdsr0413.Dutch.vs15.vcxproj
@@ -37,7 +37,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

     <ClCompile>

       <Optimization>Disabled</Optimization>

-      <PreprocessorDefinitions>WDS_RESLANG=0x0413;MODNAME=wdsr0413;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions></PreprocessorDefinitions>

       <MinimalRebuild>false</MinimalRebuild>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

diff --git a/windirstat/res/0413.Dutch/wdsr0413.Dutch.vs8.vcproj b/windirstat/res/0413.Dutch/wdsr0413.Dutch.vs8.vcproj
index 97c7a45..700c8d5 100644
--- a/windirstat/res/0413.Dutch/wdsr0413.Dutch.vs8.vcproj
+++ b/windirstat/res/0413.Dutch/wdsr0413.Dutch.vs8.vcproj
@@ -41,7 +41,6 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				PreprocessorDefinitions="WDS_RESLANG=0x0413;MODNAME=wdsr0413"

 				ExceptionHandling="0"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="2"

diff --git a/windirstat/res/0415.Polish/wdsr0415.Polish.vs15.vcxproj b/windirstat/res/0415.Polish/wdsr0415.Polish.vs15.vcxproj
index 2ef29f1..94cd4fc 100644
--- a/windirstat/res/0415.Polish/wdsr0415.Polish.vs15.vcxproj
+++ b/windirstat/res/0415.Polish/wdsr0415.Polish.vs15.vcxproj
@@ -37,7 +37,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

     <ClCompile>

       <Optimization>Disabled</Optimization>

-      <PreprocessorDefinitions>WDS_RESLANG=0x0415;MODNAME=wdsr0415;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions></PreprocessorDefinitions>

       <MinimalRebuild>false</MinimalRebuild>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

diff --git a/windirstat/res/0415.Polish/wdsr0415.Polish.vs8.vcproj b/windirstat/res/0415.Polish/wdsr0415.Polish.vs8.vcproj
index 18e6a97..52371d9 100644
--- a/windirstat/res/0415.Polish/wdsr0415.Polish.vs8.vcproj
+++ b/windirstat/res/0415.Polish/wdsr0415.Polish.vs8.vcproj
@@ -41,7 +41,6 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				PreprocessorDefinitions="WDS_RESLANG=0x0415;MODNAME=wdsr0415"

 				ExceptionHandling="0"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="2"

diff --git a/windirstat/res/0416.Portuguese_Brazil/wdsr0416.Portuguese_Brazil.vs15.vcxproj b/windirstat/res/0416.Portuguese_Brazil/wdsr0416.Portuguese_Brazil.vs15.vcxproj
index b84cc99..83a39a6 100644
--- a/windirstat/res/0416.Portuguese_Brazil/wdsr0416.Portuguese_Brazil.vs15.vcxproj
+++ b/windirstat/res/0416.Portuguese_Brazil/wdsr0416.Portuguese_Brazil.vs15.vcxproj
@@ -37,7 +37,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

     <ClCompile>

       <Optimization>Disabled</Optimization>

-      <PreprocessorDefinitions>WDS_RESLANG=0x0416;MODNAME=wdsr0416;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions></PreprocessorDefinitions>

       <MinimalRebuild>false</MinimalRebuild>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

diff --git a/windirstat/res/0416.Portuguese_Brazil/wdsr0416.Portuguese_Brazil.vs8.vcproj b/windirstat/res/0416.Portuguese_Brazil/wdsr0416.Portuguese_Brazil.vs8.vcproj
index 391bf48..aad9bfe 100644
--- a/windirstat/res/0416.Portuguese_Brazil/wdsr0416.Portuguese_Brazil.vs8.vcproj
+++ b/windirstat/res/0416.Portuguese_Brazil/wdsr0416.Portuguese_Brazil.vs8.vcproj
@@ -41,7 +41,6 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				PreprocessorDefinitions="WDS_RESLANG=0x0416;MODNAME=wdsr0416"

 				ExceptionHandling="0"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="2"

diff --git a/windirstat/res/0419.Russian/wdsr0419.Russian.vs15.vcxproj b/windirstat/res/0419.Russian/wdsr0419.Russian.vs15.vcxproj
index 3d26d25..5d09a13 100644
--- a/windirstat/res/0419.Russian/wdsr0419.Russian.vs15.vcxproj
+++ b/windirstat/res/0419.Russian/wdsr0419.Russian.vs15.vcxproj
@@ -37,7 +37,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

     <ClCompile>

       <Optimization>Disabled</Optimization>

-      <PreprocessorDefinitions>WDS_RESLANG=0x0419;MODNAME=wdsr0419;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions></PreprocessorDefinitions>

       <MinimalRebuild>false</MinimalRebuild>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

diff --git a/windirstat/res/0419.Russian/wdsr0419.Russian.vs8.vcproj b/windirstat/res/0419.Russian/wdsr0419.Russian.vs8.vcproj
index c23bfca..6f56f86 100644
--- a/windirstat/res/0419.Russian/wdsr0419.Russian.vs8.vcproj
+++ b/windirstat/res/0419.Russian/wdsr0419.Russian.vs8.vcproj
@@ -41,7 +41,6 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				PreprocessorDefinitions="WDS_RESLANG=0x0419;MODNAME=wdsr0419"

 				ExceptionHandling="0"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="2"

diff --git a/windirstat/res/0425.Estonian/wdsr0425.Estonian.vs15.vcxproj b/windirstat/res/0425.Estonian/wdsr0425.Estonian.vs15.vcxproj
index 9f282f4..f0b6e07 100644
--- a/windirstat/res/0425.Estonian/wdsr0425.Estonian.vs15.vcxproj
+++ b/windirstat/res/0425.Estonian/wdsr0425.Estonian.vs15.vcxproj
@@ -37,7 +37,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

     <ClCompile>

       <Optimization>Disabled</Optimization>

-      <PreprocessorDefinitions>WDS_RESLANG=0x0425;MODNAME=wdsr0425;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions></PreprocessorDefinitions>

       <MinimalRebuild>false</MinimalRebuild>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

diff --git a/windirstat/res/0425.Estonian/wdsr0425.Estonian.vs8.vcproj b/windirstat/res/0425.Estonian/wdsr0425.Estonian.vs8.vcproj
index d5de25b..615fba8 100644
--- a/windirstat/res/0425.Estonian/wdsr0425.Estonian.vs8.vcproj
+++ b/windirstat/res/0425.Estonian/wdsr0425.Estonian.vs8.vcproj
@@ -41,7 +41,6 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				PreprocessorDefinitions="WDS_RESLANG=0x0425;MODNAME=wdsr0425"

 				ExceptionHandling="0"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="2"

diff --git a/windirstat/windirstat.vs15.vcxproj b/windirstat/windirstat.vs15.vcxproj
index e6ab953..55a67fb 100644
--- a/windirstat/windirstat.vs15.vcxproj
+++ b/windirstat/windirstat.vs15.vcxproj
@@ -100,7 +100,7 @@
     <ClCompile>

       <Optimization>Disabled</Optimization>

       <AdditionalIncludeDirectories>..;.;..\common;Controls;Dialogs;..\3rdparty\lua\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>MODNAME=wds32D;_DEBUG;VTRACE_TO_CONSOLE=1;VTRACE_DETAIL=2;WINVER=0x0501;_ALLOW_RTCc_IN_STL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>_DEBUG;VTRACE_TO_CONSOLE=1;VTRACE_DETAIL=2;WINVER=0x0501;_ALLOW_RTCc_IN_STL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <MinimalRebuild>false</MinimalRebuild>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <SmallerTypeCheck>true</SmallerTypeCheck>

@@ -114,7 +114,7 @@
       <ProgramDataBaseFileName>$(OutDir)wds32D.pdb</ProgramDataBaseFileName>

     </ClCompile>

     <ResourceCompile>

-      <PreprocessorDefinitions>MODNAME=wds32D;_DEBUG;VTRACE_TO_CONSOLE=1;VTRACE_DETAIL=2;WINVER=0x0501;_ALLOW_RTCc_IN_STL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>_DEBUG;VTRACE_TO_CONSOLE=1;VTRACE_DETAIL=2;WINVER=0x0501;_ALLOW_RTCc_IN_STL;MODNAME=wds32D;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <AdditionalIncludeDirectories>..;.;..\common;Controls;Dialogs;..\3rdparty\lua\src;..;$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

@@ -134,7 +134,7 @@
     <ClCompile>

       <Optimization>Disabled</Optimization>

       <AdditionalIncludeDirectories>..;.;..\common;Controls;Dialogs;..\3rdparty\lua\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>MODNAME=wds64D;_DEBUG;VTRACE_TO_CONSOLE=1;VTRACE_DETAIL=2;WINVER=0x0501;_ALLOW_RTCc_IN_STL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>_DEBUG;VTRACE_TO_CONSOLE=1;VTRACE_DETAIL=2;WINVER=0x0501;_ALLOW_RTCc_IN_STL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <MinimalRebuild>false</MinimalRebuild>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <SmallerTypeCheck>true</SmallerTypeCheck>

@@ -148,7 +148,7 @@
       <ProgramDataBaseFileName>$(OutDir)wds64D.pdb</ProgramDataBaseFileName>

     </ClCompile>

     <ResourceCompile>

-      <PreprocessorDefinitions>MODNAME=wds64D;_DEBUG;VTRACE_TO_CONSOLE=1;VTRACE_DETAIL=2;WINVER=0x0501;_ALLOW_RTCc_IN_STL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>_DEBUG;VTRACE_TO_CONSOLE=1;VTRACE_DETAIL=2;WINVER=0x0501;_ALLOW_RTCc_IN_STL;MODNAME=wds64D;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <AdditionalIncludeDirectories>..;.;..\common;Controls;Dialogs;..\3rdparty\lua\src;..;$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

@@ -169,7 +169,7 @@
       <AdditionalOptions>/Oi /Ot %(AdditionalOptions)</AdditionalOptions>

       <Optimization>Full</Optimization>

       <AdditionalIncludeDirectories>..;.;..\common;Controls;Dialogs;..\3rdparty\lua\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>MODNAME=wds32;NDEBUG;WINVER=0x0501;_ALLOW_RTCc_IN_STL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>NDEBUG;WINVER=0x0501;_ALLOW_RTCc_IN_STL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <MinimalRebuild>false</MinimalRebuild>

       <StringPooling>true</StringPooling>

       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

@@ -182,7 +182,7 @@
       <ProgramDataBaseFileName>$(OutDir)wds32.pdb</ProgramDataBaseFileName>

     </ClCompile>

     <ResourceCompile>

-      <PreprocessorDefinitions>MODNAME=wds32;NDEBUG;WINVER=0x0501;_ALLOW_RTCc_IN_STL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>NDEBUG;WINVER=0x0501;_ALLOW_RTCc_IN_STL;MODNAME=wds32;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <AdditionalIncludeDirectories>..;.;..\common;Controls;Dialogs;..\3rdparty\lua\src;..;$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

@@ -205,7 +205,7 @@
       <AdditionalOptions>/Oi /Ot %(AdditionalOptions)</AdditionalOptions>

       <Optimization>Full</Optimization>

       <AdditionalIncludeDirectories>..;.;..\common;Controls;Dialogs;..\3rdparty\lua\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>MODNAME=wds64;NDEBUG;WINVER=0x0501;_ALLOW_RTCc_IN_STL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>NDEBUG;WINVER=0x0501;_ALLOW_RTCc_IN_STL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <MinimalRebuild>false</MinimalRebuild>

       <StringPooling>true</StringPooling>

       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

@@ -218,7 +218,7 @@
       <ProgramDataBaseFileName>$(OutDir)wds64.pdb</ProgramDataBaseFileName>

     </ClCompile>

     <ResourceCompile>

-      <PreprocessorDefinitions>MODNAME=wds64;NDEBUG;WINVER=0x0501;_ALLOW_RTCc_IN_STL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>NDEBUG;WINVER=0x0501;_ALLOW_RTCc_IN_STL;MODNAME=wds64;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <AdditionalIncludeDirectories>..;.;..\common;Controls;Dialogs;..\3rdparty\lua\src;..;$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

diff --git a/windirstat/windirstat.vs8.vcproj b/windirstat/windirstat.vs8.vcproj
index 8710f6b..6b76050 100644
--- a/windirstat/windirstat.vs8.vcproj
+++ b/windirstat/windirstat.vs8.vcproj
@@ -46,7 +46,7 @@
 				Name="VCCLCompilerTool"

 				Optimization="0"

 				AdditionalIncludeDirectories="..;.;..\common;Controls;Dialogs;..\3rdparty\lua\src"

-				PreprocessorDefinitions="MODNAME=wds32D;_DEBUG;VTRACE_TO_CONSOLE=1;VTRACE_DETAIL=2;WINVER=0x0501"

+				PreprocessorDefinitions="_DEBUG;VTRACE_TO_CONSOLE=1;VTRACE_DETAIL=2;WINVER=0x0501"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="1"

 				EnableFunctionLevelLinking="true"

@@ -64,7 +64,7 @@
 			<Tool

 				Name="VCResourceCompilerTool"

 				AdditionalOptions="/nologo /l409"

-				PreprocessorDefinitions="MODNAME=wds32D;_DEBUG;VTRACE_TO_CONSOLE=1;VTRACE_DETAIL=2;WINVER=0x0501"

+				PreprocessorDefinitions="_DEBUG;VTRACE_TO_CONSOLE=1;VTRACE_DETAIL=2;WINVER=0x0501;MODNAME=wds32D"

 				AdditionalIncludeDirectories="..;.;..\common;Controls;Dialogs;..\3rdparty\lua\src;..;$(IntDir)"

 			/>

 			<Tool

@@ -138,7 +138,7 @@
 				Name="VCCLCompilerTool"

 				Optimization="0"

 				AdditionalIncludeDirectories="..;.;..\common;Controls;Dialogs;..\3rdparty\lua\src"

-				PreprocessorDefinitions="MODNAME=wds64D;_DEBUG;VTRACE_TO_CONSOLE=1;VTRACE_DETAIL=2;WINVER=0x0501"

+				PreprocessorDefinitions="_DEBUG;VTRACE_TO_CONSOLE=1;VTRACE_DETAIL=2;WINVER=0x0501"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="1"

 				EnableFunctionLevelLinking="true"

@@ -156,7 +156,7 @@
 			<Tool

 				Name="VCResourceCompilerTool"

 				AdditionalOptions="/nologo /l409"

-				PreprocessorDefinitions="MODNAME=wds64D;_DEBUG;VTRACE_TO_CONSOLE=1;VTRACE_DETAIL=2;WINVER=0x0501"

+				PreprocessorDefinitions="_DEBUG;VTRACE_TO_CONSOLE=1;VTRACE_DETAIL=2;WINVER=0x0501;MODNAME=wds64D"

 				AdditionalIncludeDirectories="..;.;..\common;Controls;Dialogs;..\3rdparty\lua\src;..;$(IntDir)"

 			/>

 			<Tool

@@ -230,7 +230,7 @@
 				AdditionalOptions="/Oi /Ot"

 				Optimization="3"

 				AdditionalIncludeDirectories="..;.;..\common;Controls;Dialogs;..\3rdparty\lua\src"

-				PreprocessorDefinitions="MODNAME=wds32;NDEBUG;WINVER=0x0501"

+				PreprocessorDefinitions="NDEBUG;WINVER=0x0501"

 				StringPooling="true"

 				RuntimeLibrary="0"

 				EnableFunctionLevelLinking="true"

@@ -248,7 +248,7 @@
 			<Tool

 				Name="VCResourceCompilerTool"

 				AdditionalOptions="/nologo /l409"

-				PreprocessorDefinitions="MODNAME=wds32;NDEBUG;WINVER=0x0501"

+				PreprocessorDefinitions="NDEBUG;WINVER=0x0501;MODNAME=wds32"

 				AdditionalIncludeDirectories="..;.;..\common;Controls;Dialogs;..\3rdparty\lua\src;..;$(IntDir)"

 			/>

 			<Tool

@@ -325,7 +325,7 @@
 				AdditionalOptions="/Oi /Ot"

 				Optimization="3"

 				AdditionalIncludeDirectories="..;.;..\common;Controls;Dialogs;..\3rdparty\lua\src"

-				PreprocessorDefinitions="MODNAME=wds64;NDEBUG;WINVER=0x0501"

+				PreprocessorDefinitions="NDEBUG;WINVER=0x0501"

 				StringPooling="true"

 				RuntimeLibrary="0"

 				EnableFunctionLevelLinking="true"

@@ -343,7 +343,7 @@
 			<Tool

 				Name="VCResourceCompilerTool"

 				AdditionalOptions="/nologo /l409"

-				PreprocessorDefinitions="MODNAME=wds64;NDEBUG;WINVER=0x0501"

+				PreprocessorDefinitions="NDEBUG;WINVER=0x0501;MODNAME=wds64"

 				AdditionalIncludeDirectories="..;.;..\common;Controls;Dialogs;..\3rdparty\lua\src;..;$(IntDir)"

 			/>

 			<Tool