From 597d0a088c08ec480dd85adb18cc103ea33cf46c Mon Sep 17 00:00:00 2001
From: David Korth <gerbilsoft@gerbilsoft.com>
Date: Sun, 19 Jun 2022 00:48:28 -0400
Subject: [PATCH] Move uvector.h from src/librpbase/ to src/.

[rp-download] CMakeLists.txt: Don't link to librpbase. This was only
needed for uvector.h, and now that it's in src/, we don't need to
link in librpbase anymore.
---
 src/libromdata/Console/WiiWAD_p.hpp         | 2 +-
 src/libromdata/Handheld/Nintendo3DS_p.hpp   | 4 ++--
 src/libromdata/stdafx.h                     | 4 ++--
 src/librpbase/CMakeLists.txt                | 1 -
 src/librptexture/fileformat/KhronosKTX2.cpp | 3 +--
 src/librptexture/stdafx.h                   | 4 +++-
 src/rp-download/CMakeLists.txt              | 3 +--
 src/{librpbase => }/uvector.h               | 0
 8 files changed, 10 insertions(+), 11 deletions(-)
 rename src/{librpbase => }/uvector.h (100%)

diff --git a/src/libromdata/Console/WiiWAD_p.hpp b/src/libromdata/Console/WiiWAD_p.hpp
index 56d2e7e43..8b3aba51d 100644
--- a/src/libromdata/Console/WiiWAD_p.hpp
+++ b/src/libromdata/Console/WiiWAD_p.hpp
@@ -29,7 +29,7 @@
 
 // Uninitialized vector class.
 // Reference: http://andreoffringa.org/?q=uvector
-#include "librpbase/uvector.h"
+#include "uvector.h"
 
 namespace LibRpBase {
 #ifdef ENABLE_DECRYPTION
diff --git a/src/libromdata/Handheld/Nintendo3DS_p.hpp b/src/libromdata/Handheld/Nintendo3DS_p.hpp
index b0a3cd7c7..f94786778 100644
--- a/src/libromdata/Handheld/Nintendo3DS_p.hpp
+++ b/src/libromdata/Handheld/Nintendo3DS_p.hpp
@@ -3,7 +3,7 @@
  * Nintendo3DS.hpp: Nintendo 3DS ROM reader. (Private class)               *
  * Handles CCI/3DS, CIA, and SMDH files.                                   *
  *                                                                         *
- * Copyright (c) 2016-2021 by David Korth.                                 *
+ * Copyright (c) 2016-2022 by David Korth.                                 *
  * SPDX-License-Identifier: GPL-2.0-or-later                               *
  ***************************************************************************/
 
@@ -27,7 +27,7 @@ namespace LibRpFile {
 
 // Uninitialized vector class.
 // Reference: http://andreoffringa.org/?q=uvector
-#include "librpbase/uvector.h"
+#include "uvector.h"
 
 namespace LibRomData {
 
diff --git a/src/libromdata/stdafx.h b/src/libromdata/stdafx.h
index 6758e0cd0..6f5d2052e 100644
--- a/src/libromdata/stdafx.h
+++ b/src/libromdata/stdafx.h
@@ -2,7 +2,7 @@
  * ROM Properties Page shell extension. (libromdata)                       *
  * stdafx.h: Common definitions and includes.                              *
  *                                                                         *
- * Copyright (c) 2016-2021 by David Korth.                                 *
+ * Copyright (c) 2016-2022 by David Korth.                                 *
  * SPDX-License-Identifier: GPL-2.0-or-later                               *
  ***************************************************************************/
 
@@ -70,7 +70,7 @@
 
 // Uninitialized vector class.
 // Reference: http://andreoffringa.org/?q=uvector
-#include "librpbase/uvector.h"
+#include "uvector.h"
 
 // librpbase DiscReader
 #include "librpbase/disc/IDiscReader.hpp"
diff --git a/src/librpbase/CMakeLists.txt b/src/librpbase/CMakeLists.txt
index 45d2017f7..11a3063d0 100644
--- a/src/librpbase/CMakeLists.txt
+++ b/src/librpbase/CMakeLists.txt
@@ -92,7 +92,6 @@ SET(${PROJECT_NAME}_SRCS
 	)
 # Headers.
 SET(${PROJECT_NAME}_H
-	uvector.h
 	aligned_malloc.h
 	TextFuncs.hpp
 	TextFuncs_wchar.hpp
diff --git a/src/librptexture/fileformat/KhronosKTX2.cpp b/src/librptexture/fileformat/KhronosKTX2.cpp
index 86ae8351b..571635e98 100644
--- a/src/librptexture/fileformat/KhronosKTX2.cpp
+++ b/src/librptexture/fileformat/KhronosKTX2.cpp
@@ -40,8 +40,7 @@ using std::vector;
 
 // Uninitialized vector class.
 // Reference: http://andreoffringa.org/?q=uvector
-// FIXME: Move out of librpbase?
-#include "librpbase/uvector.h"
+#include "uvector.h"
 
 namespace LibRpTexture {
 
diff --git a/src/librptexture/stdafx.h b/src/librptexture/stdafx.h
index 5a740db6d..542adad2b 100644
--- a/src/librptexture/stdafx.h
+++ b/src/librptexture/stdafx.h
@@ -49,8 +49,10 @@
 #include "librpcpu/bitstuff.h"
 
 #ifdef __cplusplus
+// C++ headers
+#include "uvector.h"
+
 // librpbase C++ headers
-#include "librpbase/uvector.h"
 #include "librpbase/RomFields.hpp"
 #include "librpbase/TextFuncs.hpp"
 
diff --git a/src/rp-download/CMakeLists.txt b/src/rp-download/CMakeLists.txt
index 1b822f15d..7dfc80546 100644
--- a/src/rp-download/CMakeLists.txt
+++ b/src/rp-download/CMakeLists.txt
@@ -102,8 +102,7 @@ SET_WINDOWS_SUBSYSTEM(${PROJECT_NAME} CONSOLE)
 SET_WINDOWS_NO_MANIFEST(${PROJECT_NAME})
 SET_WINDOWS_ENTRYPOINT(${PROJECT_NAME} wmain OFF)
 
-# FIXME: librpbase isn't actually needed; only the headers are.
-TARGET_LINK_LIBRARIES(${PROJECT_NAME} PRIVATE rpsecure rpbase cachecommon)
+TARGET_LINK_LIBRARIES(${PROJECT_NAME} PRIVATE rpsecure cachecommon)
 TARGET_INCLUDE_DIRECTORIES(${PROJECT_NAME}
 	PUBLIC	$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>		# rp-download
 		$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>		# rp-download
diff --git a/src/librpbase/uvector.h b/src/uvector.h
similarity index 100%
rename from src/librpbase/uvector.h
rename to src/uvector.h