From 8e869f76275253726da5a712de4d4a1b4de22ca2 Mon Sep 17 00:00:00 2001 From: Craig Donner Date: Tue, 24 Nov 2015 15:07:09 -0800 Subject: Adds support for buliding protobuf with emscripten; we just needed the proper platform define used in the right place. --- src/google/protobuf/stubs/platform_macros.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/google/protobuf/stubs/platform_macros.h') diff --git a/src/google/protobuf/stubs/platform_macros.h b/src/google/protobuf/stubs/platform_macros.h index 338d22f0..5cde8f4e 100644 --- a/src/google/protobuf/stubs/platform_macros.h +++ b/src/google/protobuf/stubs/platform_macros.h @@ -97,6 +97,8 @@ GOOGLE_PROTOBUF_PLATFORM_ERROR #if TARGET_OS_IPHONE #define GOOGLE_PROTOBUF_OS_IPHONE #endif +#elif defined(__EMSCRIPTEN__) +#define GOOGLE_PROTOBUF_OS_EMSCRIPTEN #elif defined(__native_client__) #define GOOGLE_PROTOBUF_OS_NACL #elif defined(sun) -- cgit v1.2.3