From b5d69c589c4dafb23f74a9dc457a1e5f5b833197 Mon Sep 17 00:00:00 2001
From: Vasily <vautkin@teknik.io>
Date: Tue, 23 Jul 2019 16:59:40 +0200
Subject: [PATCH] Make Qmake copy package files instead of OS scripts

Described in commit 97e203fd89e7cb54c7ce96ce779b2e8cb6ac1374

The python functions are no longer needed since the python script
doesn't handle file copy any more.
---
 advancedSettings.pro               |  6 ++++-
 build_scripts/linux/build_linux.sh |  1 -
 build_scripts/win/build.py         |  5 ----
 build_scripts/win/common.py        | 37 ------------------------------
 4 files changed, 5 insertions(+), 44 deletions(-)

diff --git a/advancedSettings.pro b/advancedSettings.pro
index 00cf18d..3689b06 100644
--- a/advancedSettings.pro
+++ b/advancedSettings.pro
@@ -45,7 +45,7 @@ include($$include_dir/sources.pri)
 include($$include_dir/resources.pri)
 
 # Copy extra files
-COPIES += resCopy readmeCopy licenseCopy packageFilesCopy
+COPIES += resCopy readmeCopy licenseCopy packageFilesCopy openvrApiCopy
 COPY_DEST_DIR = $$OUT_PWD/$$DESTDIR
 
 resCopy.files = src/res/*
@@ -61,3 +61,7 @@ licenseCopy.path = $$COPY_DEST_DIR
 
 packageFilesCopy.files = src/package_files/*
 packageFilesCopy.path = $$COPY_DEST_DIR
+
+win32:openvrApiCopy.files = third-party/openvr/bin/win64/openvr_api.dll
+unix:openvrApiCopy.files = third-party/openvr/lib/linux64/libopenvr_api.so
+openvrApiCopy.path = $$COPY_DEST_DIR
diff --git a/build_scripts/linux/build_linux.sh b/build_scripts/linux/build_linux.sh
index 7aab13f..6c765e0 100755
--- a/build_scripts/linux/build_linux.sh
+++ b/build_scripts/linux/build_linux.sh
@@ -13,4 +13,3 @@ qmake -spec $QMAKE_SPEC $PROJECT_DIR $QMAKE_EXTRAS
 $MAKE_COMMAND
 $CLANG_TIDY
 
-cp $PROJECT_DIR/third-party/openvr/lib/linux64/libopenvr_api.so $BUILD_DIR/bin/linux/AdvancedSettings/
diff --git a/build_scripts/win/build.py b/build_scripts/win/build.py
index d3a1bdf..6a2e3d6 100644
--- a/build_scripts/win/build.py
+++ b/build_scripts/win/build.py
@@ -117,11 +117,6 @@ def deploy():
 
     say("windeployqt added to file.")
 
-    say("Copying necessary files:")
-
-    #openvr dll
-    copy_file(get_project_dir() + "\\third-party\\openvr\\bin\\win64\\openvr_api.dll", get_deploy_dir() + "\\openvr_api.dll")
-
     say("Creating batch file:")
     create_batch_file()
     say("Batch file created.")
diff --git a/build_scripts/win/common.py b/build_scripts/win/common.py
index a3f0149..651069a 100644
--- a/build_scripts/win/common.py
+++ b/build_scripts/win/common.py
@@ -5,8 +5,6 @@ import os
 import sys
 import argparse
 import subprocess
-import shutil
-import distutils.dir_util
 import string
 
 def get_version_string():
@@ -210,39 +208,4 @@ def get_original_dir():
 
 def get_deploy_dir():
     return DEPLOY_DIR
-
-def copy_file(src, dest):
-    """Copies a file and outputs status to console."""
-    say(f"Copying {src} to {dest}")
-    shutil.copy(src, dest)
-    say(f"{src} to {dest} copied.")
-
-def copy_folder(src, dest):
-    """Copies a folder and outputs status to console."""
-    say(f"Copying {src} to {dest}")
-    distutils.dir_util.copy_tree(src, dest)
-    say(f"{src} to {dest} copied.")
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-