From 1f36c2307a60b929d12b21b1119366af50797703 Mon Sep 17 00:00:00 2001 From: BastiaanOlij Date: Fri, 16 Jun 2017 23:50:48 +1000 Subject: [PATCH] Getting this to compile on mac os x --- .gitattributes | 6 ++++++ .gitignore | 1 + SConstruct | 6 ++++++ 3 files changed, 13 insertions(+) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000..9abe13e6 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,6 @@ +*.c eol=lf +*.cpp eol=lf +*.gd eol=lf +*.tscn eol=lf +*.cfg eol=lf +*.godot eol=lf diff --git a/.gitignore b/.gitignore index e511a432..88295ff8 100644 --- a/.gitignore +++ b/.gitignore @@ -6,4 +6,5 @@ include/*.hpp *.obj *.pyc *.json +*.dblite bin diff --git a/SConstruct b/SConstruct index a4305ca9..941f1d7b 100644 --- a/SConstruct +++ b/SConstruct @@ -28,10 +28,15 @@ def add_sources(sources, directory): sources.append(directory + '/' + file) +if platform == "osx": + env.Append(CCFLAGS = ['-g','-O3', '-std=c++14', '-arch', 'x86_64']) + env.Append(LINKFLAGS = ['-arch', 'x86_64', '-framework', 'Cocoa', '-Wl,-undefined,dynamic_lookup']) + if target == "core": if platform == "linux": env.Append(CCFLAGS = ['-g','-O3', '-std=c++14']) + env.Append(CPPPATH=['include/core', godot_headers_path]) if platform == "windows": @@ -79,6 +84,7 @@ elif target == "bindings": env.Append(CCFLAGS = ['-g','-O3', '-std=c++14']) env.Append(LINKFLAGS = ['-Wl,-R,\'$$ORIGIN\'']) + env.Append(CPPPATH=['.', godot_headers_path, 'include', 'include/core']) if platform == "windows":