3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-14 06:28:00 +08:00
Code Issues Projects Releases Wiki Activity

[magnum-plugins] Fix file conflict with stb (#12458)

Browse Source
This commit is contained in:
Jack·Boos·Yu 2020-07-20 19:47:16 -07:00 committed by GitHub
parent 44a5a4f4f2
commit c0d7b3970c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ports/magnum-plugins/002-fix-stb-conflict.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/src/MagnumPlugins/StbImageImporter/StbImageImporter.cpp b/src/MagnumPlugins/StbImageImporter/StbImageImporter.cpp
index c24a968..1a38162 100644
--- a/src/MagnumPlugins/StbImageImporter/StbImageImporter.cpp
+++ b/src/MagnumPlugins/StbImageImporter/StbImageImporter.cpp
@@ -45,7 +45,7 @@
#endif
/* Not defining malloc/free, because there's no equivalent for realloc in C++ */
-#include "stb_image.h"
+#include "external/stb/stb_image.h"
namespace Magnum { namespace Trade {

1
ports/magnum-plugins/CONTROL
View File

@ -1,5 +1,6 @@
Source: magnum-plugins
Version: 2020.06
Port-Version: 1
Build-Depends: magnum[core]
Description: Plugins for magnum, C++11/C++14 graphics middleware for games and data visualization
Homepage: https://magnum.graphics/

1
ports/magnum-plugins/portfile.cmake
View File

@ -6,6 +6,7 @@ vcpkg_from_github(
HEAD_REF master
PATCHES
001-tools-path.patch
002-fix-stb-conflict.patch
)
if("basisimporter" IN_LIST FEATURES OR "basisimageconverter" IN_LIST FEATURES)