From b5dd1f2f8616f32adf895aa0d274fd4d25819828 Mon Sep 17 00:00:00 2001 From: Cory McWilliams Date: Wed, 4 Oct 2023 23:41:30 +0000 Subject: [PATCH] Fix macos build again. git-svn-id: https://www.unprompted.com/svn/projects/tildefriends/trunk@4487 ed5197a5-7fde-0310-b194-c3ffbd925b24 --- Makefile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index eeeb2e39..81d0e2c8 100644 --- a/Makefile +++ b/Makefile @@ -11,7 +11,7 @@ PROJECT = tildefriends BUILD_DIR ?= out UNAME_S := $(shell uname -s) UNAME_M := $(shell uname -m) -ifeq ($(UNAME_M),Darwin) +ifeq ($(UNAME_S),Darwin) BUILD_TYPES := macosdebug macosrelease else 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 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 ALL_APP_OBJS := \