diff --git a/ffmpegdemo/ffmpeg/ffmpeg.pri b/ffmpegdemo/ffmpeg/ffmpeg.pri index 5e5ce40..4de0580 100644 --- a/ffmpegdemo/ffmpeg/ffmpeg.pri +++ b/ffmpegdemo/ffmpeg/ffmpeg.pri @@ -2,6 +2,9 @@ HEADERS += $$PWD/ffmpeghead.h HEADERS += $$PWD/ffmpeg.h SOURCES += $$PWD/ffmpeg.cpp +#如果用的是ffmpeg4内核请将ffmpeg3改成ffmpeg4,两种内核不兼容,头文件也不一样 +DEFINES += ffmpeg3 + #ffmpeg4则使用ffmpeg4的目录 contains(DEFINES, ffmpeg4) { strPath = ffmpeg4 @@ -9,17 +12,23 @@ strPath = ffmpeg4 strPath = ffmpeg3 } -#32位的库则使用32位的库的头文件和lib文件 -contains(DEFINES, qt32) { -strLib = winlib -strInclude = include -} else { +#表示64位的构建套件 +contains(QT_ARCH, x86_64) { strLib = winlib64 strInclude = include64 +} else { +#由于Qt4不支持QT_ARCH所以会执行下面的 +#如果用的64位的Qt4则需要自行修改 +strLib = winlib +strInclude = include +} + +#表示arm平台构建套件 +contains(QT_ARCH, arm) { +strInclude = include } INCLUDEPATH += $$PWD/$$strPath/$$strInclude -INCLUDEPATH += $$PWD/$$strPath/$$strInclude/plugins win32 { LIBS += -L$$PWD/$$strPath/$$strLib/ -lavcodec -lavfilter -lavformat -lswscale -lavutil -lswresample -lavdevice diff --git a/ffmpegdemo/ffmpegdemo.pro b/ffmpegdemo/ffmpegdemo.pro index b90f4b2..d1a2522 100644 --- a/ffmpegdemo/ffmpegdemo.pro +++ b/ffmpegdemo/ffmpegdemo.pro @@ -10,9 +10,6 @@ UI_DIR = temp/ui OBJECTS_DIR = temp/obj DESTDIR = $$PWD/../bin -#ffmpeg3表示用ffmpeg3版本 可以改成ffmpeg4表示用ffmpeg4版本 -#qt32表示采用32位的ffmpeg 可以改成qt64表示采用64位的ffmpeg -DEFINES += ffmpeg3 qt32 SOURCES += main.cpp widget.cpp HEADERS += widget.h FORMS += widget.ui diff --git a/vlcdemo/vlc/vlc.pri b/vlcdemo/vlc/vlc.pri index e1fa098..ac8a468 100644 --- a/vlcdemo/vlc/vlc.pri +++ b/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 diff --git a/vlcdemo/vlcdemo.pro b/vlcdemo/vlcdemo.pro index 86484b8..c66bc3d 100644 --- a/vlcdemo/vlcdemo.pro +++ b/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