From 986a5eeeb1a3acdc71d65927177e731436f46c78 Mon Sep 17 00:00:00 2001 From: Sean Barrett Date: Mon, 29 Jan 2018 03:35:03 -0800 Subject: [PATCH] fix stb_truetype test file --- tests/stb.dsp | 2 +- tests/test_c_compilation.c | 11 ----------- tests/test_truetype.c | 5 +++-- 3 files changed, 4 insertions(+), 14 deletions(-) diff --git a/tests/stb.dsp b/tests/stb.dsp index 7e20a14..8e09df5 100644 --- a/tests/stb.dsp +++ b/tests/stb.dsp @@ -66,7 +66,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /GX /Zi /Od /I ".." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "VORBIS_TEST" /FR /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /GX /Zi /Od /I ".." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "TT_TEST" /FR /FD /GZ /c # SUBTRACT CPP /YX # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" diff --git a/tests/test_c_compilation.c b/tests/test_c_compilation.c index dd31936..2a54df5 100644 --- a/tests/test_c_compilation.c +++ b/tests/test_c_compilation.c @@ -1,15 +1,4 @@ #include "stb_sprintf.h" -#include "stb_easy_font.h" -#include "stb_herringbone_wang_tile.h" -#include "stb_image.h" -#include "stb_image_write.h" -#include "stb_perlin.h" -#include "stb_dxt.h" -#include "stb_c_lexer.h" -#include "stb_divide.h" -#include "stb_image_resize.h" -#include "stb_rect_pack.h" - #define STB_SPRINTF_IMPLEMENTATION #include "stb_sprintf.h" diff --git a/tests/test_truetype.c b/tests/test_truetype.c index b432fd4..1ac147b 100644 --- a/tests/test_truetype.c +++ b/tests/test_truetype.c @@ -3,11 +3,12 @@ #define _CRT_SECURE_NO_WARNINGS #endif -#define STB_RECT_PACK_IMPLEMENTATION +#include + +// this isn't meant to compile standalone; link with test_c_compilation.c as well #include "stb_rect_pack.h" #define STB_TRUETYPE_IMPLEMENTATION #include "stb_truetype.h" -#define STB_IMAGE_WRITE_IMPLEMENTATION #include "stb_image_write.h" #ifdef TT_TEST