Move LRUCache11

Warzone2100 · Oct 11, 2023 · a8c4fc8 · a8c4fc8
1 parent 25149f0
commit a8c4fc8
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/lib/ivis_opengl/3rdparty/LRUCache11.hpp → 3rdparty/LRUCache11/LRUCache11.hpp b/lib/ivis_opengl/3rdparty/LRUCache11.hpp → 3rdparty/LRUCache11/LRUCache11.hpp
diff --git a/COPYING.NONGPL b/COPYING.NONGPL
@@ -15,6 +15,8 @@ data/base/texpages/page-25-sky-urban.png
 	- MIT, Copyright 2017 Discord, Inc.
 3rdparty/json/*
 	- MIT, Copyright (c) 2013-2018 Niels Lohmann <http://nlohmann.me>
+3rdparty/LRUCache11/*
+	- ISC License, Copyright (c) 2012-22 SAURAV MOHAPATRA (https://github.com/mohaps/lrucache11)
 3rdparty/micro-ecc/*
 	- BSD, Copyright (c) 2014, Kenneth MacKay (https://github.com/kmackay/micro-ecc)
 3rdparty/sha/*
@@ -73,8 +75,6 @@ lib/exceptionhandler/3rdparty/StackWalker.*
 	- BSD 3-Clause License - Copyright (c) 2005 - 2017, Jochen Kalmbach (https://github.com/JochenKalmbach/StackWalker)
 lib/ivis_opengl/3rdparty/etcpak/*
 	- BSD 3-Clause License, Copyright (c) 2013-2021, Bartosz Taudul <[email protected]> (https://github.com/wolfpld/etcpak)
-lib/ivis_opengl/3rdparty/LRUCache11.hpp
-	- ISC License, Copyright (c) 2012-22 SAURAV MOHAPATRA (https://github.com/mohaps/lrucache11)
 lib/ivis_opengl/3rdparty/ska_sort.hpp
 	- Boost Software License 1.0, Copyright Malte Skarupke 2016 (https://github.com/skarupke/ska_sort)
 lib/ivis_opengl/3rdparty/stb_image_resize.h

diff --git a/lib/ivis_opengl/textdraw.cpp b/lib/ivis_opengl/textdraw.cpp
@@ -78,7 +78,7 @@ static float font_colour[4] = {1.f, 1.f, 1.f, 1.f};
 # define USE_NEW_FRIBIDI_API (FRIBIDI_MAJOR_VERSION >= 1)
 #endif // defined(WZ_FRIBIDI_ENABLED)
 
-#include "3rdparty/LRUCache11.hpp"
+#include <LRUCache11/LRUCache11.hpp>
 
 float _horizScaleFactor = 1.0f;
 float _vertScaleFactor = 1.0f;

diff --git a/pkg/copyright b/pkg/copyright
@@ -67,10 +67,6 @@ Files: lib/ivis_opengl/3rdparty/etcpak/*
 Copyright: 2013-2021 Bartosz Taudul <[email protected]>
 License: BSD-3-clause-etcpak
 
-Files: lib/ivis_opengl/3rdparty/LRUCache11.hpp
-Copyright: 2012-2022 SAURAV MOHAPATRA
-License: ISC
-
 Files: lib/ivis_opengl/3rdparty/ska_sort.hpp
 Copyright: 2016 Malte Skarupke
 License: BSL-1.0
@@ -159,6 +155,10 @@ Files: 3rdparty/launchinfo/*
 Copyright: 2020 past-due
 License: Expat
 
+Files: 3rdparty/LRUCache11/*
+Copyright: 2012-2022 SAURAV MOHAPATRA
+License: ISC
+
 Files: 3rdparty/mINI/*
 Copyright: 2018 Danijel Durakovic
 License: Expat