- Fixed: The FLAC/makefile.mgw should use md5.o as an OBJ, not md5.c.

- Fixed: The Linux makefile probably shouldn't be using the bundled zlib headers,
  either.


SVN r580 (trunk)

FLAC/Makefile.mgw

@@ -36,7 +36,7 @@ AR = ar
 ARFLAGS = rcs
 
 OBJS = cpu_asm.o fixed_asm.o lpc_asm.o \
-       bitmath.o bitreader.o cpu.o crc.o fixed.o format.o lpc.o md5.c memory.o stream_decoder.o stream_decoder_pp.o
+       bitmath.o bitreader.o cpu.o crc.o fixed.o format.o lpc.o md5.o memory.o stream_decoder.o stream_decoder_pp.o
 
 all: $(STATICLIB)
 

Makefile.linux

@@ -14,7 +14,7 @@ ifdef GC
   CFLAGS += -ffunction-sections
   LDFLAGS += -Wl,--gc-sections
 endif
-CFLAGS += -MMD -DHAVE_FILELENGTH -D__forceinline=inline -Izlib `sdl-config --cflags` `pkg-config gtk+-2.0 --cflags`
+CFLAGS += -MMD -DHAVE_FILELENGTH -D__forceinline=inline `sdl-config --cflags` `pkg-config gtk+-2.0 --cflags`
 CFLAGS += -Dstricmp=strcasecmp -Dstrnicmp=strncasecmp -DNEED_STRUPR
 LDFLAGS += -lFLAC++ -lFLAC -lz -ljpeg -lfmod `sdl-config --libs` `pkg-config gtk+-2.0 --libs`
 NASMFLAGS += -f elf -DM_TARGET_LINUX

docs/rh-log.txt

@@ -1,3 +1,8 @@
+December 6, 2007
+- Fixed: The FLAC/makefile.mgw should use md5.o as an OBJ, not md5.c.
+- Fixed: The Linux makefile probably shouldn't be using the bundled zlib headers,
+  either.
+
 December 6, 2007 (Changes by Graf Zahl)
 - Added Karate Chris's submission for scoreboard enhancement.
 - Fixed: A_PainDie and A_DualPainAttack could fail to spawn the correct actor