move stb_image/stb_truetype.h and stb_image/stb_image_write.h to Thir…

…dPartyLibs/stb_image folder
m-7761 · Jun 22, 2017 · 9e5e0da · 9e5e0da
1 parent 97f6a16
commit 9e5e0da
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 5 deletions.
diff --git a/examples/OpenGLWindow/CMakeLists.txt b/examples/OpenGLWindow/CMakeLists.txt
@@ -1,6 +1,7 @@
 
 INCLUDE_DIRECTORIES(
 	..
+	../ThirdPartyLibs
 	../../src
 )
 

diff --git a/examples/OpenGLWindow/GLInstancingRenderer.cpp b/examples/OpenGLWindow/GLInstancingRenderer.cpp
@@ -1406,7 +1406,7 @@ void GLInstancingRenderer::updateCamera(int upAxis)
 
 
 //#define STB_IMAGE_WRITE_IMPLEMENTATION
-#include "stb_image_write.h"
+#include "stb_image/stb_image_write.h"
 void writeTextureToPng(int textureWidth, int textureHeight, const char* fileName, int numComponents)
 {
 

diff --git a/examples/OpenGLWindow/SimpleOpenGL3App.cpp b/examples/OpenGLWindow/SimpleOpenGL3App.cpp
@@ -919,7 +919,7 @@ void SimpleOpenGL3App::getScreenPixels(unsigned char* rgbaBuffer, int bufferSize
 }
 
 //#define STB_IMAGE_WRITE_IMPLEMENTATION
-#include "stb_image_write.h"
+#include "stb_image/stb_image_write.h"
 static void writeTextureToFile(int textureWidth, int textureHeight, const char* fileName, FILE* ffmpegVideo)
 {
 	int numComponents = 4;

diff --git a/examples/OpenGLWindow/fontstash.cpp b/examples/OpenGLWindow/fontstash.cpp
@@ -37,7 +37,7 @@
 #define STB_TRUETYPE_IMPLEMENTATION
 #define STBTT_malloc(x,u)    malloc(x)
 #define STBTT_free(x,u)      free(x)
-#include "stb_truetype.h"
+#include "stb_image/stb_truetype.h"
 
 #define HASH_LUT_SIZE 256
 

diff --git a/examples/OpenGLWindow/opengl_fontstashcallbacks.cpp b/examples/OpenGLWindow/opengl_fontstashcallbacks.cpp
@@ -10,7 +10,7 @@
 #include <stdlib.h>
 #include <string.h>
 #define STB_IMAGE_WRITE_IMPLEMENTATION
-#include "stb_image_write.h"
+#include "stb_image/stb_image_write.h"
 
 
 static unsigned int s_indexData[INDEX_COUNT];

diff --git a/examples/OpenGLWindow/premake4.lua b/examples/OpenGLWindow/premake4.lua
@@ -9,7 +9,7 @@
 		initGlew()
 
 		includedirs {
-
+		 	"../ThirdPartyLibs",
 		 	"../../src",
 		}
 

diff --git a/examples/OpenGLWindow/stb_image_write.h → ...hirdPartyLibs/stb_image/stb_image_write.h b/examples/OpenGLWindow/stb_image_write.h → ...hirdPartyLibs/stb_image/stb_image_write.h
diff --git a/examples/OpenGLWindow/stb_truetype.h → ...s/ThirdPartyLibs/stb_image/stb_truetype.h b/examples/OpenGLWindow/stb_truetype.h → ...s/ThirdPartyLibs/stb_image/stb_truetype.h