Merge pull request #236 from bkaradzic/master

Define STBTT_DEF extern when STBTT not compiled with ImGui.
2015-05-28 08:19:14 +01:00 · 2015-05-28 08:19:14 +01:00 · 46a27cdb6b
commit 46a27cdb6b
parent dcc7df2b21 123fd73c8c
1 changed files with 2 additions and 0 deletions
--- a/imgui.cpp
+++ b/imgui.cpp
@ -474,6 +474,8 @@ namespace IMGUI_STB_NAMESPACE
 #ifndef IMGUI_DISABLE_STB_TRUETYPE_IMPLEMENTATION
 #define STBTT_STATIC
 #define STB_TRUETYPE_IMPLEMENTATION
+#else
+#define STBTT_DEF extern
 #endif
 #include "stb_truetype.h"