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
commit 422140dd61
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 11 deletions

View File

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