zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-23 04:22:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

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


SVN r580 (trunk)
This commit is contained in:
Randy Heit 2007-12-06 17:38:05 +00:00
parent 1af122142b
commit 1eca84d644
3 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
FLAC/Makefile.mgw
View file

@ -36,7 +36,7 @@ AR = ar
ARFLAGS = rcs ARFLAGS = rcs
OBJS = cpu_asm.o fixed_asm.o lpc_asm.o \ 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) all: $(STATICLIB)

2
Makefile.linux
View file

@ -14,7 +14,7 @@ ifdef GC
CFLAGS += -ffunction-sections CFLAGS += -ffunction-sections
LDFLAGS += -Wl,--gc-sections LDFLAGS += -Wl,--gc-sections
endif 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 CFLAGS += -Dstricmp=strcasecmp -Dstrnicmp=strncasecmp -DNEED_STRUPR
LDFLAGS += -lFLAC++ -lFLAC -lz -ljpeg -lfmod `sdl-config --libs` `pkg-config gtk+-2.0 --libs` LDFLAGS += -lFLAC++ -lFLAC -lz -ljpeg -lfmod `sdl-config --libs` `pkg-config gtk+-2.0 --libs`
NASMFLAGS += -f elf -DM_TARGET_LINUX NASMFLAGS += -f elf -DM_TARGET_LINUX

5
docs/rh-log.txt
View file

@ -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) December 6, 2007 (Changes by Graf Zahl)
- Added Karate Chris's submission for scoreboard enhancement. - Added Karate Chris's submission for scoreboard enhancement.
- Fixed: A_PainDie and A_DualPainAttack could fail to spawn the correct actor - Fixed: A_PainDie and A_DualPainAttack could fail to spawn the correct actor