From 9b0a4c378b7cf5a213577d37f9a7568befd839a7 Mon Sep 17 00:00:00 2001 From: Rob Loach Date: Thu, 15 Feb 2024 15:38:02 -0500 Subject: [PATCH 1/5] pntr: Enable UTF-8 support --- cmake/FetchDependencies.cmake | 2 +- src/libretro/CMakeLists.txt | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/cmake/FetchDependencies.cmake b/cmake/FetchDependencies.cmake index a82e4e88..c16acd8e 100644 --- a/cmake/FetchDependencies.cmake +++ b/cmake/FetchDependencies.cmake @@ -42,7 +42,7 @@ fetch_dependency("libretro-common" "https://github.com/libretro/libretro-common. fetch_dependency("embed-binaries" "https://github.com/andoalon/embed-binaries.git" "21f28ca") fetch_dependency(glm "https://github.com/g-truc/glm" "33b0eb9") fetch_dependency(libslirp "https://github.com/JesseTG/libslirp-mirror.git" "44e7877") -fetch_dependency(pntr "https://github.com/robloach/pntr" "a3dc08c") +fetch_dependency(pntr "https://github.com/robloach/pntr" "f9bbbd0") fetch_dependency(fmt "https://github.com/fmtlib/fmt" "10.2.1") fetch_dependency(yamc "https://github.com/yohhoy/yamc" "4e015a7") fetch_dependency(span-lite "https://github.com/martinmoene/span-lite" "bc08bf8") diff --git a/src/libretro/CMakeLists.txt b/src/libretro/CMakeLists.txt index 7dff6ac8..7125080d 100644 --- a/src/libretro/CMakeLists.txt +++ b/src/libretro/CMakeLists.txt @@ -224,12 +224,11 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/version.hpp.in" "${CMAKE_CURRENT_BIN target_compile_definitions(melondsds_libretro PUBLIC GLM_ENABLE_EXPERIMENTAL - PNTR_ENABLE_DEFAULT_FONT - PNTR_ENABLE_FILTER_SMOOTH PNTR_ENABLE_TTF PNTR_ENABLE_VARGS PNTR_PIXELFORMAT_ARGB PNTR_ENABLE_MATH + PNTR_ENABLE_UTF8 STB_IMAGE_STATIC # To avoid using any dynamically-linked STB implementations ) From 5ba87281f15a8d3f45eaf2167319c6035f0bc6bd Mon Sep 17 00:00:00 2001 From: Rob Loach Date: Fri, 19 Apr 2024 00:24:35 -0400 Subject: [PATCH 2/5] Update pntr --- cmake/FetchDependencies.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/FetchDependencies.cmake b/cmake/FetchDependencies.cmake index c16acd8e..d1b8a7c4 100644 --- a/cmake/FetchDependencies.cmake +++ b/cmake/FetchDependencies.cmake @@ -42,7 +42,7 @@ fetch_dependency("libretro-common" "https://github.com/libretro/libretro-common. fetch_dependency("embed-binaries" "https://github.com/andoalon/embed-binaries.git" "21f28ca") fetch_dependency(glm "https://github.com/g-truc/glm" "33b0eb9") fetch_dependency(libslirp "https://github.com/JesseTG/libslirp-mirror.git" "44e7877") -fetch_dependency(pntr "https://github.com/robloach/pntr" "f9bbbd0") +fetch_dependency(pntr "https://github.com/robloach/pntr" "2632c0a") fetch_dependency(fmt "https://github.com/fmtlib/fmt" "10.2.1") fetch_dependency(yamc "https://github.com/yohhoy/yamc" "4e015a7") fetch_dependency(span-lite "https://github.com/martinmoene/span-lite" "bc08bf8") From dfab3034378003c85123d0af72b450c194bf2fbe Mon Sep 17 00:00:00 2001 From: Rob Loach Date: Fri, 19 Apr 2024 00:33:13 -0400 Subject: [PATCH 3/5] Updte --- src/libretro/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/libretro/CMakeLists.txt b/src/libretro/CMakeLists.txt index 0110729c..40a5a133 100644 --- a/src/libretro/CMakeLists.txt +++ b/src/libretro/CMakeLists.txt @@ -226,6 +226,8 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/version.hpp.in" "${CMAKE_CURRENT_BIN target_compile_definitions(melondsds_libretro PUBLIC GLM_ENABLE_EXPERIMENTAL + PNTR_ENABLE_DEFAULT_FONT + PNTR_ENABLE_FILTER_SMOOTH PNTR_ENABLE_TTF PNTR_ENABLE_VARGS PNTR_PIXELFORMAT_ARGB From 6059d7a0ec73be31e0a8a6982d825e8b1efcd31a Mon Sep 17 00:00:00 2001 From: Rob Loach Date: Sat, 20 Apr 2024 04:33:47 -0400 Subject: [PATCH 4/5] Add sample UTF-8 characters --- cmake/FetchDependencies.cmake | 2 +- src/libretro/message/error.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/FetchDependencies.cmake b/cmake/FetchDependencies.cmake index d1b8a7c4..0e355d03 100644 --- a/cmake/FetchDependencies.cmake +++ b/cmake/FetchDependencies.cmake @@ -42,7 +42,7 @@ fetch_dependency("libretro-common" "https://github.com/libretro/libretro-common. fetch_dependency("embed-binaries" "https://github.com/andoalon/embed-binaries.git" "21f28ca") fetch_dependency(glm "https://github.com/g-truc/glm" "33b0eb9") fetch_dependency(libslirp "https://github.com/JesseTG/libslirp-mirror.git" "44e7877") -fetch_dependency(pntr "https://github.com/robloach/pntr" "2632c0a") +fetch_dependency(pntr "https://github.com/robloach/pntr" "55082e7") fetch_dependency(fmt "https://github.com/fmtlib/fmt" "10.2.1") fetch_dependency(yamc "https://github.com/yohhoy/yamc" "4e015a7") fetch_dependency(span-lite "https://github.com/martinmoene/span-lite" "bc08bf8") diff --git a/src/libretro/message/error.cpp b/src/libretro/message/error.cpp index 066229fa..16b871b9 100644 --- a/src/libretro/message/error.cpp +++ b/src/libretro/message/error.cpp @@ -36,7 +36,7 @@ constexpr pntr_color TEXT_COLOR_BOTTOM = {.rgba = {.b = 0x98, .g = 0xE5, .r = 0x static constexpr const char* const ERROR_TITLE = "Oh no! melonDS DS couldn't start..."; static constexpr const char* const SOLUTION_TITLE = "Here's what you can do:"; -static constexpr const char* const THANK_YOU = "Thank you for using melonDS DS!"; +static constexpr const char* const THANK_YOU = "Thank you for using melonDS DS! Θ.Θ"; using std::span; using MelonDsDs::NDS_SCREEN_AREA; From 67e1be2b29a5ed97f4ea782204381fcd79b49303 Mon Sep 17 00:00:00 2001 From: Rob Loach Date: Mon, 22 Apr 2024 00:28:01 -0400 Subject: [PATCH 5/5] pntr: Update with UTF-8 support --- cmake/FetchDependencies.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/FetchDependencies.cmake b/cmake/FetchDependencies.cmake index 0e355d03..e33ccc3f 100644 --- a/cmake/FetchDependencies.cmake +++ b/cmake/FetchDependencies.cmake @@ -42,7 +42,7 @@ fetch_dependency("libretro-common" "https://github.com/libretro/libretro-common. fetch_dependency("embed-binaries" "https://github.com/andoalon/embed-binaries.git" "21f28ca") fetch_dependency(glm "https://github.com/g-truc/glm" "33b0eb9") fetch_dependency(libslirp "https://github.com/JesseTG/libslirp-mirror.git" "44e7877") -fetch_dependency(pntr "https://github.com/robloach/pntr" "55082e7") +fetch_dependency(pntr "https://github.com/robloach/pntr" "23099c7") fetch_dependency(fmt "https://github.com/fmtlib/fmt" "10.2.1") fetch_dependency(yamc "https://github.com/yohhoy/yamc" "4e015a7") fetch_dependency(span-lite "https://github.com/martinmoene/span-lite" "bc08bf8")