Trying to setup Travis CI #3 - "Windows-x64" platform renamed back to "x64" because AppVeyor doesn't allow to enter custom platform name.

This commit is contained in:
Adam Sawicki 2017-08-21 16:04:40 +02:00
parent 59a3e7e885
commit bf00f133df

View File

@ -4,12 +4,12 @@ _SUFFIX = _ACTION
workspace "VulkanSample" workspace "VulkanSample"
configurations { "Debug", "Release" } configurations { "Debug", "Release" }
platforms { "Windows-x64", "Linux-x64" } platforms { "x64", "Linux-x64" }
location "../build" location "../build"
filename ("VulkanSample_" .. _SUFFIX) filename ("VulkanSample_" .. _SUFFIX)
startproject "VulkanSample" startproject "VulkanSample"
filter "platforms:Windows-x64" filter "platforms:x64"
system "Windows" system "Windows"
architecture "x64" architecture "x64"
includedirs { "../third_party/mathfu-1.1.0/include", "$(VULKAN_SDK)/Include" } includedirs { "../third_party/mathfu-1.1.0/include", "$(VULKAN_SDK)/Include" }
@ -44,7 +44,7 @@ optimize "On"
flags { "LinkTimeOptimization" } flags { "LinkTimeOptimization" }
targetsuffix ("_Release_" .. _SUFFIX) targetsuffix ("_Release_" .. _SUFFIX)
filter { "platforms:Windows-x64" } filter { "platforms:x64" }
defines { "WIN32", "_CONSOLE", "PROFILE", "_WINDOWS", "_WIN32_WINNT=0x0601" } defines { "WIN32", "_CONSOLE", "PROFILE", "_WINDOWS", "_WIN32_WINNT=0x0601" }
links { "vulkan-1" } links { "vulkan-1" }
@ -52,9 +52,8 @@ filter { "platforms:Linux-x64" }
buildoptions { "-std=c++0x" } buildoptions { "-std=c++0x" }
links { "vulkan" } links { "vulkan" }
filter { "configurations:Debug", "platforms:Windows-x64" } filter { "configurations:Debug", "platforms:x64" }
buildoptions { "/MDd" } buildoptions { "/MDd" }
filter { "configurations:Release", "platforms:Windows-x64" } filter { "configurations:Release", "platforms:Windows-x64" }
buildoptions { "/MD" } buildoptions { "/MD" }