makefile

nothings · Jan 16, 2017 · 84e2fc0 · 84e2fc0
1 parent 4d19411
commit 84e2fc0
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 10 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,4 +2,4 @@ language: C
 install: true
 script:
   - cd tests
-  - make 64
+  - make all
diff --git a/stb_leakcheck.h b/stb_leakcheck.h
@@ -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
 //
 //   This software is dual-licensed to the public domain and under the following

diff --git a/stb_tilemap_editor.h b/stb_tilemap_editor.h
@@ -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
 //
 // Embeddable tilemap editor for C/C++
@@ -275,6 +275,7 @@
 //   either approach allows cut&pasting between levels.)
 //
 // REVISION HISTORY
+//   0.38  fix warning
 //   0.37  fix warning
 //   0.36  minor compiler support
 //   0.35  layername button changes

diff --git a/tests/Makefile b/tests/Makefile
@@ -2,10 +2,6 @@ INCLUDES = -I..
 CFLAGS = -Wno-pointer-to-int-cast -Wno-int-to-pointer-cast -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