945292 - Fix ANGLE compilation on mingw.

Status: RESOLVED FIXED

(Core :: Graphics, defect)

Description

[Jacek Caban]

Attachment: patch.diff

The last update of ANGLE broke mingw build. I fixed it upstream:
https://codereview.appspot.com/13821044/
The fix also contains fix from angle-build-case-sensitive.patch in our tree, so I removed it. I didn't create a new .patch file, because it won't be needed when updating to recent version. Let me know if you want that in tree anyways.

Comment 1

[Jacek Caban]

Attachment: Makefile.in part

Makefile.in part. Other than using SSE2 for ImageSSE2.cpp, this avoids overrding OS_COMPILE_CFLAGS and OS_COMPILE_CXXFLAGS. The problem is that those contain arguments for generating .pp files, which are needed for mingw compilation. I don't see any harm in having MOZILLA_CLIENT defined here.

Comment 2

[Mike Hommey [:glandium]]

Comment on attachment 8341153 [details] [diff] [review]
Makefile.in part

Review of attachment 8341153 [details] [diff] [review]:
-----------------------------------------------------------------

::: gfx/angle/src/libEGL/Makefile.in
@@ +13,5 @@
>  # mozilla-config.h and -DMOZILLA_CLIENT automatically included and defined, so
>  # we just overwrite OS_COMPILE_C(XX)FLAGS.
>  OS_COMPILE_CFLAGS   = $(OS_CPPFLAGS)
>  OS_COMPILE_CXXFLAGS = $(OS_CPPFLAGS)
> +endif

Just remove those four lines.

Comment 3

[Jacek Caban]

OK, pushed with those removed. Thanks for review.

https://hg.mozilla.org/integration/mozilla-inbound/rev/32ad0b1d8a3f

Comment 4

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/mozilla-central/rev/32ad0b1d8a3f

Comment 5

[Kelsey Gilbert [:jgilbert]]

Comment on attachment 8341124 [details] [diff] [review]
patch.diff

Review of attachment 8341124 [details] [diff] [review]:
-----------------------------------------------------------------

We do need a record of this change in the tree, in case we don't upgrade all the way to tip.

::: gfx/angle/angle-build-case-sensitive.patch
@@ -1,5 @@
> -From: Jeff Gilbert <[e-mail]>
> -* * *
> -Bug 840577 - Fix ANGLE cross compilation on case sensitive OSes, relanded
> -
> -diff --git a/gfx/angle/src/libGLESv2/precompiled.h b/gfx/angle/src/libGLESv2/precompiled.h

This is a non-sensical change. You can see this patch applied if you check 'precompiled.h'.

Comment 6

[Jacek Caban]

Attachment: fix with patch file

This version adds a patch file to the tree.

Comment 7

[Jacek Caban]

Thanks for the review.

https://hg.mozilla.org/integration/mozilla-inbound/rev/2cf46ef0d1da

Comment 8

[Carsten Book [:Tomcat]]

https://hg.mozilla.org/mozilla-central/rev/2cf46ef0d1da