SteamFrame/OpenVR-AdvancedSettings-frame
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make Qmake copy package files instead of OS scripts

Browse Source 
Described in commit 97e203fd89e7cb54c7ce96ce779b2e8cb6ac1374

The linux directory in package_files is included even on Windows install
for simplicity and because it takes up less than 1KB.
This commit is contained in:
Vasily
2019-07-24 10:54:55 +02:00
committed by username223
parent 6e088a6ec8
commit 46c8a62565
3 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
advancedSettings.pro
+4 -1
View File
@@ -45,7 +45,7 @@ include($$include_dir/sources.pri)
include($$include_dir/resources.pri) include($$include_dir/resources.pri)
# Copy extra files # Copy extra files
COPIES += resCopy readmeCopy licenseCopy COPIES += resCopy readmeCopy licenseCopy packageFilesCopy
COPY_DEST_DIR = $$OUT_PWD/$$DESTDIR COPY_DEST_DIR = $$OUT_PWD/$$DESTDIR
resCopy.files = src/res/* resCopy.files = src/res/*
@@ -58,3 +58,6 @@ licenseCopy.files = LICENSE \
third-party/openvr/LICENSE-VALVE \ third-party/openvr/LICENSE-VALVE \
third-party/easylogging++/LICENSE-MIT third-party/easylogging++/LICENSE-MIT
licenseCopy.path = $$COPY_DEST_DIR licenseCopy.path = $$COPY_DEST_DIR
packageFilesCopy.files = src/package_files/*
packageFilesCopy.path = $$COPY_DEST_DIR
build_scripts/linux/build_linux.sh
-3
View File
@@ -13,7 +13,4 @@ qmake -spec $QMAKE_SPEC $PROJECT_DIR $QMAKE_EXTRAS
$MAKE_COMMAND $MAKE_COMMAND
$CLANG_TIDY $CLANG_TIDY
cp $PROJECT_DIR/src/package_files/action_manifest.json $BUILD_DIR/bin/linux/AdvancedSettings/
cp $PROJECT_DIR/src/package_files/manifest.vrmanifest $BUILD_DIR/bin/linux/AdvancedSettings/
cp -r $PROJECT_DIR/src/package_files/default_action_manifests $BUILD_DIR/bin/linux/AdvancedSettings/
cp $PROJECT_DIR/third-party/openvr/lib/linux64/libopenvr_api.so $BUILD_DIR/bin/linux/AdvancedSettings/ cp $PROJECT_DIR/third-party/openvr/lib/linux64/libopenvr_api.so $BUILD_DIR/bin/linux/AdvancedSettings/
build_scripts/win/build.py
-3
View File
@@ -119,9 +119,6 @@ def deploy():
say("Copying necessary files:") say("Copying necessary files:")
#package files
copy_folder(get_project_dir() + "\\src\\package_files", get_deploy_dir())
#openvr dll #openvr dll
copy_file(get_project_dir() + "\\third-party\\openvr\\bin\\win64\\openvr_api.dll", get_deploy_dir() + "\\openvr_api.dll") copy_file(get_project_dir() + "\\third-party\\openvr\\bin\\win64\\openvr_api.dll", get_deploy_dir() + "\\openvr_api.dll")