From 0acb780715f8ba5bae7a315669fd467cafda63a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Mon, 12 May 2014 12:06:16 +0300 Subject: [PATCH] Don't define MACOS and LINUX Nothing within the library actually uses these defines for anything any more. If necessary, the built-in defines __APPLE__ and __linux__ can be used instead of these manually added defines. This is similar to how we use _WIN32 instead of manually defining WIN32. --- build/platform-android.mk | 2 +- build/platform-darwin.mk | 2 +- build/platform-linux.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/platform-android.mk b/build/platform-android.mk index 5a161e2a..2fe69fc7 100644 --- a/build/platform-android.mk +++ b/build/platform-android.mk @@ -35,7 +35,7 @@ SYSROOT = $(NDKROOT)/platforms/android-$(NDKLEVEL)/arch-$(ARCH) CXX = $(TOOLCHAINPREFIX)g++ CC = $(TOOLCHAINPREFIX)gcc AR = $(TOOLCHAINPREFIX)ar -CFLAGS += -DLINUX -DANDROID_NDK -fpic --sysroot=$(SYSROOT) +CFLAGS += -DANDROID_NDK -fpic --sysroot=$(SYSROOT) CXXFLAGS += -fno-rtti -fno-exceptions LDFLAGS += --sysroot=$(SYSROOT) SHLDFLAGS = -Wl,--no-undefined -Wl,-z,noexecstack -Wl,-z,relro -Wl,-z,now -Wl,-soname,lib$(PROJECT_NAME).so diff --git a/build/platform-darwin.mk b/build/platform-darwin.mk index 94db60ec..40a03142 100644 --- a/build/platform-darwin.mk +++ b/build/platform-darwin.mk @@ -1,7 +1,7 @@ include build/platform-arch.mk SHAREDLIBSUFFIX = dylib SHARED = -dynamiclib -CFLAGS += -Wall -fPIC -DMACOS -MMD -MP +CFLAGS += -Wall -fPIC -MMD -MP LDFLAGS += -lpthread ifeq ($(ASM_ARCH), x86) ASMFLAGS += -DPREFIX diff --git a/build/platform-linux.mk b/build/platform-linux.mk index 98d5351b..4427d377 100644 --- a/build/platform-linux.mk +++ b/build/platform-linux.mk @@ -1,6 +1,6 @@ include build/platform-arch.mk SHAREDLIBSUFFIX = so -CFLAGS += -Wall -fno-strict-aliasing -fPIC -DLINUX -MMD -MP +CFLAGS += -Wall -fno-strict-aliasing -fPIC -MMD -MP LDFLAGS += -lpthread ifeq ($(ASM_ARCH), x86) ifeq ($(ENABLE64BIT), Yes)