fix ANGLE build on Android (don't bother with OS detection with NSPR); bustage fix; a=b
authorVladimir Vukicevic <vladimir@pobox.com>
Mon, 27 Dec 2010 12:25:47 -0800
changeset 59691 699023bb3c9c425e1fb57d58ac7a590232676f31
parent 59690 e9aa8f38d75e527bc6d58d09e19d2f2e75042436
child 59692 2382fb87cbe28d7d0ee7f3dff7d0bd88aa58b013
push idunknown
push userunknown
push dateunknown
reviewersb
milestone2.0b9pre
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
fix ANGLE build on Android (don't bother with OS detection with NSPR); bustage fix; a=b
gfx/angle/README.mozilla
gfx/angle/angle-nspr-misc.patch
gfx/angle/src/compiler/osinclude.h
--- a/gfx/angle/README.mozilla
+++ b/gfx/angle/README.mozilla
@@ -2,16 +2,18 @@ This is the ANGLE project, from http://c
 
 Current revision: r515
 
 Local patches:
     angle-shared.patch - add declspec dllexport/dllimport support on win32
 
     angle-fixes.patch - fix angle issues 51 & 52
 
+    angle-nspr-misc.patch - don't bother with ANGLE_OS detection with NSPR
+
 == Visual Studio Solution Files ==
 
 The VS solution/project files that are used to build ANGLE are built
 with VS2008 in upstream ANGLE.  Because our build machines use VS2005,
 they need to be downgraded using
 http://www.emmet-gray.com/Articles/ProjectConverter.htm before being
 checked in with an ANGLE update.
 
new file mode 100644
--- /dev/null
+++ b/gfx/angle/angle-nspr-misc.patch
@@ -0,0 +1,17 @@
+# HG changeset patch
+# Parent f0e6e4c311dd940147f1589d72cc87f8ce755697
+diff --git a/gfx/angle/src/compiler/osinclude.h b/gfx/angle/src/compiler/osinclude.h
+--- a/gfx/angle/src/compiler/osinclude.h
++++ b/gfx/angle/src/compiler/osinclude.h
+@@ -12,8 +12,10 @@
+ // declares any os-specific functions.
+ //
+ 
+-#if defined(_WIN32) || defined(_WIN64)
++#if defined(ANGLE_USE_NSPR)
++/* no need to define anything when using NSPR */
++#elif defined(_WIN32) || defined(_WIN64)
+ #define ANGLE_OS_WIN
+ #elif defined(__APPLE__) || defined(__linux__) || \
+       defined(__FreeBSD__) || defined(__OpenBSD__) || \
+       defined(__sun)
--- a/gfx/angle/src/compiler/osinclude.h
+++ b/gfx/angle/src/compiler/osinclude.h
@@ -7,17 +7,19 @@
 #ifndef __OSINCLUDE_H
 #define __OSINCLUDE_H
 
 //
 // This file contains contains os-specific datatypes and
 // declares any os-specific functions.
 //
 
-#if defined(_WIN32) || defined(_WIN64)
+#if defined(ANGLE_USE_NSPR)
+/* no need to define anything when using NSPR */
+#elif defined(_WIN32) || defined(_WIN64)
 #define ANGLE_OS_WIN
 #elif defined(__APPLE__) || defined(__linux__) || \
       defined(__FreeBSD__) || defined(__OpenBSD__) || \
       defined(__sun)
 #define ANGLE_OS_POSIX
 #else
 #error Unsupported platform.
 #endif