From e2e7079866451098d551c74fe20c72a6c02f133f Mon Sep 17 00:00:00 2001 From: Joao Matos Date: Wed, 31 Aug 2016 16:22:58 +0100 Subject: [PATCH] Factor .NET framework build version setup code to fix a bug for dependent projects. --- build/Helpers.lua | 15 +++++++++++++++ build/premake5.lua | 13 ------------- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/build/Helpers.lua b/build/Helpers.lua index 3d34ac83..369b7dc3 100644 --- a/build/Helpers.lua +++ b/build/Helpers.lua @@ -72,6 +72,21 @@ function SetupManagedProject() location "." configuration(c) end + + if action == "vs2015" then + + configuration "vs2015" + framework "4.6" + + end + + configuration "vs2013" + framework "4.5" + + configuration "vs2012" + framework "4.5" + + configuration {} end function IncludeDir(dir) diff --git a/build/premake5.lua b/build/premake5.lua index c42d029d..a1b1dd18 100644 --- a/build/premake5.lua +++ b/build/premake5.lua @@ -22,19 +22,6 @@ solution "CppSharp" targetdir (libdir) debugdir (bindir) - if action == "vs2015" then - - configuration "vs2015" - framework "4.6" - - end - - configuration "vs2013" - framework "4.5" - - configuration "vs2012" - framework "4.5" - configuration "windows" defines { "WINDOWS" }