Browse Source

fix stb_truetype test file

Sean Barrett 7 years ago
parent
commit
986a5eeeb1
3 changed files with 4 additions and 14 deletions
  1. 1 1
      tests/stb.dsp
  2. 0 11
      tests/test_c_compilation.c
  3. 3 2
      tests/test_truetype.c

+ 1 - 1
tests/stb.dsp

@@ -66,7 +66,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # 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 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
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"

+ 0 - 11
tests/test_c_compilation.c

@@ -1,15 +1,4 @@
 #include "stb_sprintf.h"
 #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
 #define STB_SPRINTF_IMPLEMENTATION
 #include "stb_sprintf.h"
 #include "stb_sprintf.h"
 
 

+ 3 - 2
tests/test_truetype.c

@@ -3,11 +3,12 @@
   #define _CRT_SECURE_NO_WARNINGS
   #define _CRT_SECURE_NO_WARNINGS
 #endif
 #endif
 
 
-#define STB_RECT_PACK_IMPLEMENTATION
+#include <stdlib.h>
+
+// this isn't meant to compile standalone; link with test_c_compilation.c as well
 #include "stb_rect_pack.h"
 #include "stb_rect_pack.h"
 #define STB_TRUETYPE_IMPLEMENTATION
 #define STB_TRUETYPE_IMPLEMENTATION
 #include "stb_truetype.h"
 #include "stb_truetype.h"
-#define STB_IMAGE_WRITE_IMPLEMENTATION
 #include "stb_image_write.h"
 #include "stb_image_write.h"
 
 
 #ifdef TT_TEST
 #ifdef TT_TEST