# HG changeset patch # User diego # Date 1138559575 0 # Node ID ab8b79651aa30fa3d7d15b7af812872c0a390c32 # Parent cc0357a90e8f2172d232c493fc3e40189490c60f Simplify LDFLAGS handling for MinGW. diff -r cc0357a90e8f -r ab8b79651aa3 Makefile --- a/Makefile Sat Jan 28 16:05:06 2006 +0000 +++ b/Makefile Sun Jan 29 18:32:55 2006 +0000 @@ -9,6 +9,11 @@ # NOTE: -I.. is needed to include config.h CFLAGS=$(OPTFLAGS) -DHAVE_AV_CONFIG_H -I.. -I$(SRC_PATH)/libavutil -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE $(AMR_CFLAGS) +#FIXME: This should be in configure/config.mak +ifeq ($(CONFIG_WIN32),yes) + LDFLAGS=-Wl,--output-def,$(@:.dll=.def) +endif + OBJS= bitstream.o utils.o mem.o allcodecs.o \ mpegvideo.o jrevdct.o jfdctfst.o jfdctint.o\ mpegaudio.o ac3enc.o mjpeg.o resample.o resample2.o dsputil.o \ @@ -421,11 +426,9 @@ ifeq ($(CONFIG_PP),yes) $(MAKE) -C libpostproc endif + $(CC) $(SHFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(EXTRALIBS) $(AMREXTRALIBS) ifeq ($(CONFIG_WIN32),yes) - $(CC) $(SHFLAGS) -Wl,--output-def,$(@:.dll=.def) -o $@ $(OBJS) $(EXTRALIBS) $(AMREXTRALIBS) -lib /machine:i386 /def:$(@:.dll=.def) -else - $(CC) $(SHFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(EXTRALIBS) $(AMREXTRALIBS) endif dsputil.o: dsputil.c dsputil.h