pull/338/merge
Sean Barrett 2017-01-16 03:01:40 -08:00
parent 4d19411acd
commit 84e2fc0a9e
4 changed files with 7 additions and 10 deletions

View File

@ -2,4 +2,4 @@ language: C
install: true install: true
script: script:
- cd tests - cd tests
- make 64 - make all

View File

@ -1,4 +1,4 @@
// stb_leakcheck.h - v0.2 - quick & dirty malloc leak-checking - public domain // stb_leakcheck.h - v0.3 - quick & dirty malloc leak-checking - public domain
// LICENSE // LICENSE
// //
// This software is dual-licensed to the public domain and under the following // This software is dual-licensed to the public domain and under the following

View File

@ -1,4 +1,4 @@
// stb_tilemap_editor.h - v0.37 - Sean Barrett - http://nothings.org/stb // stb_tilemap_editor.h - v0.38 - Sean Barrett - http://nothings.org/stb
// placed in the public domain - not copyrighted - first released 2014-09 // placed in the public domain - not copyrighted - first released 2014-09
// //
// Embeddable tilemap editor for C/C++ // Embeddable tilemap editor for C/C++
@ -275,6 +275,7 @@
// either approach allows cut&pasting between levels.) // either approach allows cut&pasting between levels.)
// //
// REVISION HISTORY // REVISION HISTORY
// 0.38 fix warning
// 0.37 fix warning // 0.37 fix warning
// 0.36 minor compiler support // 0.36 minor compiler support
// 0.35 layername button changes // 0.35 layername button changes

View File

@ -2,10 +2,6 @@ INCLUDES = -I..
CFLAGS = -Wno-pointer-to-int-cast -Wno-int-to-pointer-cast -DSTB_DIVIDE_TEST CFLAGS = -Wno-pointer-to-int-cast -Wno-int-to-pointer-cast -DSTB_DIVIDE_TEST
CPPFLAGS = -Wno-write-strings -DSTB_DIVIDE_TEST CPPFLAGS = -Wno-write-strings -DSTB_DIVIDE_TEST
32: all:
$(CC) -m32 $(INCLUDES) $(CFLAGS) ../stb_vorbis.c test_c_compilation.c -lm $(CC) $(INCLUDES) $(CFLAGS) ../stb_vorbis.c test_c_compilation.c -lm
$(CC) -m32 $(INCLUDES) $(CPPFLAGS) ../stb_vorbis.c test_cpp_compilation.cpp -lm $(CC) $(INCLUDES) $(CPPFLAGS) test_cpp_compilation.cpp -lm
64:
$(CC) -m64 $(INCLUDES) $(CFLAGS) ../stb_vorbis.c test_c_compilation.c -lm
$(CC) -m64 $(INCLUDES) $(CPPFLAGS) ../stb_vorbis.c test_cpp_compilation.cpp -lm