|
@@ -2,7 +2,7 @@
|
|
|
# User Mike Hommey <mh+mozilla@glandium.org>
|
|
|
# Date 1547245284 0
|
|
|
# Node ID e69490bbd056d1fd3516cc44f1b2d88700b6d647
|
|
|
-# Parent 70b16a4831b222d1e9f78bd706aad59e2fee78e1
|
|
|
+# Parent d11a57d66098c5a45b83d34a1c55f9128936d597
|
|
|
Bug 1519325 - Move D3D compiler DLL detection to python configure. r=froydnj
|
|
|
|
|
|
MOZ_D3D_CPU_SUFFIX and MOZ_HAS_WINSDK_WITH_D3D are not used in the
|
|
@@ -46,7 +46,7 @@ diff --git a/build/moz.configure/windows.configure b/build/moz.configure/windows
|
|
|
diff --git a/old-configure.in b/old-configure.in
|
|
|
--- a/old-configure.in
|
|
|
+++ b/old-configure.in
|
|
|
-@@ -2106,132 +2106,20 @@ dnl = Universalchardet
|
|
|
+@@ -2113,132 +2113,20 @@ dnl = Universalchardet
|
|
|
dnl ========================================================
|
|
|
MOZ_ARG_DISABLE_BOOL(universalchardet,
|
|
|
[ --disable-universalchardet
|
|
@@ -180,7 +180,7 @@ diff --git a/old-configure.in b/old-configure.in
|
|
|
AC_MSG_ERROR([Can't find header linux/joystick.h, needed for gamepad support. Please install Linux kernel headers.])
|
|
|
fi
|
|
|
fi
|
|
|
-@@ -3237,22 +3125,16 @@ AC_SUBST(MOZ_UNIVERSALCHARDET)
|
|
|
+@@ -3176,22 +3064,16 @@ AC_SUBST(MOZ_UNIVERSALCHARDET)
|
|
|
AC_SUBST(MOZ_SPELLCHECK)
|
|
|
AC_SUBST(MOZ_ANDROID_ANR_REPORTER)
|
|
|
AC_SUBST(MOZ_CRASHREPORTER)
|
|
@@ -206,15 +206,15 @@ diff --git a/old-configure.in b/old-configure.in
|
|
|
diff --git a/toolkit/moz.configure b/toolkit/moz.configure
|
|
|
--- a/toolkit/moz.configure
|
|
|
+++ b/toolkit/moz.configure
|
|
|
-@@ -1237,17 +1237,16 @@ set_define('MOZ_REFLOW_PERF_DSP', reflow
|
|
|
-
|
|
|
+@@ -1179,17 +1179,16 @@ set_config('MOZ_UNSIGNED_SYSTEM_SCOPE',
|
|
|
|
|
|
# Shader Compiler for Windows (and MinGW Cross Compile)
|
|
|
# ==============================================================
|
|
|
|
|
|
with only_when(compile_environment):
|
|
|
fxc = check_prog('FXC', ('fxc.exe', 'fxc2.exe'), when=depends(target)
|
|
|
- (lambda t: t.kernel == 'WINNT'))
|
|
|
+ (lambda t: t.kernel == 'WINNT'),
|
|
|
+ paths=sdk_bin_path)
|
|
|
- add_old_configure_assignment('FXC', fxc)
|
|
|
wine = check_prog('WINE', ['wine'], when=depends(target, host)
|
|
|
(lambda t, h: t.kernel == 'WINNT' and h.kernel == 'Linux'))
|
|
@@ -224,7 +224,7 @@ diff --git a/toolkit/moz.configure b/toolkit/moz.configure
|
|
|
# ===
|
|
|
|
|
|
with only_when(compile_environment):
|
|
|
-@@ -1444,15 +1443,56 @@ def valid_yasm_version(yasm_version, for
|
|
|
+@@ -1419,16 +1418,57 @@ def valid_yasm_version(yasm_version, for
|
|
|
by_version = sorted(versioned.items(), key=lambda x: x[1])
|
|
|
if by_version:
|
|
|
what, version = by_version[-1]
|
|
@@ -281,3 +281,4 @@ diff --git a/toolkit/moz.configure b/toolkit/moz.configure
|
|
|
|
|
|
set_config("MOZ_CRASHREPORTER_URL",
|
|
|
depends("--with-crashreporter-url")(lambda x: x[0].rstrip("/")))
|
|
|
+
|