From 1cdc57aae87f06c58ae259f7d0b66e37bcf70743 Mon Sep 17 00:00:00 2001
From: Phillip Thomas <rphillip.thomas@gmail.com>
Date: Wed, 26 Dec 2018 23:36:04 +0100
Subject: [PATCH] Added VCPKG

Added VCPKG with x64 buils on Windows
---
 dependencies.pri | 47 +++++++++++++++++++++++++++++++++++++++++++++++
 olive.pro        | 24 +++++-------------------
 setup_win64.bat  |  9 +++++++++
 3 files changed, 61 insertions(+), 19 deletions(-)
 create mode 100644 dependencies.pri
 create mode 100644 setup_win64.bat

diff --git a/dependencies.pri b/dependencies.pri
new file mode 100644
index 000000000..a93b619a7
--- /dev/null
+++ b/dependencies.pri
@@ -0,0 +1,47 @@
+
+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
+}
diff --git a/olive.pro b/olive.pro
index 650aedb28..1f17c9a7d 100644
--- a/olive.pro
+++ b/olive.pro
@@ -27,10 +27,11 @@ 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 \
@@ -108,7 +109,7 @@ SOURCES += \
     ui/keyframenavigator.cpp
 
 HEADERS += \
-        mainwindow.h \
+    mainwindow.h \
     panels/project.h \
     panels/effectcontrols.h \
     panels/viewer.h \
@@ -188,7 +189,7 @@ HEADERS += \
     ui/keyframenavigator.h
 
 FORMS += \
-        mainwindow.ui \
+    mainwindow.ui \
     panels/effectcontrols.ui \
     panels/viewer.ui \
     panels/timeline.ui \
@@ -198,21 +199,6 @@ 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
diff --git a/setup_win64.bat b/setup_win64.bat
new file mode 100644
index 000000000..638e6a2a4
--- /dev/null
+++ b/setup_win64.bat
@@ -0,0 +1,9 @@
+@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
+)
\ No newline at end of file