mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-22 21:37:55 +08:00
df806d3a4b
* [sdl2-ttf] update to 2.20.0 * update version * add license * update version * del unused function * overwrite version * Fix sdl2-tff * Increase version * version * Fix config export/import * version * Fix sdl2pp * Fix SDL2_ttf import * Fix sdl2pp * Try again * ... * shared * Fix patch * not win32 * revert * Fix import name * Fix tgui * version * CR * version * CR * version * license * version * update port version * version * Fix patch * version * Fix patch * version * Update patch * version * Fix tgui * add feature harfbuzz * version * Fix feature * version * Fix mingw * Trim patching * Explicit usage * [sfml] Fix OpenGL dependency * [sfml] Transform freetype patch and config fixup * [sfml] Transform stb patch * [tgui] Revise port * [tgui] Extend config patching, merge into dependencies patch * [tgui] Devendor stb * [tgui] Revise feature dependencies * [tgui] Omit pc files (too many inconsistencies) * [milerius-sfml-imgui] Fixup * Update versions Co-authored-by: FrankXie <v-frankxie@microsoft.com> Co-authored-by: Thomas1664 <46387399+Thomas1664@users.noreply.github.com>
28 lines
1.0 KiB
Diff
28 lines
1.0 KiB
Diff
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
|
index ebabb8a..4a166dc 100755
|
|
--- a/src/CMakeLists.txt
|
|
+++ b/src/CMakeLists.txt
|
|
@@ -173,6 +173,9 @@ else()
|
|
set_target_properties(tgui PROPERTIES RELWITHDEBINFO_POSTFIX -s)
|
|
endif()
|
|
|
|
+find_path(STB_INCLUDE_DIR stb_image.h REQUIRED)
|
|
+target_include_directories(tgui PRIVATE "${STB_INCLUDE_DIR}")
|
|
+
|
|
# Add the backend files to the library.
|
|
# Without the ability to call target_link_libraries in a subdirectory (which was only added in CMake 3.13 in policy CMP0079),
|
|
# the code would be more complicated when using add_subdirectory. So we just avoid creating a new scope by using include.
|
|
diff --git a/src/Loading/ImageLoader.cpp b/src/Loading/ImageLoader.cpp
|
|
index e3ec9c5..d2f691d 100644
|
|
--- a/src/Loading/ImageLoader.cpp
|
|
+++ b/src/Loading/ImageLoader.cpp
|
|
@@ -45,7 +45,7 @@
|
|
#define STB_IMAGE_STATIC
|
|
#define STBI_WINDOWS_UTF8
|
|
#define STB_IMAGE_IMPLEMENTATION
|
|
-#include <TGUI/extlibs/stb/stb_image.h>
|
|
+#include <stb_image.h>
|
|
|
|
#if defined(__GNUC__)
|
|
#pragma GCC diagnostic pop
|