Mirrors/ScreenPlay
Mirrors/ScreenPlay
1
0
Fork 0
mirror of https://gitlab.com/kelteseth/ScreenPlay.git synced 2024-11-06 19:12:30 +01:00
Code Issues Projects Releases Activity

Fix casing and macos build

Browse Source
This commit is contained in:
Elias Steurer 2020-10-31 19:32:15 +01:00
parent e1f75d639c
commit 051a31a065
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@ -61,7 +61,7 @@ build:osx_debug:
paths:
- build-x64-osx-debug/bin/
build:osx_debug:
build:osx_release:
stage: build
allow_failure: true
tags:

4
ScreenPlay/CMakeLists.txt
View File

@ -71,9 +71,9 @@ set_source_files_properties(${l10n} PROPERTIES OUTPUT_LOCATION "${CMAKE_CURRENT_
qt5_add_translation(qmFiles ${l10n})
if(CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
qt5_add_resources(qml qml.qrc resources.qrc)
qt5_add_resources(qml qml.qrc Resources.qrc)
else()
qtquick_compiler_add_resources(qml qml.qrc resources.qrc)
qtquick_compiler_add_resources(qml qml.qrc Resources.qrc)
endif()
add_executable(${PROJECT_NAME} ${src} ${headers} ${resources} ${qml})

10
Tools/build.py
View File

@ -49,21 +49,21 @@ if platform == "win32":
os.environ.update(dict)
cmake_prefix_path = "c:/Qt/" + qt_version + "/" + windows_msvc
cmake_target_triplet = "x64-windows"
os.system("Tools/install_dependencies_windows.bat")
os.system("install_dependencies_windows.bat")
elif platform == "darwin":
cmake_prefix_path = "~/Qt/" + qt_version "/clang_64"
deploy_executable = "macdeployqt"
cmake_target_triplet = "x64-osx"
print("Executing install_dependencies_linux_mac.sh")
os.system("chmod +x Tools/install_dependencies_linux_mac.sh")
os.system("Tools/install_dependencies_linux_mac.sh")
os.system("chmod +x install_dependencies_linux_mac.sh")
os.system("install_dependencies_linux_mac.sh")
elif platform == "linux":
deploy_executable = "linuxdeployqt"
cmake_prefix_path = "~/Qt/"
cmake_target_triplet = "x64-linux"
print("Executing install_dependencies_linux_mac.sh")
os.system("chmod +x Tools/install_dependencies_linux_mac.sh")
os.system("Tools/install_dependencies_linux_mac.sh")
os.system("chmod +x install_dependencies_linux_mac.sh")
os.system("install_dependencies_linux_mac.sh")
# REMOVE OLD BUILD FOLDER
cwd = os.getcwd()