Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 1 commit into from
Jul 21, 2020
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions ports/magnum-plugins/002-fix-stb-conflict.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 change: 1 addition & 0 deletions ports/magnum-plugins/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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/
Expand Down
1 change: 1 addition & 0 deletions ports/magnum-plugins/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down