X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=SConstruct;h=74a72c842e71ee5e189e4fcb4b99295d141cf12b;hb=a54695ddcb26b4437c361d7df8c93f6b8a990e27;hp=aeb1309d464f692de46d12b6eea5405eb7331d3f;hpb=54053bc8d0dad89a38e2179050831f64a02ea4ec;p=mesa.git

diff --git a/SConstruct b/SConstruct
index aeb1309d464..74a72c842e7 100644
--- a/SConstruct
+++ b/SConstruct
@@ -71,9 +71,8 @@ Help(opts.GenerateHelpText(env))
 #######################################################################
 # Print a deprecation warning for using scons on non-windows
 
-if common.host_platform != 'windows':
-    force = ARGUMENTS['force_scons']
-    if force.lower() not in {'false', 'off', 'none', '0', 'n'}:
+if common.host_platform != 'windows' and env['platform'] != 'windows':
+    if env['force_scons']:
         print("WARNING: Scons is deprecated for non-windows platforms (including cygwin) "
               "please use meson instead.", file=sys.stderr)
     else:
@@ -81,6 +80,13 @@ if common.host_platform != 'windows':
               "please use meson instead. If you really need to use scons you "
               "can add `force_scons=1` to the scons command line.", file=sys.stderr)
         sys.exit(1)
+else:
+    print("WARNING: Scons support is in the process of being deprecated on "
+          "on windows platforms (including mingw). If you haven't already "
+          "please try using meson for windows builds. Be sure to report any "
+          "issues you run into", file=sys.stderr)
+
+
 #######################################################################
 # Environment setup
 
@@ -88,7 +94,7 @@ with open("VERSION") as f:
   mesa_version = f.read().strip()
 env.Append(CPPDEFINES = [
     ('PACKAGE_VERSION', '\\"%s\\"' % mesa_version),
-    ('PACKAGE_BUGREPORT', '\\"https://gitlab.freedesktop.org/mesa/mesa/issues\\"'),
+    ('PACKAGE_BUGREPORT', '\\"https://gitlab.freedesktop.org/mesa/mesa/-/issues\\"'),
 ])
 
 # Includes