Sara.Sync
/
godot-cpp
mirror of https://github.com/godotengine/godot-cpp
0
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #242 from touilleMan/correct-makefile-args 

Fix Makefile platform and bits arguments passing to scons
pull/243/head
Thomas Herzog 2019-03-10 19:33:49 +01:00 committed by GitHub
parent cfb4dcfad2 0fa4ad290d
commit 422140dd61
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Makefile
View File

@ -1,13 +1,12 @@
GENERATE_BINDINGS = no
HEADERS = godot_headers
TARGET = debug
NAME = godot-cpp
USE_CLANG = no
BASE = scons n=$(NAME) use_llvm=$(USE_CLANG) generate_bindings=$(GENERATE_BINDINGS) target=$(TARGET) headers=$(HEADERS) -j4
LINUX = $(BASE) p=linux
WINDOWS = $(BASE) p=windows
OSX = $(BASE) p=osx
BASE = scons use_llvm=$(USE_CLANG) generate_bindings=$(GENERATE_BINDINGS) target=$(TARGET) headers=$(HEADERS) -j4
LINUX = $(BASE) platform=linux
WINDOWS = $(BASE) platform=windows
OSX = $(BASE) platform=osx
all:
@ -20,10 +19,10 @@ linux:
make linux64
linux32: SConstruct
$(LINUX) a=32
$(LINUX) bits=32
linux64: SConstruct
$(LINUX) a=64
$(LINUX) bits=64
windows:
@ -31,10 +30,10 @@ windows:
make windows64
windows32: SConstruct
$(WINDOWS) a=32
$(WINDOWS) bits=32
windows64: SConstruct
$(WINDOWS) a=64
$(WINDOWS) bits=64
osx:
@ -42,7 +41,7 @@ osx:
make osx64
osx32: SConstruct
$(OSX) a=32
$(OSX) bits=32
osx64: SConstruct
$(OSX) a=64
$(OSX) bits=64