aboutsummaryrefslogtreecommitdiffstats
path: root/libavutil
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2006-01-29 18:32:55 +0000
committerDiego Biurrun <diego@biurrun.de>2006-01-29 18:32:55 +0000
commitc0af384013d9c10a4c624cbbf885262597b4dbf0 (patch)
treecb9ce0107e1085ae16a59feb146ca0cd70693db4 /libavutil
parent45dd4350acf66106354e30ca7ba2f3a7e5f0a7f9 (diff)
downloadffmpeg-c0af384013d9c10a4c624cbbf885262597b4dbf0.tar.gz
Simplify LDFLAGS handling for MinGW.
Originally committed as revision 4907 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavutil')
-rw-r--r--libavutil/Makefile9
1 files changed, 6 insertions, 3 deletions
diff --git a/libavutil/Makefile b/libavutil/Makefile
index 54dd347fbf..9d02aab4ef 100644
--- a/libavutil/Makefile
+++ b/libavutil/Makefile
@@ -8,6 +8,11 @@ VPATH=$(SRC_PATH)/libavutil
# NOTE: -I.. is needed to include config.h
CFLAGS=$(OPTFLAGS) -DHAVE_AV_CONFIG_H -I.. -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= mathematics.o \
integer.o \
rational.o \
@@ -34,11 +39,9 @@ $(LIB): $(OBJS)
$(RANLIB) $@
$(SLIBNAME): $(OBJS)
+ $(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
%.o: %.c