consolidate files into btgui/OpenGLWindow (from FontFiles/OpenGLTrueTypeFont)

consolidate stringify_linux/_osx into stringify.sh
This commit is contained in:
Erwin Coumans
2014-09-03 09:52:31 -07:00
parent d6c78426bd
commit 0125324bd6
30 changed files with 50 additions and 163 deletions

View File

@@ -24,8 +24,8 @@
//#include "b3GpuDynamicsWorld.h"
#include <assert.h>
#include <string.h>
#include "OpenGLTrueTypeFont/fontstash.h"
#include "OpenGLTrueTypeFont/opengl_fontstashcallbacks.h"
#include "OpenGLWindow/fontstash.h"
#include "OpenGLWindow/opengl_fontstashcallbacks.h"
#include "gwenUserInterface.h"
#include "ParticleDemo.h"
#include "broadphase/PairBench.h"
@@ -543,7 +543,7 @@ void myprintf(const char* msg)
//#define STB_IMAGE_WRITE_IMPLEMENTATION
#include "OpenGLTrueTypeFont/stb_image_write.h"
#include "OpenGLWindow/stb_image_write.h"
void writeTextureToPng(int textureWidth, int textureHeight, const char* fileName)
{
int numComponents = 4;