oak-team/oak-editor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Deleted files

Browse Source
This commit is contained in:
Phillip Thomas
2018-12-27 12:27:39 +01:00
parent 06137cb860
commit 230fc5a135
3 changed files with 20 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dependencies.pri
-47
View File
@@ -1,47 +0,0 @@
win32 {
RC_FILE = icons/resources.rc
INCLUDEPATH += $$PWD/vcpkg/installed/x64-windows/include
DEPENDPATH += $$PWD/vcpkg/installed/x64-windows/include
win32:CONFIG(release, debug|release): LIBS += -L$$PWD/vcpkg/installed/x64-windows/lib/ -lavcodec \
-L$$PWD/vcpkg/installed/x64-windows/lib/ -lavdevice \
-L$$PWD/vcpkg/installed/x64-windows/lib/ -lavfilter \
-L$$PWD/vcpkg/installed/x64-windows/lib/ -lavformat \
-L$$PWD/vcpkg/installed/x64-windows/lib/ -lavutil \
-L$$PWD/vcpkg/installed/x64-windows/lib/ -lswscale \
-L$$PWD/vcpkg/installed/x64-windows/lib/ -lswresample \
-L$$PWD/vcpkg/installed/x64-windows/lib/ -lpostproc \
-L$$PWD/vcpkg/installed/x64-windows/lib/ -lOpenCL \
-L$$PWD/vcpkg/installed/x64-windows/lib/ -lopengl32 \
-L$$PWD/vcpkg/installed/x64-windows/lib/ -llibx264
win32:CONFIG(debug, debug|release): LIBS += -L$$PWD/vcpkg/installed/x64-windows/debug/lib/ -lavcodec \
-L$$PWD/vcpkg/installed/x64-windows/debug/lib/ -lavdevice \
-L$$PWD/vcpkg/installed/x64-windows/debug/lib/ -lavfilter \
-L$$PWD/vcpkg/installed/x64-windows/debug/lib/ -lavformat \
-L$$PWD/vcpkg/installed/x64-windows/debug/lib/ -lavutil \
-L$$PWD/vcpkg/installed/x64-windows/debug/lib/ -lswscale \
-L$$PWD/vcpkg/installed/x64-windows/debug/lib/ -lswresample \
-L$$PWD/vcpkg/installed/x64-windows/debug/lib/ -lpostproc \
-L$$PWD/vcpkg/installed/x64-windows/debug/lib/ -lOpenCL \
-L$$PWD/vcpkg/installed/x64-windows/debug/lib/ -lopengl32 \
-L$$PWD/vcpkg/installed/x64-windows/debug/lib/ -llibx264
}
mac {
LIBS += -L/usr/local/lib -lavutil -lavformat -lavcodec -lavfilter -lswscale -lswresample
ICON = icons/olive.icns
INCLUDEPATH = /usr/local/include
}
unix:!mac {
CONFIG += link_pkgconfig
PKGCONFIG += libavutil libavformat libavcodec libavfilter libswscale libswresample
}
olive.pro
+20 -6
View File
@@ -27,11 +27,10 @@ DEFINES += QT_DEPRECATED_WARNINGS
# You can also select to disable deprecated APIs only up to a certain version of Qt.
#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0
include(dependencies.pri)
SOURCES += \
main.cpp \
mainwindow.cpp \
main.cpp \
mainwindow.cpp \
panels/project.cpp \
panels/effectcontrols.cpp \
panels/viewer.cpp \
@@ -109,7 +108,7 @@ SOURCES += \
ui/keyframenavigator.cpp
HEADERS += \
mainwindow.h \
mainwindow.h \
panels/project.h \
panels/effectcontrols.h \
panels/viewer.h \
@@ -189,7 +188,7 @@ HEADERS += \
ui/keyframenavigator.h
FORMS += \
mainwindow.ui \
mainwindow.ui \
panels/effectcontrols.ui \
panels/viewer.ui \
panels/timeline.ui \
@@ -199,6 +198,21 @@ FORMS += \
dialogs/preferencesdialog.ui \
dialogs/demonotice.ui
win32 {
RC_FILE = icons/resources.rc
LIBS += -lavutil -lavformat -lavcodec -lavfilter -lswscale -lswresample -lopengl32
}
mac {
LIBS += -L/usr/local/lib -lavutil -lavformat -lavcodec -lavfilter -lswscale -lswresample
ICON = icons/olive.icns
INCLUDEPATH = /usr/local/include
}
unix:!mac {
CONFIG += link_pkgconfig
PKGCONFIG += libavutil libavformat libavcodec libavfilter libswscale libswresample
}
RESOURCES += \
icons/icons.qrc
@@ -227,4 +241,4 @@ unix:!mac {
icon1024.files = $$PWD/packaging/linux/icons/1024x1024/org.olivevideoeditor.Olive.png
icon1024.path = $$PREFIX/share/icons/hicolor/1024x1024/apps
INSTALLS += metainfo desktop mime icon16 icon32 icon48 icon64 icon128 icon256 icon512 icon1024
}
}
setup_win64.bat
-9
View File
@@ -1,9 +0,0 @@
@echo off
if not exist vcpkg (
git clone https://github.com/Microsoft/vcpkg.git
cd vcpkg
call .\bootstrap-vcpkg.bat
cmd /K vcpkg install ffmpeg[x264,opencl] --triplet x64-windows
)