diff options
| author | Thomas Herzog <karroffel@users.noreply.github.com> | 2017-06-16 15:57:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-16 15:57:37 +0200 |
| commit | 31dd500d288346f26736e92ec07fa0dbc2195651 (patch) | |
| tree | c05d924513384f269d1a805647b99b37a0246975 | |
| parent | ba32738ec76ed90a4ccc8ae468d29579adf9b954 (diff) | |
| parent | 1f36c2307a60b929d12b21b1119366af50797703 (diff) | |
| download | redot-cpp-31dd500d288346f26736e92ec07fa0dbc2195651.tar.gz | |
Merge pull request #10 from BastiaanOlij/fix_macos_compile
Getting this to compile on mac os x
| -rw-r--r-- | .gitattributes | 6 | ||||
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | SConstruct | 6 |
3 files changed, 13 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9abe13e --- /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 @@ -6,4 +6,5 @@ include/*.hpp *.obj *.pyc *.json +*.dblite bin @@ -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": |