From e419b12067a6e9ec4ccd16e4038c6ca957e2a275 Mon Sep 17 00:00:00 2001
From: Relintai <relintai@protonmail.com>
Date: Sat, 2 Apr 2022 12:41:05 +0200
Subject: [PATCH] Also removed remnants of the core xatlas.

---
 COPYRIGHT.txt              |  7 -------
 SConstruct                 |  1 -
 platform/frt/detect.py     |  2 +-
 platform/frt_sdl/detect.py |  2 +-
 thirdparty/README.md       | 12 ------------
 5 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/COPYRIGHT.txt b/COPYRIGHT.txt
index 6244a21e4..903fa8c7e 100644
--- a/COPYRIGHT.txt
+++ b/COPYRIGHT.txt
@@ -367,13 +367,6 @@ Comment: Wslay
 Copyright: 2011, 2012, 2015, Tatsuhiro Tsujikawa
 License: Expat
 
-Files: ./thirdparty/xatlas/
-Comment: xatlas
-Copyright: 2018-2020, Jonathan Young
-  2013, Thekla, Inc
-  2006, NVIDIA Corporation, Ignacio Castano
-License: Expat
-
 Files: ./thirdparty/zlib/
 Comment: zlib
 Copyright: 1995-2017, Jean-loup Gailly and Mark Adler
diff --git a/SConstruct b/SConstruct
index b867d3a75..81a89514c 100644
--- a/SConstruct
+++ b/SConstruct
@@ -180,7 +180,6 @@ opts.Add(BoolVariable("builtin_pcre2_with_jit", "Use JIT compiler for the built-
 opts.Add(BoolVariable("builtin_recast", "Use the built-in Recast library", True))
 opts.Add(BoolVariable("builtin_rvo2", "Use the built-in RVO2 library", True))
 opts.Add(BoolVariable("builtin_squish", "Use the built-in squish library", True))
-opts.Add(BoolVariable("builtin_xatlas", "Use the built-in xatlas library", True))
 opts.Add(BoolVariable("builtin_zlib", "Use the built-in zlib library", True))
 opts.Add(BoolVariable("builtin_zstd", "Use the built-in Zstd library", True))
 
diff --git a/platform/frt/detect.py b/platform/frt/detect.py
index 0114222e4..2403ab4fd 100644
--- a/platform/frt/detect.py
+++ b/platform/frt/detect.py
@@ -176,7 +176,7 @@ def configure(env):
 		env.Append(CCFLAGS=['-march=armv8-a'])
 		env.extra_suffix += '.arm64v8'
 
-	env.Append(CFLAGS=['-std=gnu11']) # for libwebp (maybe more in the future)
+	#env.Append(CFLAGS=['-std=gnu11']) # for libwebp (maybe more in the future)
 	env.Append(CPPFLAGS=['-DFRT_ENABLED', '-DUNIX_ENABLED', '-DGLES2_ENABLED', '-DGLES_ENABLED'])
 	env.Append(LIBS=['pthread'])
 	if env['frt_arch'] == 'arm32v6' and version.major == 3 and version.minor >= 4: # TODO find out exact combination
diff --git a/platform/frt_sdl/detect.py b/platform/frt_sdl/detect.py
index 9aa99774c..4b6619a14 100644
--- a/platform/frt_sdl/detect.py
+++ b/platform/frt_sdl/detect.py
@@ -89,7 +89,7 @@ def configure_misc(env):
 	env.Append(CPPPATH=['#platform/frt_sdl'])
 	env.Append(CPPFLAGS=['-DUNIX_ENABLED', '-DGLES2_ENABLED', '-DGLES_ENABLED', '-DJOYDEV_ENABLED'])
 	env.Append(CPPFLAGS=['-DFRT_ENABLED'])
-	env.Append(CFLAGS=['-std=gnu11']) # for libwebp (maybe more in the future)
+	#env.Append(CFLAGS=['-std=gnu11']) # for libwebp (maybe more in the future)
 	env.Append(LIBS=['pthread', 'z', 'dl'])
 	if env['frt_arch'] == 'arm32v6' and version.minor >= 4: # TODO find out exact combination
 		env.Append(LIBS=['atomic'])
diff --git a/thirdparty/README.md b/thirdparty/README.md
index cb2cc9ea6..f09032c8b 100644
--- a/thirdparty/README.md
+++ b/thirdparty/README.md
@@ -509,18 +509,6 @@ File extracted from upstream release tarball:
 - `COPYING`
 
 
-## xatlas
-
-- Upstream: https://github.com/jpcy/xatlas
-- Version: git (ec707faeac3b95e6b416076a9509718cce105b6a, 2021)
-- License: MIT
-
-Files extracted from upstream source:
-
-- `source/xatlas/xatlas.{cpp,h}`
-- `LICENSE`
-
-
 ## zlib
 
 - Upstream: http://www.zlib.net