Windows static builds failing due to ANGLE changes, r=vlad
authorNeil Rashbrook <neil@parkwaycc.co.uk>
Sat, 17 Jul 2010 14:22:26 +0200
changeset 47858 ee0f5ab96cf2fe20ba8f558fdf0869b194f83fda
parent 47857 b00bb3a115de35aafd0b2a7b379eaa7127ff65fa
child 47859 f6ea1d942fe226d245fd701ebe682b6294ed9d73
push idunknown
push userunknown
push dateunknown
reviewersvlad
milestone2.0b2pre
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
Windows static builds failing due to ANGLE changes, r=vlad
gfx/angle/angle-shared.patch
gfx/angle/include/GLSLANG/ShaderLang.h
--- a/gfx/angle/angle-shared.patch
+++ b/gfx/angle/angle-shared.patch
@@ -13,17 +13,17 @@ diff --git a/gfx/angle/include/GLSLANG/S
  #define _COMPILER_INTERFACE_INCLUDED_
  
 +#include "nscore.h"
 +
  #include "ResourceLimits.h"
  
  #ifdef _WIN32
 -#define C_DECL __cdecl
-+# ifndef MOZ_ENABLE_LIBXUL
++# if !defined(MOZ_ENABLE_LIBXUL) && !defined(MOZ_STATIC_BUILD)
 +#  ifdef ANGLE_BUILD
 +#   define ANGLE_API NS_EXPORT
 +#  else
 +#   define ANGLE_API NS_IMPORT
 +#  endif
 +# else
 +#  define ANGLE_API  /*nothing*/
 +# endif
--- a/gfx/angle/include/GLSLANG/ShaderLang.h
+++ b/gfx/angle/include/GLSLANG/ShaderLang.h
@@ -6,17 +6,17 @@
 #ifndef _COMPILER_INTERFACE_INCLUDED_
 #define _COMPILER_INTERFACE_INCLUDED_
 
 #include "nscore.h"
 
 #include "ResourceLimits.h"
 
 #ifdef _WIN32
-# ifndef MOZ_ENABLE_LIBXUL
+# if !defined(MOZ_ENABLE_LIBXUL) && !defined(MOZ_STATIC_BUILD)
 #  ifdef ANGLE_BUILD
 #   define ANGLE_API NS_EXPORT
 #  else
 #   define ANGLE_API NS_IMPORT
 #  endif
 # else
 #  define ANGLE_API  /*nothing*/
 # endif