From 5037e236ed61813ecefe87d3ec334a6068a18d9c Mon Sep 17 00:00:00 2001 From: Sean Barrett Date: Sun, 11 Aug 2019 15:55:39 -0700 Subject: [PATCH] try to work around Travis old GCC errors --- tests/Makefile | 2 +- tests/test_cpp_compilation.cpp | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/Makefile b/tests/Makefile index 1fb9e56..877f0a3 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -6,5 +6,5 @@ CPPFLAGS = -Wno-write-strings -DSTB_DIVIDE_TEST 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) $(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 diff --git a/tests/test_cpp_compilation.cpp b/tests/test_cpp_compilation.cpp index a2093f4..3876fed 100644 --- a/tests/test_cpp_compilation.cpp +++ b/tests/test_cpp_compilation.cpp @@ -17,7 +17,9 @@ #define STB_VOXEL_RENDER_IMPLEMENTATION #define STB_CONNECTED_COMPONENTS_IMPLEMENTATION #define STB_DS_IMPLEMENTATION +#ifndef TRAVIS #define STBDS_UNIT_TESTS +#endif #define STBI_MALLOC my_malloc #define STBI_FREE my_free