Skip to content

VERY experimental Nintendo Switch 2 emulator

C++

[common/stb] remove unused I/O funcs from non-LTO builds, use common/stb.h on ns service (#4282)

lizzief635827fa66c
diff --git a/src/common/stb.cpp b/src/common/stb.cpp
index c80cc2526d..59e709e57d 100644
--- a/src/common/stb.cpp
+++ b/src/common/stb.cpp
@@ -7,6 +7,4 @@
#define STB_IMAGE_IMPLEMENTATION 1
#define STB_IMAGE_RESIZE_IMPLEMENTATION 1
#define STB_IMAGE_WRITE_IMPLEMENTATION 1
-#define STBI_ONLY_JPEG 1
-
#include "common/stb.h"
diff --git a/src/common/stb.h b/src/common/stb.h
index c2b5f54de5..bc8f651426 100644
--- a/src/common/stb.h
+++ b/src/common/stb.h
@@ -7,6 +7,7 @@
#pragma once
#define STBI_ONLY_JPEG 1
+#define STBI_WRITE_NO_STDIO 1
#include <stb_image.h>
#include <stb_image_resize.h>
#include <stb_image_write.h>
diff --git a/src/core/hle/service/ns/read_only_application_control_data_interface.cpp b/src/core/hle/service/ns/read_only_application_control_data_interface.cpp
index 6227fc44cc..6e486855d6 100644
--- a/src/core/hle/service/ns/read_only_application_control_data_interface.cpp
+++ b/src/core/hle/service/ns/read_only_application_control_data_interface.cpp
@@ -9,11 +9,7 @@
#include <optional>
#include <string>
-#define STBI_ONLY_JPEG 1
-#include <stb_image.h>
-#include <stb_image_resize.h>
-#include <stb_image_write.h>
-
+#include "common/stb.h"
#include "common/settings.h"
#include "core/file_sys/control_metadata.h"
#include "core/file_sys/patch_manager.h"