diff options
| author | Diego Biurrun <diego@biurrun.de> | 2006-01-29 18:32:55 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2006-01-29 18:32:55 +0000 |
| commit | c0af384013d9c10a4c624cbbf885262597b4dbf0 (patch) | |
| tree | cb9ce0107e1085ae16a59feb146ca0cd70693db4 /libavformat | |
| parent | 45dd4350acf66106354e30ca7ba2f3a7e5f0a7f9 (diff) | |
Simplify LDFLAGS handling for MinGW.
Originally committed as revision 4907 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/Makefile | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile index bae7342c3b..92a1e686e8 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -8,6 +8,11 @@ VPATH=$(SRC_PATH)/libavformat 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 @@ $(LIB): $(OBJS) $(PPOBJS) $(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) |