commit 1c657564acb32961d0a835da33d9e5bdd98bae56
author ocornut <omarcornut@gmail.com> Tue Jan 06 17:35:36 2015 +0000
committer ocornut <omarcornut@gmail.com> Tue Jan 06 17:35:36 2015 +0000
tree d7aa81892b845cece2952d7ceff374590e25aa24
parent 98a38e24ab7036522a28964cd6983bd0c683742b

Examples: Added STB_IMAGE_STATIC in examples to avoid conflicting implementation. Relate to #109

examples/directx11_example/main.cpp

diff --git a/examples/directx11_example/main.cpp b/examples/directx11_example/main.cpp
index 252b8b6..0078988 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 <windows.h>
+#define STB_IMAGE_STATIC
 #define STB_IMAGE_IMPLEMENTATION
 #include "../shared/stb_image.h"    // for .png loading
 #include "../../imgui.h"

examples/opengl3_example/main.cpp

diff --git a/examples/opengl3_example/main.cpp b/examples/opengl3_example/main.cpp
index 6617b4c..7644d4d 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
 

examples/opengl_example/main.cpp

diff --git a/examples/opengl_example/main.cpp b/examples/opengl_example/main.cpp
index 34dd1da..f755d59 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