[vlc-commits] Revert "contribs: Ensure we're using the contrib libraries when available"

Hugo Beauzée-Luyssen git at videolan.org
Tue Sep 19 11:16:04 CEST 2017


vlc | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Tue Sep 19 09:41:38 2017 +0200| [0a3f79a0b8b587928b4609f3d6057f3bcc854327] | committer: Hugo Beauzée-Luyssen

Revert "contribs: Ensure we're using the contrib libraries when available"

This reverts commit 8c37ebde339a92b8043652c7eabe52836f2a1d87.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=0a3f79a0b8b587928b4609f3d6057f3bcc854327
---

 contrib/src/main.mak | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index 2cc55be010..775e2f1b4b 100644
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -166,7 +166,8 @@ EXTRA_CFLAGS += -I$(PREFIX)/include
 CPPFLAGS := $(CPPFLAGS) $(EXTRA_CFLAGS)
 CFLAGS := $(CFLAGS) $(EXTRA_CFLAGS) -g
 CXXFLAGS := $(CXXFLAGS) $(EXTRA_CFLAGS) $(EXTRA_CXXFLAGS) -g
-LDFLAGS := -L$(PREFIX)/lib $(LDFLAGS) $(EXTRA_LDFLAGS)
+EXTRA_LDFLAGS += -L$(PREFIX)/lib
+LDFLAGS := $(LDFLAGS) $(EXTRA_LDFLAGS)
 
 ifndef WITH_OPTIMIZATION
 CFLAGS := $(CFLAGS) -O0



More information about the vlc-commits mailing list