From 77c871c79433c75d99cf246fdc0b4dec193ea083 Mon Sep 17 00:00:00 2001 From: Joao Matos Date: Wed, 24 Aug 2016 17:27:29 +0100 Subject: [PATCH] Update build files to Premake5. --- build/Helpers.lua | 1 - build/Tests.lua | 5 ++--- build/premake5.lua | 4 +++- src/Core/{premake4.lua => premake5.lua} | 6 +++--- src/CppParser/Bindings/{premake4.lua => premake5.lua} | 9 +++++---- src/CppParser/{premake4.lua => premake5.lua} | 1 - src/Generator/premake5.lua | 4 ++-- src/Runtime/premake5.lua | 5 +++-- 8 files changed, 18 insertions(+), 17 deletions(-) rename src/Core/{premake4.lua => premake5.lua} (88%) rename src/CppParser/Bindings/{premake4.lua => premake5.lua} (97%) rename src/CppParser/{premake4.lua => premake5.lua} (96%) diff --git a/build/Helpers.lua b/build/Helpers.lua index dd46e15c..0c86e0f0 100644 --- a/build/Helpers.lua +++ b/build/Helpers.lua @@ -19,7 +19,6 @@ objsdir = path.join(builddir, "obj", "%{cfg.buildcfg}_%{cfg.platform}"); libdir = path.join(builddir, "lib", "%{cfg.buildcfg}_%{cfg.platform}"); gendir = path.join(builddir, "gen"); -common_flags = { "Unicode", "Symbols" } msvc_buildflags = { "/wd4267" } gcc_buildflags = { "-std=c++11 -fpermissive" } diff --git a/build/Tests.lua b/build/Tests.lua index aa050f46..a119b99e 100644 --- a/build/Tests.lua +++ b/build/Tests.lua @@ -32,10 +32,10 @@ function SetupTestCLI(name) end function SetupManagedTestProject() + SetupManagedProject() kind "SharedLib" language "C#" - flags { "Unsafe" } - SetupManagedProject() + clr "Unsafe" end function SetupTestGeneratorProject(name, depends) @@ -87,7 +87,6 @@ function SetupTestNativeProject(name, depends) kind "SharedLib" language "C++" - flags { common_flags } files { "**.h", "**.cpp" } if depends ~= nil then diff --git a/build/premake5.lua b/build/premake5.lua index be0e2c5e..c42d029d 100644 --- a/build/premake5.lua +++ b/build/premake5.lua @@ -13,7 +13,9 @@ solution "CppSharp" configurations { "Debug", "Release" } platforms { "x32", "x64" } - flags { common_flags } + + characterset "Unicode" + symbols "On" location (builddir) objdir (objsdir) diff --git a/src/Core/premake4.lua b/src/Core/premake5.lua similarity index 88% rename from src/Core/premake4.lua rename to src/Core/premake5.lua index cbe8ad69..c572a2f3 100644 --- a/src/Core/premake4.lua +++ b/src/Core/premake5.lua @@ -1,10 +1,10 @@ project "CppSharp" + SetupManagedProject() + kind "SharedLib" language "C#" - flags { "Unsafe"} - - SetupManagedProject() + clr "Unsafe" files { "**.cs" } links diff --git a/src/CppParser/Bindings/premake4.lua b/src/CppParser/Bindings/premake5.lua similarity index 97% rename from src/CppParser/Bindings/premake4.lua rename to src/CppParser/Bindings/premake5.lua index 56286623..d2030df1 100644 --- a/src/CppParser/Bindings/premake4.lua +++ b/src/CppParser/Bindings/premake5.lua @@ -11,13 +11,14 @@ project "CppSharp.Parser.Gen" SetupParser() project "CppSharp.Parser.CSharp" - + + SetupManagedProject() + kind "SharedLib" language "C#" - SetupManagedProject() - + clr "Unsafe" + dependson { "CppSharp.CppParser" } - flags { common_flags, "Unsafe" } files { diff --git a/src/CppParser/premake4.lua b/src/CppParser/premake5.lua similarity index 96% rename from src/CppParser/premake4.lua rename to src/CppParser/premake5.lua index 50312391..2a71088d 100644 --- a/src/CppParser/premake4.lua +++ b/src/CppParser/premake5.lua @@ -13,7 +13,6 @@ project "CppSharp.CppParser" kind "SharedLib" language "C++" SetupNativeProject() - flags { common_flags } rtti "Off" configuration "vs*" diff --git a/src/Generator/premake5.lua b/src/Generator/premake5.lua index 63a96a8b..e8f703b3 100644 --- a/src/Generator/premake5.lua +++ b/src/Generator/premake5.lua @@ -1,11 +1,11 @@ project "CppSharp.Generator" + SetupManagedProject() + kind "SharedLib" language "C#" location "." - SetupManagedProject() - files { "**.cs", "**verbs.txt" } excludes { "Filter.cs" } diff --git a/src/Runtime/premake5.lua b/src/Runtime/premake5.lua index 6d042ca4..f5be4358 100644 --- a/src/Runtime/premake5.lua +++ b/src/Runtime/premake5.lua @@ -1,8 +1,9 @@ project "CppSharp.Runtime" - kind "SharedLib" SetupManagedProject() - flags { "Unsafe" } + + kind "SharedLib" + clr "Unsafe" files { "**.cs" } links { "System" }