diff --git a/build/Helpers.lua b/build/Helpers.lua index 12ac33e5..c4f47a18 100644 --- a/build/Helpers.lua +++ b/build/Helpers.lua @@ -134,13 +134,13 @@ function SetupNativeProject() filter { "configurations:Debug" } defines { "DEBUG" } - + filter { "configurations:Release" } defines { "NDEBUG" } optimize "On" - + -- Compiler-specific options - + filter { "toolset:msc*" } buildoptions { msvc_buildflags } defines { msvc_cpp_defines } @@ -205,7 +205,7 @@ function IncludeDir(dir) if os.isfile(fp) then include(dep) return - end + end fp = path.join(dep, "premake4.lua") fp = path.join(os.getcwd(), fp) @@ -300,4 +300,4 @@ function AddPlatformSpecificFiles(folder, filename) else print "Unknown architecture" end -end +end \ No newline at end of file diff --git a/src/CppParser/Bindings/CLI/premake5.lua b/src/CppParser/Bindings/CLI/premake5.lua index a652d0c2..68dfa818 100644 --- a/src/CppParser/Bindings/CLI/premake5.lua +++ b/src/CppParser/Bindings/CLI/premake5.lua @@ -1,38 +1,38 @@ include "../../../../build/LLVM.lua" project "CppSharp.Parser.CLI" - + kind "SharedLib" language "C++" SetupNativeProject() SetupLLVMIncludes() - + dependson { "CppSharp.CppParser" } flags { common_flags } clr "On" filter "toolset:msc*" - buildoptions { clang_msvc_flags } + buildoptions { clang_msvc_flags } filter {} - + files { "**.h", "**.cpp", "**.lua" } - + includedirs { "../../../../include/", "../../../../src/CppParser/" } - + filter {} links { "CppSharp.CppParser" } function SetupParser() links { "CppSharp.Parser.CLI" } -end \ No newline at end of file +end \ No newline at end of file diff --git a/src/CppParser/premake5.lua b/src/CppParser/premake5.lua index dfe0b582..f744c9fa 100644 --- a/src/CppParser/premake5.lua +++ b/src/CppParser/premake5.lua @@ -9,13 +9,13 @@ clang_msvc_flags = if EnableNativeProjects() then project "CppSharp.CppParser" - + kind "SharedLib" language "C++" SetupNativeProject() rtti "Off" defines { "DLL_EXPORT" } - + if os.istarget("linux") then linkgroups "On" end @@ -26,7 +26,7 @@ project "CppSharp.CppParser" linkoptions { "/ignore:4099" } -- LNK4099: linking object as if no debug info filter {} - + files { "*.h", @@ -38,7 +38,7 @@ project "CppSharp.CppParser" SetupLLVMIncludes() SetupLLVMLibs() CopyClangIncludes() - + filter {} project "Std-symbols" diff --git a/tests/NamespacesDerived/premake4.lua b/tests/NamespacesDerived/premake4.lua index 9d4a06c9..1b5efdc7 100644 --- a/tests/NamespacesDerived/premake4.lua +++ b/tests/NamespacesDerived/premake4.lua @@ -2,6 +2,6 @@ group "Tests/Namespaces" SetupTestGeneratorProject("NamespacesDerived") SetupTestNativeProject("NamespacesDerived", "NamespacesBase") SetupTestProjectsCSharp("NamespacesDerived", "NamespacesBase") - + project("NamespacesDerived.Tests.CSharp") links { "NamespacesBase.CSharp" } \ No newline at end of file diff --git a/tests/VTables/premake4.lua b/tests/VTables/premake4.lua index f610a50f..fa82a791 100644 --- a/tests/VTables/premake4.lua +++ b/tests/VTables/premake4.lua @@ -1,6 +1,6 @@ group "Tests/VTables" SetupTestCSharp("VTables") - + if EnableNativeProjects() then project("VTables.Native")