Merge pull request #1293 from lioncash/font

externals: Place font data within cpp files

externals/open_source_archives/CMakeLists.txt

@@ -1,3 +1,16 @@
-add_library(open_source_archives INTERFACE)
+add_library(open_source_archives
+    src/FontChineseSimplified.cpp
+    src/FontChineseTraditional.cpp
+    src/FontExtendedChineseSimplified.cpp
+    src/FontKorean.cpp
+    src/FontNintendoExtended.cpp
+    src/FontStandard.cpp
+    include/FontChineseSimplified.h
+    include/FontChineseTraditional.h
+    include/FontExtendedChineseSimplified.h
+    include/FontKorean.h
+    include/FontNintendoExtended.h
+    include/FontStandard.h
+)
 
-target_include_directories(open_source_archives INTERFACE "include/")
+target_include_directories(open_source_archives PUBLIC include)

externals/open_source_archives/include/FontChineseSimplified.h

@@ -0,0 +1,6 @@
+#pragma once
+
+#include <array>
+
+extern const std::array<unsigned char, 217276> FontChineseSimplified;
+

externals/open_source_archives/include/FontChineseTraditional.h

@@ -0,0 +1,6 @@
+#pragma once
+
+#include <array>
+
+extern const std::array<unsigned char, 222236> FontChineseTraditional;
+

externals/open_source_archives/include/FontExtendedChineseSimplified.h

@@ -0,0 +1,6 @@
+#pragma once
+
+#include <array>
+
+extern const std::array<unsigned char, 293516> FontExtendedChineseSimplified;
+

externals/open_source_archives/include/FontKorean.h

@@ -0,0 +1,6 @@
+#pragma once
+
+#include <array>
+
+extern const std::array<unsigned char, 217276> FontKorean;
+

externals/open_source_archives/include/FontNintendoExtended.h

@@ -0,0 +1,6 @@
+#pragma once
+
+#include <array>
+
+extern const std::array<unsigned char, 172064> FontNintendoExtended;
+

externals/open_source_archives/include/FontStandard.h

@@ -0,0 +1,6 @@
+#pragma once
+
+#include <array>
+
+extern const std::array<unsigned char, 217276> FontStandard;
+

src/core/hle/service/ns/pl_u.cpp

@@ -2,12 +2,12 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include <FontChineseSimplified.ttf.h>
-#include <FontChineseTraditional.ttf.h>
-#include <FontExtendedChineseSimplified.ttf.h>
-#include <FontKorean.ttf.h>
-#include <FontNintendoExtended.ttf.h>
-#include <FontStandard.ttf.h>
+#include <FontChineseSimplified.h>
+#include <FontChineseTraditional.h>
+#include <FontExtendedChineseSimplified.h>
+#include <FontKorean.h>
+#include <FontNintendoExtended.h>
+#include <FontStandard.h>
 
 #include "common/common_paths.h"
 #include "common/file_util.h"