diff -r 000000000000 -r 6474c204b198 gfx/angle/src/libGLESv2/Makefile.in --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gfx/angle/src/libGLESv2/Makefile.in Wed Dec 31 06:09:35 2014 +0100 @@ -0,0 +1,25 @@ +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +ifndef GNU_CC +# Enable unwind semantics for exception handlers in response to warning C4530. +OS_CPPFLAGS += -EHsc +else +OS_CXXFLAGS := $(filter-out -fno-exceptions,$(OS_CXXFLAGS)) -fexceptions +endif + +# End build_angle.gypi transcription. + +include $(topsrcdir)/config/rules.mk + +ifndef MOZ_HAS_WINSDK_WITH_D3D +CXXFLAGS += -I'$(MOZ_DIRECTX_SDK_PATH)/include' +endif + +ifdef MOZ_HAS_WINSDK_WITH_D3D +EXTRA_DSO_LDOPTS = $(call EXPAND_LIBNAME,d3d9 dxguid) +else +EXTRA_DSO_LDOPTS = $(call EXPAND_LIBNAME_PATH,d3d9 dxguid,'$(MOZ_DIRECTX_SDK_PATH)/lib/$(MOZ_DIRECTX_SDK_CPU_SUFFIX)') +endif +EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME,delayimp)