Skip to content

Commit

Permalink
lib目录结构调整
Browse files Browse the repository at this point in the history
huihui committed Apr 2, 2021
1 parent e39ab15 commit 0912c3a
Showing 410 changed files with 51 additions and 57,791 deletions.
52 changes: 3 additions & 49 deletions module/VideoPlayer/VideoPlayer.pri
Original file line number Diff line number Diff line change
@@ -23,53 +23,7 @@ HEADERS += \
$$PWD/src/EventHandle/VideoPlayerEventHandle.h \
$$PWD/src/types.h


win32{

contains(QT_ARCH, i386) {
message("32-bit")
INCLUDEPATH += $$PWD/lib/win32/ffmpeg/include \
$$PWD/lib/win32/SDL2/include \
$$PWD/src

LIBS += -L$$PWD/lib/win32/ffmpeg/lib -lavcodec -lavdevice -lavfilter -lavformat -lavutil -lpostproc -lswresample -lswscale
LIBS += -L$$PWD/lib/win32/SDL2/lib -lSDL2
} else {
message("64-bit")
INCLUDEPATH += $$PWD/lib/win64/ffmpeg/include \
$$PWD/lib/win64/SDL2/include \
$$PWD/src

LIBS += -L$$PWD/lib/win64/ffmpeg/lib -lavcodec -lavdevice -lavfilter -lavformat -lavutil -lpostproc -lswresample -lswscale
LIBS += -L$$PWD/lib/win64/SDL2/lib -lSDL2
}

}

unix{
contains(QT_ARCH, i386) {
message("32-bit, 请自行编译32位库!")
} else {
message("64-bit")
INCLUDEPATH += $$PWD/lib/linux/ffmpeg/include \
$$PWD/lib/linux/SDL2/include/SDL2 \
$$PWD/src

LIBS += -L$$PWD/lib/linux/ffmpeg/lib -lavformat -lavcodec -lavdevice -lavfilter -lavutil -lswresample -lswscale
LIBS += -L$$PWD/lib/linux/SDL2/lib -lSDL2

LIBS += -lpthread -ldl
}

#QMAKE_POST_LINK 表示编译后执行内容
#QMAKE_PRE_LINK 表示编译前执行内容

#解压库文件
#QMAKE_PRE_LINK += "cd $$PWD/lib/linux && tar xvzf ffmpeg.tar.gz "
system("cd $$PWD/lib/linux && tar xvzf ffmpeg.tar.gz")
system("cd $$PWD/lib/linux && tar xvzf SDL2.tar.gz")


}

### lib ### Begin
include($$PWD/lib/lib.pri)
### lib ### End

48 changes: 48 additions & 0 deletions module/VideoPlayer/lib/lib.pri
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
INCLUDEPATH += $$PWD

win32{

INCLUDEPATH += $$PWD/lib/win/ffmpeg/include \
$$PWD/lib/win/SDL2/include

contains(QT_ARCH, i386) {
message("32-bit")

LIBS += -L$$PWD/lib/win/ffmpeg/lib/x86 -lavcodec -lavdevice -lavfilter -lavformat -lavutil -lpostproc -lswresample -lswscale
LIBS += -L$$PWD/lib/win/SDL2/lib/x86 -lSDL2
} else {
message("64-bit")

LIBS += -L$$PWD/lib/win/ffmpeg/lib/x64 -lavcodec -lavdevice -lavfilter -lavformat -lavutil -lpostproc -lswresample -lswscale
LIBS += -L$$PWD/lib/win/SDL2/lib/x64 -lSDL2
}

}

unix{

INCLUDEPATH += $$PWD/lib/linux/ffmpeg/include \
$$PWD/lib/linux/SDL2/include/SDL2

contains(QT_ARCH, i386) {
message("32-bit, 请自行编译32位库!")
} else {
message("64-bit")

LIBS += -L$$PWD/lib/linux/ffmpeg/lib -lavformat -lavcodec -lavdevice -lavfilter -lavutil -lswresample -lswscale
LIBS += -L$$PWD/lib/linux/SDL2/lib -lSDL2

LIBS += -lpthread -ldl
}

#QMAKE_POST_LINK 表示编译后执行内容
#QMAKE_PRE_LINK 表示编译前执行内容

#解压库文件
#QMAKE_PRE_LINK += "cd $$PWD/lib/linux && tar xvzf ffmpeg.tar.gz "
system("cd $$PWD/lib/linux && tar xvzf ffmpeg.tar.gz")
system("cd $$PWD/lib/linux && tar xvzf SDL2.tar.gz")


}

163 changes: 0 additions & 163 deletions module/VideoPlayer/lib/win64/SDL2/include/SDL.h

This file was deleted.

Loading

0 comments on commit 0912c3a

Please sign in to comment.