Skip to content

Commit

Permalink
Merge pull request jcalifornia#10 from BastiaanOlij/fix_macos_compile
Browse files Browse the repository at this point in the history
Getting this to compile on mac os x
  • Loading branch information
karroffel authored Jun 16, 2017
2 parents ba32738 + 1f36c23 commit 31dd500
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 0 deletions.
6 changes: 6 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
*.c eol=lf
*.cpp eol=lf
*.gd eol=lf
*.tscn eol=lf
*.cfg eol=lf
*.godot eol=lf
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ include/*.hpp
*.obj
*.pyc
*.json
*.dblite
bin
6 changes: 6 additions & 0 deletions SConstruct
Original file line number Diff line number Diff line change
Expand Up @@ -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":
Expand Down Expand Up @@ -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":
Expand Down

0 comments on commit 31dd500

Please sign in to comment.