fixed multiple insertions of the same texture

[summerhack] / Makefile

diff --git a/Makefile b/Makefile
index 4292695..459126d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,16 +1,16 @@
-src := src/sumhack.cpp src/events.cpp
-bin := sumhack-thelab
+src = src/sumhack.cpp src/events.cpp
+bin = sumhack-thelab
 
 include src/parts/Makefile-part
 include src/sdlvf/Makefile-part
 
-obj := $(src:.cpp=.o) $(csrc:.c=.o)
+obj = $(src:.cpp=.o) $(csrc:.c=.o)
 
-opt := -O1
-opt := -g
-CXXFLAGS := -ansi -pedantic -Wall $(opt) -Isrc/3dengfx/src `src/3dengfx/3dengfx-config --cflags`
-CFLAGS := -std=c89 -pedantic -Wall $(opt) `src/3dengfx/3dengfx-config --cflags`
-libs := src/3dengfx/lib3dengfx.a `src/3dengfx/3dengfx-config --libs-no-3dengfx` -lGL -lvorbisfile
+opt = -O1
+opt = -g
+CXXFLAGS = -ansi -pedantic -Wall $(opt) -Isrc/3dengfx/src `src/3dengfx/3dengfx-config --cflags`
+CFLAGS = -std=c89 -pedantic -Wall $(opt) `src/3dengfx/3dengfx-config --cflags`
+libs = src/3dengfx/lib3dengfx.a `src/3dengfx/3dengfx-config --libs-no-3dengfx` -lGL -lvorbisfile
 
 $(bin): $(obj) src/3dengfx/lib3dengfx.a data/tex_list
        $(CXX) -o $@ $(obj) $(libs)
@@ -22,7 +22,7 @@ src/3dengfx/lib3dengfx.a:
 data/tex_list: $(src)
        tools/find_textures >$@
 
-include $(obj:.o=.d)
+-include $(obj:.o=.d)
 
 %.d: %.cpp
        @set -e; rm -f $@; $(CXX) -MM $(CXXFLAGS) $< > $@.$$$$; \