diff options
| author | liamwhite <liamwhite@users.noreply.github.com> | 2023-10-25 23:21:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-25 23:21:37 +0200 |
| commit | 43be2bfe332d5537041262eb08037993239eaf5f (patch) | |
| tree | 65ad2049b7ce6b0464069d23058a25fc4c457fff /src/common | |
| parent | Merge pull request #11876 from liamwhite/apiversion (diff) | |
| parent | cmake: prefer system stb headers (diff) | |
| download | yuzu-43be2bfe332d5537041262eb08037993239eaf5f.tar yuzu-43be2bfe332d5537041262eb08037993239eaf5f.tar.gz yuzu-43be2bfe332d5537041262eb08037993239eaf5f.tar.bz2 yuzu-43be2bfe332d5537041262eb08037993239eaf5f.tar.lz yuzu-43be2bfe332d5537041262eb08037993239eaf5f.tar.xz yuzu-43be2bfe332d5537041262eb08037993239eaf5f.tar.zst yuzu-43be2bfe332d5537041262eb08037993239eaf5f.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/common/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/common/stb.cpp | 8 | ||||
| -rw-r--r-- | src/common/stb.h | 8 |
3 files changed, 21 insertions, 1 deletions
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index 8a1861051..e216eb3de 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt @@ -120,6 +120,8 @@ add_library(common STATIC socket_types.h spin_lock.cpp spin_lock.h + stb.cpp + stb.h steady_clock.cpp steady_clock.h stream.cpp @@ -208,6 +210,8 @@ if (MSVC) /we4254 # 'operator': conversion from 'type1:field_bits' to 'type2:field_bits', possible loss of data /we4800 # Implicit conversion from 'type' to bool. Possible information loss ) +else() + set_source_files_properties(stb.cpp PROPERTIES COMPILE_OPTIONS "-Wno-implicit-fallthrough;-Wno-missing-declarations;-Wno-missing-field-initializers") endif() if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang") @@ -223,7 +227,7 @@ endif() create_target_directory_groups(common) -target_link_libraries(common PUBLIC Boost::context Boost::headers fmt::fmt microprofile Threads::Threads) +target_link_libraries(common PUBLIC Boost::context Boost::headers fmt::fmt microprofile stb::headers Threads::Threads) target_link_libraries(common PRIVATE lz4::lz4 zstd::zstd LLVM::Demangle) if (ANDROID) diff --git a/src/common/stb.cpp b/src/common/stb.cpp new file mode 100644 index 000000000..d3b16665d --- /dev/null +++ b/src/common/stb.cpp @@ -0,0 +1,8 @@ +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + +#define STB_IMAGE_IMPLEMENTATION +#define STB_IMAGE_RESIZE_IMPLEMENTATION +#define STB_IMAGE_WRITE_IMPLEMENTATION + +#include "common/stb.h" diff --git a/src/common/stb.h b/src/common/stb.h new file mode 100644 index 000000000..e5c197c11 --- /dev/null +++ b/src/common/stb.h @@ -0,0 +1,8 @@ +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#include <stb_image.h> +#include <stb_image_resize.h> +#include <stb_image_write.h> |