ref: 0acb780715f8ba5bae7a315669fd467cafda63a5
parent: 6b9167199f96ce25977aceb0cf8460a4d1d6cee2
author: Martin Storsjö <[email protected]>
date: Mon May 12 08:06:16 EDT 2014
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.
--- a/build/platform-android.mk
+++ b/build/platform-android.mk
@@ -35,7 +35,7 @@
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
--- 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
--- 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)