ref: 6607f43aab67702af5b7232a6b7d7aeb5e5dc257
parent: efaa153bb15c78159d8315d45a3e53c391549697
parent: 797a19e3670bd6a447711ce94ea859105be15c7a
author: Ethan Hugg <[email protected]>
date: Tue Jan 21 07:08:13 EST 2014
Merge pull request #185 from mstorsjo/macos-define Define MACOS when building for OS X
--- a/build/platform-darwin.mk
+++ b/build/platform-darwin.mk
@@ -1,6 +1,6 @@
ASM = nasm
-CFLAGS += -Wno-deprecated-declarations -Werror -fPIC
+CFLAGS += -Wno-deprecated-declarations -Werror -fPIC -DMACOS
LDFLAGS += -lpthread
ASMFLAGS += --prefix _ -DNOPREFIX
ifeq ($(ENABLE64BIT), Yes)
--- a/codec/encoder/core/src/wels_preprocess.cpp
+++ b/codec/encoder/core/src/wels_preprocess.cpp
@@ -30,6 +30,7 @@
*
*/
+#ifndef NO_DYNAMIC_VP
#if defined(_WIN32)
#include <windows.h>
#elif defined(MACOS)
@@ -36,6 +37,7 @@
#include "bundleloader.h"
#elif defined(__GNUC__)
#include <dlfcn.h>
+#endif
#endif
#include <stdio.h>