改进vlcdemo+ffmpegdemo自动识别32 64位

vlcdemo/vlc/vlc.pri

@@ -2,6 +2,9 @@ HEADERS     += $$PWD/vlchead.h
 HEADERS     += $$PWD/vlc.h   
 SOURCES     += $$PWD/vlc.cpp
 
+#如果用的是vlc3内核请将vlc2改成vlc3,两种内核不兼容,头文件也不一样,建议用vlc2
+DEFINES += vlc2
+
 #vlc3则使用vlc3的目录
 contains(DEFINES, vlc3) {
 strPath = vlc3
@@ -9,13 +12,13 @@ strPath = vlc3
 strPath = vlc2
 }
 
-#32位的库则使用32位的库的头文件和lib文件
-contains(DEFINES, qt32) {
-strLib = winlib
-strInclude = include
-} else {
+#表示64位的构建套件
+contains(QT_ARCH, x86_64) {
 strLib = winlib64
 strInclude = include64
+} else {
+strLib = winlib
+strInclude = include
 }
 
 INCLUDEPATH += $$PWD/$$strPath/$$strInclude

vlcdemo/vlcdemo.pro

@@ -10,9 +10,6 @@ UI_DIR      = temp/ui
 OBJECTS_DIR = temp/obj
 DESTDIR     = $$PWD/../bin
 
-#vlc2表示用vlc2版本 可以改成vlc3表示用vlc3版本
-#qt32表示采用32位的vlc 可以改成qt64表示采用64位的vlc
-DEFINES     += vlc2 qt32
 SOURCES     += main.cpp widget.cpp
 HEADERS     += widget.h
 FORMS       += widget.ui