Updated Premake env for AGS 5.1

Author: Rys Sommefeldt

premake/ags_update_vs_files.bat

@@ -30,23 +30,27 @@ cd %startdir%
 pause
 goto :EOF
 
-:: run premake for vs2013 and vs2015
+:: run premake for vs2013, vs2015, and vs2017
 :createvsfiles
 ..\..\premake\premake5.exe vs2013
 ..\..\premake\premake5.exe vs2015
+..\..\premake\premake5.exe vs2017
 goto :EOF
 
 :: run premake for dxut
 :createdxutvsfiles
 ..\..\..\premake\premake5.exe vs2013
 ..\..\..\premake\premake5.exe vs2015
+..\..\..\premake\premake5.exe vs2017
 goto :EOF
 
 :: delete unnecessary sln files
 :cleandxutslnfiles
 del /f /q Core\DXUT_2013.sln
 del /f /q Core\DXUT_2015.sln
+del /f /q Core\DXUT_2017.sln
 
 del /f /q Optional\DXUTOpt_2013.sln
 del /f /q Optional\DXUTOpt_2015.sln
+del /f /q Optional\DXUTOpt_2017.sln
 goto :EOF

premake/amd_premake_util.lua

@@ -18,25 +18,20 @@ _AMD_AGS_BUILD_SUBDIRS = "%{_AMD_ACTION_ALL_CAPS}/%{cfg.platform}/%{cfg.buildcfg
 _AMD_AGS_BUILD_SUBDIRS_BACKSLASH = "%{_AMD_ACTION_ALL_CAPS}\\%{cfg.platform}\\%{cfg.buildcfg}"
 
 -- Specify WindowsTargetPlatformVersion here for VS2015
-_AMD_WIN_SDK_VERSION = "8.1"
+_AMD_WIN_SDK_VERSION = "10.0.15063.0"
 
 -- command lines for Visual Studio build events
-_AMD_COPY_WIN_8_0_SDK_REDIST_TO_BIN = "if not exist \"..\\bin\\d3dcompiler_46.dll\" if exist \"$(ProgramFiles)\\Windows Kits\\8.0\\Redist\\D3D\\x64\\d3dcompiler_46.dll\" xcopy \"$(ProgramFiles)\\Windows Kits\\8.0\\Redist\\D3D\\x64\\d3dcompiler_46.dll\" \"..\\bin\" /H /R /Y > nul"
 _AMD_COPY_WIN_8_1_SDK_REDIST_TO_BIN = "if not exist \"..\\bin\\d3dcompiler_47.dll\" if exist \"$(ProgramFiles)\\Windows Kits\\8.1\\Redist\\D3D\\x64\\d3dcompiler_47.dll\" xcopy \"$(ProgramFiles)\\Windows Kits\\8.1\\Redist\\D3D\\x64\\d3dcompiler_47.dll\" \"..\\bin\" /H /R /Y > nul"
 _AMD_COPY_AGS_RLS_DLL_TO_BIN = "xcopy \"..\\..\\%{_AMD_AGS_DIRECTORY_NAME}\\lib\\amd_ags_x64.dll\"  \"..\\bin\" /H /R /Y > nul"
 
 -- these are for copying the updated import lib and dll into the shared location when builing AGS DLLs
 _AMD_COPY_AGS_DLL        = "xcopy \"..\\lib\\%{_AMD_AGS_BUILD_SUBDIRS_BACKSLASH}\\$(TargetName).dll\"  \"..\\lib\" /H /R /Y > nul"
-_AMD_COPY_AGS_IMPORT_LIB = "xcopy \"..\\lib\\%{_AMD_AGS_BUILD_SUBDIRS_BACKSLASH}\\$(TargetName).lib\"  \"..\\lib\" /H /R /Y > nul"
+_AMD_COPY_AGS_LIB = "xcopy \"..\\lib\\%{_AMD_AGS_BUILD_SUBDIRS_BACKSLASH}\\*.lib\"  \"..\\lib\" /H /R /Y > nul"
 
 -- post-build commands for samples
 function amdAgsSamplePostbuildCommands(copyAgsDllToLocalBin)
    local commands = {}
    local doCopyAgsDllToLocalBin = copyAgsDllToLocalBin or false
-   -- for VS2012 and earlier, copy d3dcompiler_46.dll from the 8.0 SDK to the local bin directory
-   if _ACTION <= "vs2012" then
-      table.insert(commands, _AMD_COPY_WIN_8_0_SDK_REDIST_TO_BIN)
-   end
    -- copy d3dcompiler_47.dll from the 8.1 SDK to the local bin directory
    table.insert(commands, _AMD_COPY_WIN_8_1_SDK_REDIST_TO_BIN)
    if doCopyAgsDllToLocalBin then
@@ -51,6 +46,6 @@ function amdAgsLibPostbuildCommands()
    local commands = {}
    -- copy the AGS DLL and import library into the lib directory
    table.insert(commands, _AMD_COPY_AGS_DLL)
-   table.insert(commands, _AMD_COPY_AGS_IMPORT_LIB)
+   table.insert(commands, _AMD_COPY_AGS_LIB)
    return commands
 end