Fix macos build again.
git-svn-id: https://www.unprompted.com/svn/projects/tildefriends/trunk@4487 ed5197a5-7fde-0310-b194-c3ffbd925b24
This commit is contained in:
parent
ec83f9c747
commit
b5dd1f2f86
7
Makefile
7
Makefile
@ -11,7 +11,7 @@ PROJECT = tildefriends
|
|||||||
BUILD_DIR ?= out
|
BUILD_DIR ?= out
|
||||||
UNAME_S := $(shell uname -s)
|
UNAME_S := $(shell uname -s)
|
||||||
UNAME_M := $(shell uname -m)
|
UNAME_M := $(shell uname -m)
|
||||||
ifeq ($(UNAME_M),Darwin)
|
ifeq ($(UNAME_S),Darwin)
|
||||||
BUILD_TYPES := macosdebug macosrelease
|
BUILD_TYPES := macosdebug macosrelease
|
||||||
else
|
else
|
||||||
BUILD_TYPES := debug release windebug winrelease androiddebug androidrelease androiddebug-x86 androidrelease-x86 androiddebug-x86_64 androidrelease-x86_64 androiddebug-armv7a androidrelease-armv7a
|
BUILD_TYPES := debug release windebug winrelease androiddebug androidrelease androiddebug-x86 androidrelease-x86 androiddebug-x86_64 androidrelease-x86_64 androiddebug-armv7a androidrelease-armv7a
|
||||||
@ -476,7 +476,10 @@ $(ANDROID_TARGETS): LDFLAGS += \
|
|||||||
|
|
||||||
unix: debug release
|
unix: debug release
|
||||||
win: windebug winrelease
|
win: windebug winrelease
|
||||||
all: $(BUILD_TYPES) out/TildeFriends-debug.apk out/TildeFriends-release.apk
|
all: $(BUILD_TYPES)
|
||||||
|
ifeq ($(UNAME_S),Linux)
|
||||||
|
all: out/TildeFriends-debug.apk out/TildeFriends-release.apk
|
||||||
|
endif
|
||||||
.PHONY: all win unix
|
.PHONY: all win unix
|
||||||
|
|
||||||
ALL_APP_OBJS := \
|
ALL_APP_OBJS := \
|
||||||
|
Loading…
Reference in New Issue
Block a user