Rearranged some build flags in premake4.lua

Fixed up produce_vsprojects.cmd to heed the command line arguments
Reverted to original RGB_GET_?VALUE macros to prevent an exception in debug builds
Removing more parts referring to the CHM help file
Removing WEAK_ASSERT
Using --full to produce the checked in solutions
Fixed constant length to account for terminating zero

3 files changed, 201 insertions, 6 deletions

diff --git a/sandbox/luaconf/luaconf.vs15.vcxproj b/sandbox/luaconf/luaconf.vs15.vcxproj
new file mode 100644
index 0000000..0d7d22a
--- /dev/null
+++ b/sandbox/luaconf/luaconf.vs15.vcxproj
@@ -0,0 +1,154 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup Label="ProjectConfigurations">

+    <ProjectConfiguration Include="Release|Win32">

+      <Configuration>Release</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|x64">

+      <Configuration>Release</Configuration>

+      <Platform>x64</Platform>

+    </ProjectConfiguration>

+  </ItemGroup>

+  <PropertyGroup Label="Globals">

+    <ProjectGuid>{66A24518-ACE0-4C57-96B0-FF9F324E0985}</ProjectGuid>

+    <RootNamespace>luaconf</RootNamespace>

+    <Keyword>Win32Proj</Keyword>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

+    <ConfigurationType>Application</ConfigurationType>

+    <UseDebugLibraries>false</UseDebugLibraries>

+    <CharacterSet>Unicode</CharacterSet>

+    <PlatformToolset>v141</PlatformToolset>

+    <UseOfMfc>Static</UseOfMfc>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">

+    <ConfigurationType>Application</ConfigurationType>

+    <UseDebugLibraries>false</UseDebugLibraries>

+    <CharacterSet>Unicode</CharacterSet>

+    <PlatformToolset>v141</PlatformToolset>

+    <UseOfMfc>Static</UseOfMfc>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

+  <ImportGroup Label="ExtensionSettings">

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <PropertyGroup Label="UserMacros" />

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <OutDir>..\..\build.vs2017\</OutDir>

+    <IntDir>..\..\intermediate\vs2017_$(Platform)_$(Configuration)\$(ProjectName)\</IntDir>

+    <TargetName>luaconf32</TargetName>

+    <TargetExt>.exe</TargetExt>

+    <LinkIncremental>false</LinkIncremental>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

+    <OutDir>..\..\build.vs2017\</OutDir>

+    <IntDir>..\..\intermediate\vs2017_$(Platform)_$(Configuration)\$(ProjectName)\</IntDir>

+    <TargetName>luaconf64</TargetName>

+    <TargetExt>.exe</TargetExt>

+    <LinkIncremental>false</LinkIncremental>

+  </PropertyGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <ClCompile>

+      <AdditionalOptions>/Oi /Ot %(AdditionalOptions)</AdditionalOptions>

+      <Optimization>Full</Optimization>

+      <AdditionalIncludeDirectories>..\..\windirstat;..\..\common;..\..\3rdparty\lua\src;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

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

+      <MinimalRebuild>false</MinimalRebuild>

+      <StringPooling>true</StringPooling>

+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

+      <PrecompiledHeader></PrecompiledHeader>

+      <WarningLevel>Level4</WarningLevel>

+      <RuntimeTypeInfo>false</RuntimeTypeInfo>

+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+      <ProgramDataBaseFileName>$(OutDir)luaconf32.pdb</ProgramDataBaseFileName>

+    </ClCompile>

+    <ResourceCompile>

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

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

+    </ResourceCompile>

+    <Link>

+      <SubSystem>Console</SubSystem>

+      <GenerateDebugInformation>DebugFull</GenerateDebugInformation>
+      <FullProgramDatabaseFile>true</FullProgramDatabaseFile>

+      <EnableCOMDATFolding>true</EnableCOMDATFolding>

+      <OptimizeReferences>true</OptimizeReferences>

+      <OutputFile>$(OutDir)luaconf32.exe</OutputFile>

+      <AdditionalLibraryDirectories>$(IntDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

+      <TargetMachine>MachineX86</TargetMachine>

+      <AdditionalOptions>/pdbaltpath:%_PDB% /release %(AdditionalOptions)</AdditionalOptions>

+    </Link>

+    <PreBuildEvent>

+      <Command>copy &quot;$(ProjectDir)lua_conf.lua&quot; &quot;$(TargetDir)\&quot;</Command>

+    </PreBuildEvent>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

+    <ClCompile>

+      <AdditionalOptions>/Oi /Ot %(AdditionalOptions)</AdditionalOptions>

+      <Optimization>Full</Optimization>

+      <AdditionalIncludeDirectories>..\..\windirstat;..\..\common;..\..\3rdparty\lua\src;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

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

+      <MinimalRebuild>false</MinimalRebuild>

+      <StringPooling>true</StringPooling>

+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

+      <PrecompiledHeader></PrecompiledHeader>

+      <WarningLevel>Level4</WarningLevel>

+      <RuntimeTypeInfo>false</RuntimeTypeInfo>

+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+      <ProgramDataBaseFileName>$(OutDir)luaconf64.pdb</ProgramDataBaseFileName>

+    </ClCompile>

+    <ResourceCompile>

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

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

+    </ResourceCompile>

+    <Link>

+      <SubSystem>Console</SubSystem>

+      <GenerateDebugInformation>DebugFull</GenerateDebugInformation>
+      <FullProgramDatabaseFile>true</FullProgramDatabaseFile>

+      <EnableCOMDATFolding>true</EnableCOMDATFolding>

+      <OptimizeReferences>true</OptimizeReferences>

+      <OutputFile>$(OutDir)luaconf64.exe</OutputFile>

+      <AdditionalLibraryDirectories>$(IntDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

+      <TargetMachine>MachineX64</TargetMachine>

+      <AdditionalOptions>/pdbaltpath:%_PDB% /release %(AdditionalOptions)</AdditionalOptions>

+    </Link>

+    <PreBuildEvent>

+      <Command>copy &quot;$(ProjectDir)lua_conf.lua&quot; &quot;$(TargetDir)\&quot;</Command>

+    </PreBuildEvent>

+  </ItemDefinitionGroup>

+  <ItemGroup>

+    <ClInclude Include="lua_conf.h" />

+    <ClInclude Include="Resource.h" />

+    <ClInclude Include="stdafx.h" />

+  </ItemGroup>

+  <ItemGroup>

+    <ClCompile Include="..\..\windirstat\WDS_Lua_C.c">

+      <CompileAs>CompileAsC</CompileAs>

+    </ClCompile>

+    <ClCompile Include="lua_conf.cpp">

+    </ClCompile>

+    <ClCompile Include="stdafx.cpp">

+    </ClCompile>

+  </ItemGroup>

+  <ItemGroup>

+    <ResourceCompile Include="lua_conf.rc" />

+  </ItemGroup>

+  <ItemGroup>

+    <ProjectReference Include="..\..\3rdparty\lua\src\luajit2.vs15.vcxproj">

+      <Project>{9F35C2BB-DF1E-400A-A829-AE34E1C91A70}</Project>

+    </ProjectReference>

+  </ItemGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

+  <ImportGroup Label="ExtensionTargets">

+  </ImportGroup>

+</Project>

diff --git a/sandbox/luaconf/luaconf.vs15.vcxproj.filters b/sandbox/luaconf/luaconf.vs15.vcxproj.filters
new file mode 100644
index 0000000..8563d0a
--- /dev/null
+++ b/sandbox/luaconf/luaconf.vs15.vcxproj.filters
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup>

+    <Filter Include="Source Files">

+      <UniqueIdentifier>{406BDAE1-5AC4-B4BF-4DD4-0ECD5C4E27E7}</UniqueIdentifier>

+    </Filter>

+    <Filter Include="Header Files">

+      <UniqueIdentifier>{7429986C-3649-FF21-6404-3AA834EA5FF5}</UniqueIdentifier>

+    </Filter>

+    <Filter Include="Resource Files">

+      <UniqueIdentifier>{C28FFC99-BC2F-F4B8-2FAD-5D46C8E7AADC}</UniqueIdentifier>

+    </Filter>

+  </ItemGroup>

+  <ItemGroup>

+    <ClInclude Include="lua_conf.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="Resource.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="stdafx.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+  </ItemGroup>

+  <ItemGroup>

+    <ClCompile Include="..\..\windirstat\WDS_Lua_C.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="lua_conf.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="stdafx.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+  </ItemGroup>

+  <ItemGroup>

+    <ResourceCompile Include="lua_conf.rc">

+      <Filter>Resource Files</Filter>

+    </ResourceCompile>

+  </ItemGroup>

+</Project>

diff --git a/sandbox/luaconf/luaconf.vs8.vcproj b/sandbox/luaconf/luaconf.vs8.vcproj
index 0e62022..7786d7e 100644
--- a/sandbox/luaconf/luaconf.vs8.vcproj
+++ b/sandbox/luaconf/luaconf.vs8.vcproj
@@ -47,7 +47,7 @@
 				AdditionalOptions="/Oi /Ot"

 				Optimization="3"

 				AdditionalIncludeDirectories="..\..\windirstat;..\..\common;..\..\3rdparty\lua\src;."

-				PreprocessorDefinitions="NDEBUG;WINVER=0x0500"

+				PreprocessorDefinitions="NDEBUG;WINVER=0x0501"

 				StringPooling="true"

 				RuntimeLibrary="0"

 				EnableFunctionLevelLinking="true"

@@ -65,7 +65,7 @@
 			<Tool

 				Name="VCResourceCompilerTool"

 				AdditionalOptions="/nologo /l409"

-				PreprocessorDefinitions="NDEBUG;WINVER=0x0500"

+				PreprocessorDefinitions="NDEBUG;WINVER=0x0501"

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

 			/>

 			<Tool

@@ -77,7 +77,7 @@
 				AdditionalDependencies="..\..\..\..\build\luajit2_$(PlatformName).lib"

 				OutputFile="$(OutDir)\luaconf32.exe"

 				LinkIncremental="1"

-				AdditionalLibraryDirectories="$(IntDir)"

+				AdditionalLibraryDirectories="$(IntDir);$(IntDir)"

 				GenerateDebugInformation="true"

 				ProgramDataBaseFileName="$(OutDir)\luaconf32.pdb"

 				SubSystem="1"

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

 				Optimization="3"

 				AdditionalIncludeDirectories="..\..\windirstat;..\..\common;..\..\3rdparty\lua\src;."

-				PreprocessorDefinitions="NDEBUG;WINVER=0x0500"

+				PreprocessorDefinitions="NDEBUG;WINVER=0x0501"

 				StringPooling="true"

 				RuntimeLibrary="0"

 				EnableFunctionLevelLinking="true"

@@ -158,7 +158,7 @@
 			<Tool

 				Name="VCResourceCompilerTool"

 				AdditionalOptions="/nologo /l409"

-				PreprocessorDefinitions="NDEBUG;WINVER=0x0500"

+				PreprocessorDefinitions="NDEBUG;WINVER=0x0501"

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

 			/>

 			<Tool

@@ -170,7 +170,7 @@
 				AdditionalDependencies="..\..\..\..\build\luajit2_$(PlatformName).lib"

 				OutputFile="$(OutDir)\luaconf64.exe"

 				LinkIncremental="1"

-				AdditionalLibraryDirectories="$(IntDir)"

+				AdditionalLibraryDirectories="$(IntDir);$(IntDir)"

 				GenerateDebugInformation="true"

 				ProgramDataBaseFileName="$(OutDir)\luaconf64.pdb"

 				SubSystem="1"