yyc12345/stb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

try to work around Travis old GCC errors

Browse Source
This commit is contained in:
Sean Barrett 2019-08-11 15:55:39 -07:00
parent 76254f7758
commit 5037e236ed
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/Makefile
View File

@ -6,5 +6,5 @@ CPPFLAGS = -Wno-write-strings -DSTB_DIVIDE_TEST
all: all:
$(CC) $(INCLUDES) $(CFLAGS) ../stb_vorbis.c test_c_compilation.c test_c_lexer.c test_dxt.c test_easyfont.c test_image.c test_image_write.c test_perlin.c test_sprintf.c test_truetype.c test_voxel.c -lm $(CC) $(INCLUDES) $(CFLAGS) ../stb_vorbis.c test_c_compilation.c test_c_lexer.c test_dxt.c test_easyfont.c test_image.c test_image_write.c test_perlin.c test_sprintf.c test_truetype.c test_voxel.c -lm
$(CC) $(INCLUDES) $(CPPFLAGS) test_cpp_compilation.cpp -lm -lstdc++ $(CC) $(INCLUDES) $(CPPFLAGS) -DTRAVIS test_cpp_compilation.cpp -lm -lstdc++
$(CC) $(INCLUDES) $(CFLAGS) -DIWT_TEST image_write_test.c -lm -o image_write_test $(CC) $(INCLUDES) $(CFLAGS) -DIWT_TEST image_write_test.c -lm -o image_write_test

2
tests/test_cpp_compilation.cpp
View File

@ -17,7 +17,9 @@
#define STB_VOXEL_RENDER_IMPLEMENTATION #define STB_VOXEL_RENDER_IMPLEMENTATION
#define STB_CONNECTED_COMPONENTS_IMPLEMENTATION #define STB_CONNECTED_COMPONENTS_IMPLEMENTATION
#define STB_DS_IMPLEMENTATION #define STB_DS_IMPLEMENTATION
#ifndef TRAVIS
#define STBDS_UNIT_TESTS #define STBDS_UNIT_TESTS
#endif
#define STBI_MALLOC my_malloc #define STBI_MALLOC my_malloc
#define STBI_FREE my_free #define STBI_FREE my_free