# HG changeset patch # User diego # Date 1138559575 0 # Node ID e50e8bfb90ed6df34eb3bfb6256a71e623e8c4f9 # Parent f1104ac8de957b2eb0c9b8f598f374d9e931c5df Simplify LDFLAGS handling for MinGW. diff -r f1104ac8de95 -r e50e8bfb90ed Makefile --- a/Makefile Thu Jan 26 23:42:30 2006 +0000 +++ b/Makefile Sun Jan 29 18:32:55 2006 +0000 @@ -8,6 +8,11 @@ CFLAGS=$(OPTFLAGS) -I.. -I$(SRC_PATH) -I$(SRC_PATH)/libavutil -I$(SRC_PATH)/libavcodec -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE +#FIXME: This should be in configure/config.mak +ifeq ($(CONFIG_WIN32),yes) + LDFLAGS=-Wl,--output-def,$(@:.dll=.def) +endif + OBJS= utils.o cutils.o os_support.o allformats.o PPOBJS= @@ -106,11 +111,9 @@ $(RANLIB) $@ $(SLIBNAME): $(OBJS) + $(CC) $(SHFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(PPOBJS) $(AVCLIBS) $(EXTRALIBS) ifeq ($(CONFIG_WIN32),yes) - $(CC) $(SHFLAGS) -Wl,--output-def,$(@:.dll=.def) -o $@ $(OBJS) $(PPOBJS) $(AVCLIBS) $(EXTRALIBS) -lib /machine:i386 /def:$(@:.dll=.def) -else - $(CC) $(SHFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(PPOBJS) $(AVCLIBS) $(EXTRALIBS) endif depend: $(SRCS)