fix 64bit bug: crash in png loading

[summerhack] / Makefile

diff --git a/Makefile b/Makefile
index 4292695..bc33ff8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,36 +1,26 @@
-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)
 
-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
+obj = $(src:.cpp=.o) $(csrc:.c=.o)
 
-$(bin): $(obj) src/3dengfx/lib3dengfx.a data/tex_list
-       $(CXX) -o $@ $(obj) $(libs)
-
-src/3dengfx/lib3dengfx.a:
-       cd src/3dengfx;\
-       ./configure --with-gfxlib=sdl --disable-ft --enable-opt --disable-debug && make
+opt = -O1
+opt = -g
+CXXFLAGS = -ansi -pedantic -Wall $(opt) -Isrc/3dengfx/src -MMD `sdl-config --cflags`
+CFLAGS = -std=c89 -pedantic -Wall $(opt) -MMD `sdl-config --cflags`
+libs = src/3dengfx/lib3dengfx.a `sdl-config --libs` -lGL -lvorbisfile -ljpeg -lpng -lz
 
-data/tex_list: $(src)
-       tools/find_textures >$@
-
-include $(obj:.o=.d)
+$(bin): $(obj) 3dengfx
+       $(CXX) -o $@ $(obj) $(libs)
 
-%.d: %.cpp
-       @set -e; rm -f $@; $(CXX) -MM $(CXXFLAGS) $< > $@.$$$$; \
-       sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' < $@.$$$$ > $@; rm -f $@.$$$$
+.PHONY: 3dengfx
+3dengfx:
+       $(MAKE) -C src/3dengfx
 
-%.d: %.c
-       @set -e; rm -f $@; $(CC) -MM $(CFLAGS) $< > $@.$$$$; \
-       sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' < $@.$$$$ > $@; rm -f $@.$$$$
+-include $(obj:.o=.d)
 
 .PHONY: clean
 clean:
@@ -38,4 +28,4 @@ clean:
 
 .PHONY: cleandep
 cleandep:
-       find src \( -name '*.d' -o -name '*.d.*' \) -exec $(RM) '{}' ';'
+       $(RM) $(obj:.o=.d)