[Build] Change MacOS build args and gitignore
Compile with C++14 with extensions and min MacOS version 10.15
This commit is contained in:
1 parent
d7a87ed508
commit
90e0fed103
2 files changed
+9
-3
No files matched your search
@@ -1,3 +1,8 @@
|
|||||||
|
# macOS
|
||||||
|
.DS_Store
|
||||||
|
.AppleDouble
|
||||||
|
.LSOverride
|
||||||
|
|
||||||
# Compiled class file
|
# Compiled class file
|
||||||
*.class
|
*.class
|
||||||
|
|
||||||
|
|||||||
@@ -101,10 +101,11 @@ class GenerateLibs extends DefaultTask {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (forMac64) {
|
if (forMac64) {
|
||||||
|
def minMacOsVersion = '10.15'
|
||||||
def mac64 = BuildTarget.newDefaultTarget(BuildTarget.TargetOs.MacOsX, true)
|
def mac64 = BuildTarget.newDefaultTarget(BuildTarget.TargetOs.MacOsX, true)
|
||||||
mac64.cppFlags += ' -stdlib=libc++'
|
mac64.cppFlags += ' -std=c++14 -stdlib=libc++'
|
||||||
mac64.cppFlags = mac64.cppFlags.replaceAll('10.5', '10.9')
|
mac64.cppFlags = mac64.cppFlags.replace('10.5', minMacOsVersion).replace('10.7', minMacOsVersion)
|
||||||
mac64.linkerFlags = mac64.linkerFlags.replaceAll('10.5', '10.9')
|
mac64.linkerFlags = mac64.linkerFlags.replace('10.5', minMacOsVersion).replace('10.7', minMacOsVersion)
|
||||||
|
|
||||||
if (withFreeType) {
|
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'
|
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'
|
||||||
|
|||||||
Reference in new issue
Block a user