From 90e0fed1039ceb6ad6c46c97f2b27e4053d429a0 Mon Sep 17 00:00:00 2001 From: SpaiR Date: Sun, 24 Jan 2021 12:15:31 +0200 Subject: [PATCH] [Build] Change MacOS build args and gitignore Compile with C++14 with extensions and min MacOS version 10.15 --- .gitignore | 5 +++++ .../src/main/groovy/imgui/generate/GenerateLibs.groovy | 7 ++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 118e30d..abd2d58 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,8 @@ +# macOS +.DS_Store +.AppleDouble +.LSOverride + # Compiled class file *.class diff --git a/buildSrc/src/main/groovy/imgui/generate/GenerateLibs.groovy b/buildSrc/src/main/groovy/imgui/generate/GenerateLibs.groovy index 6a597ea..d8b9b39 100644 --- a/buildSrc/src/main/groovy/imgui/generate/GenerateLibs.groovy +++ b/buildSrc/src/main/groovy/imgui/generate/GenerateLibs.groovy @@ -101,10 +101,11 @@ class GenerateLibs extends DefaultTask { } if (forMac64) { + def minMacOsVersion = '10.15' def mac64 = BuildTarget.newDefaultTarget(BuildTarget.TargetOs.MacOsX, true) - mac64.cppFlags += ' -stdlib=libc++' - mac64.cppFlags = mac64.cppFlags.replaceAll('10.5', '10.9') - mac64.linkerFlags = mac64.linkerFlags.replaceAll('10.5', '10.9') + mac64.cppFlags += ' -std=c++14 -stdlib=libc++' + mac64.cppFlags = mac64.cppFlags.replace('10.5', minMacOsVersion).replace('10.7', minMacOsVersion) + mac64.linkerFlags = mac64.linkerFlags.replace('10.5', minMacOsVersion).replace('10.7', minMacOsVersion) if (withFreeType) { mac64.cppFlags += ' -I/usr/local/include/freetype2 -I/usr/local/include/libpng16 -I/usr/local/include/harfbuzz -I/usr/local/include/glib-2.0 -I/usr/local/lib/glib-2.0/include'