mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-14 15:39:00 +08:00
e642493369
* update to 1.1.0 * update version
42 lines
1.5 KiB
Diff
42 lines
1.5 KiB
Diff
diff --git a/include/TGUI/extlibs/IncludeStbImage.hpp b/include/TGUI/extlibs/IncludeStbImage.hpp
|
|
index e19cccb..79d0f0c 100644
|
|
--- a/include/TGUI/extlibs/IncludeStbImage.hpp
|
|
+++ b/include/TGUI/extlibs/IncludeStbImage.hpp
|
|
@@ -64,7 +64,7 @@
|
|
#else
|
|
# define STB_IMAGE_STATIC
|
|
# define STB_IMAGE_IMPLEMENTATION
|
|
-# include <TGUI/extlibs/stb/stb_image.h>
|
|
+# include <stb_image.h>
|
|
#endif
|
|
|
|
#if defined(__GNUC__)
|
|
diff --git a/include/TGUI/extlibs/IncludeStbImageWrite.hpp b/include/TGUI/extlibs/IncludeStbImageWrite.hpp
|
|
index 2e23a5b..97ce878 100644
|
|
--- a/include/TGUI/extlibs/IncludeStbImageWrite.hpp
|
|
+++ b/include/TGUI/extlibs/IncludeStbImageWrite.hpp
|
|
@@ -52,7 +52,7 @@
|
|
#else
|
|
# define STB_IMAGE_WRITE_STATIC
|
|
# define STB_IMAGE_WRITE_IMPLEMENTATION
|
|
-# include <TGUI/extlibs/stb/stb_image_write.h>
|
|
+# include <stb_image_write.h>
|
|
#endif
|
|
|
|
#if defined(__GNUC__)
|
|
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
|
index 6a08458..c575036 100644
|
|
--- a/src/CMakeLists.txt
|
|
+++ b/src/CMakeLists.txt
|
|
@@ -225,6 +225,10 @@ else()
|
|
set_target_properties(tgui PROPERTIES MINSIZEREL_POSTFIX -s)
|
|
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}")
|
|
+find_path(TGUI_SYSTEM_STB_IMAGE_WRITE_INCLUDE_DIR stb_image_write.h REQUIRED)
|
|
+target_include_directories(tgui SYSTEM PRIVATE "${TGUI_SYSTEM_STB_IMAGE_WRITE_INCLUDE_DIR}")
|
|
|
|
if (TGUI_BUILD_AS_CXX_MODULE)
|
|
target_sources(tgui
|