From 1c657564acb32961d0a835da33d9e5bdd98bae56 Mon Sep 17 00:00:00 2001 From: ocornut Date: Tue, 6 Jan 2015 17:35:36 +0000 Subject: [PATCH] Examples: Added STB_IMAGE_STATIC in examples to avoid conflicting implementation. Relate to #109 --- examples/directx11_example/main.cpp | 1 + examples/opengl3_example/main.cpp | 1 + examples/opengl_example/main.cpp | 1 + 3 files changed, 3 insertions(+) diff --git a/examples/directx11_example/main.cpp b/examples/directx11_example/main.cpp index 252b8b69..00789880 100644 --- a/examples/directx11_example/main.cpp +++ b/examples/directx11_example/main.cpp @@ -1,6 +1,7 @@ // ImGui - standalone example application for DirectX 11 #include +#define STB_IMAGE_STATIC #define STB_IMAGE_IMPLEMENTATION #include "../shared/stb_image.h" // for .png loading #include "../../imgui.h" diff --git a/examples/opengl3_example/main.cpp b/examples/opengl3_example/main.cpp index 6617b4ca..7644d4d7 100644 --- a/examples/opengl3_example/main.cpp +++ b/examples/opengl3_example/main.cpp @@ -5,6 +5,7 @@ #endif #include "../../imgui.h" +#define STB_IMAGE_STATIC #define STB_IMAGE_IMPLEMENTATION #include "../shared/stb_image.h" // stb_image.h for PNG loading diff --git a/examples/opengl_example/main.cpp b/examples/opengl_example/main.cpp index 34dd1da9..f755d59b 100644 --- a/examples/opengl_example/main.cpp +++ b/examples/opengl_example/main.cpp @@ -5,6 +5,7 @@ #endif #include "../../imgui.h" +#define STB_IMAGE_STATIC #define STB_IMAGE_IMPLEMENTATION #include "../shared/stb_image.h" // stb_image.h for PNG loading