add libchardet submodule

liangzhijun1314 · Sep 21, 2014 · 8757263 · 8757263
1 parent 73b13d2
commit 8757263
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -0,0  1,3 @@
 [submodule "contrib/libchardet"]
 	path = contrib/libchardet
 	url = https://github.com/wang-bin/libchardet.git
diff --git a/contrib/libchardet b/contrib/libchardet
diff --git a/src/libQtAV.pri b/src/libQtAV.pri
@@ -147,7  147,7 @@ unix {
         QMAKE_LFLAGS_SONAME = -Wl,-install_name,$$PROJECT_LIBDIR/
         #QMAKE_LFLAGS  = -Wl,-rpath,@loader_path/../,-rpath,@executable_path/../
     } else {
-        RPATHDIR = \$\$ORIGIN \$\$ORIGIN/lib . /usr/local/lib
         RPATHDIR = \$\$ORIGIN \$\$ORIGIN/lib . /usr/local/lib $$[QT_INSTALL_LIBS]
 # $$PROJECT_LIBDIR only for host == target. But QMAKE_TARGET.arch is only available on windows. QT_ARCH is bad, e.g. QT_ARCH=i386 while QMAKE_HOST.arch=i686
 # https://bugreports.qt-project.org/browse/QTBUG-30263
         isEmpty(CROSS_COMPILE): RPATHDIR *= $$PROJECT_LIBDIR

diff --git a/src/libQtAV.pro b/src/libQtAV.pro
@@ -99,9  99,10 @@ win32 {
 DEFINES  = __STDC_CONSTANT_MACROS
 android: CONFIG  = config_opensl
 LIBS  = -lavcodec -lavformat -lavutil -lswscale
-config_chardet {
-    DEFINES  = QTAV_HAVE_CHARDET=1
-    LIBS  = -lchardet
 
 exists($$PROJECTROOT/contrib/libchardet/libchardet.pri) {
   include($$PROJECTROOT/contrib/libchardet/libchardet.pri)
   DEFINES  = QTAV_HAVE_CHARDET=1
 }
 config_avfilter {
     DEFINES  = QTAV_HAVE_AVFILTER=1