Skip to content

Commit 67c9b2f

Browse files
committed
Update Makefile after recent buildsystem changes
Fixes #882.
1 parent 1507253 commit 67c9b2f

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

Makefile

+12-12
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,39 @@
1-
GENERATE_BINDINGS = auto
2-
HEADERS = godot-headers
3-
TARGET = debug
4-
USE_CLANG = no
1+
TARGET = template_debug
52

6-
BASE = scons use_llvm=$(USE_CLANG) generate_bindings=$(GENERATE_BINDINGS) target=$(TARGET) headers=$(HEADERS)
3+
BASE = scons target=$(TARGET) $(EXTRA_ARGS)
74
LINUX = $(BASE) platform=linux
85
WINDOWS = $(BASE) platform=windows
96
MACOS = $(BASE) platform=macos
107

118

12-
all:
13-
make linux
14-
make windows
9+
.PHONY: usage
10+
usage:
11+
@echo -e "Specify one of the available targets:\n"
12+
# https://stackoverflow.com/a/26339924
13+
@LC_ALL=C $(MAKE) -pRrq -f $(lastword $(MAKEFILE_LIST)) : 2>/dev/null | awk -v RS= -F: '/(^|\n)# Files(\n|$$)/,/(^|\n)# Finished Make data base/ {if ($$1 !~ "^[#.]") {print $$1}}' | sort | grep -E -v -e '^[^[:alnum:]]' -e '^$@$$'
14+
@echo -e "\nDefine the SCons target with TARGET, and pass extra SCons arguments with EXTRA_ARGS."
1515

1616

1717
linux:
1818
make linux32
1919
make linux64
2020

2121
linux32: SConstruct
22-
$(LINUX) bits=32
22+
$(LINUX) arch=x86_32
2323

2424
linux64: SConstruct
25-
$(LINUX) bits=64
25+
$(LINUX) arch=x86_64
2626

2727

2828
windows:
2929
make windows32
3030
make windows64
3131

3232
windows32: SConstruct
33-
$(WINDOWS) bits=32
33+
$(WINDOWS) arch=x86_32
3434

3535
windows64: SConstruct
36-
$(WINDOWS) bits=64
36+
$(WINDOWS) arch=x86_64
3737

3838

3939
macos: SConstruct

0 commit comments

Comments
 (0)