Commit 9e1ad0fe authored by michael's avatar michael

compiling using nonstd include/library locations / add LDFLAGS to a few places...

compiling using nonstd include/library locations / add LDFLAGS to a few places patch by (Niki W. Waibel - nikiwaibel)


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@4429 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 22ea95f6
...@@ -1020,7 +1020,7 @@ int main( void ) { return (int) imlib_load_font("foo"); } ...@@ -1020,7 +1020,7 @@ int main( void ) { return (int) imlib_load_font("foo"); }
EOF EOF
imlib2=no imlib2=no
if $cc -o $TMPE $TMPC -lImlib2 -lm > /dev/null 2>&1 ; then if $cc $CFLAGS $LDFLAGS -o $TMPE $TMPC -lImlib2 -lm > /dev/null 2>&1 ; then
imlib2=yes imlib2=yes
fi fi
......
...@@ -101,7 +101,7 @@ ifeq ($(CONFIG_WIN32),yes) ...@@ -101,7 +101,7 @@ ifeq ($(CONFIG_WIN32),yes)
$(CC) $(SHFLAGS) -Wl,--output-def,$(@:.dll=.def) -o $@ $(OBJS) $(PPOBJS) $(AVCLIBS) $(EXTRALIBS) $(CC) $(SHFLAGS) -Wl,--output-def,$(@:.dll=.def) -o $@ $(OBJS) $(PPOBJS) $(AVCLIBS) $(EXTRALIBS)
-lib /machine:i386 /def:$(@:.dll=.def) -lib /machine:i386 /def:$(@:.dll=.def)
else else
$(CC) $(SHFLAGS) -o $@ $(OBJS) $(PPOBJS) $(AVCLIBS) $(EXTRALIBS) $(CC) $(SHFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(PPOBJS) $(AVCLIBS) $(EXTRALIBS)
endif endif
depend: $(SRCS) depend: $(SRCS)
......
...@@ -30,13 +30,13 @@ install: ...@@ -30,13 +30,13 @@ install:
install -m 755 $(HOOKS) "$(libdir)/vhook" install -m 755 $(HOOKS) "$(libdir)/vhook"
imlib2.so: imlib2.o imlib2.so: imlib2.o
$(CC) -g -o $@ $(SHFLAGS) $< -lImlib2 $(CC) $(LDFLAGS) -g -o $@ $(SHFLAGS) $< -lImlib2
drawtext.so: drawtext.o drawtext.so: drawtext.o
$(CC) -g -o $@ $(SHFLAGS) $< `freetype-config --libs` $(CC) $(LDFLAGS) -g -o $@ $(SHFLAGS) $< `freetype-config --libs`
%.so: %.o %.so: %.o
$(CC) -g -o $@ $(SHFLAGS) $< $(CC) $(LDFLAGS) -g -o $@ $(SHFLAGS) $<
clean: clean:
rm -f *.o *.d .depend *.so *~ rm -f *.o *.d .depend *.so *~
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment