Relintai/pandemonium_engine
1
0
Fork 0
mirror of https://github.com/Relintai/pandemonium_engine.git synced 2024-11-21 16:37:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Also removed remnants of the core xatlas.

Browse Source
This commit is contained in:
Relintai 2022-04-02 12:41:05 +02:00
parent 8009d32185
commit e419b12067
5 changed files with 2 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
COPYRIGHT.txt
View File

@ -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

1
SConstruct
View File

@ -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))

2
platform/frt/detect.py
View File

@ -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

2
platform/frt_sdl/detect.py
View File

@ -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'])

12
thirdparty/README.md vendored
View File

@ -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