diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4d28787d..ca641879 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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: diff --git a/ScreenPlay/CMakeLists.txt b/ScreenPlay/CMakeLists.txt index 9b092b4e..30a78486 100644 --- a/ScreenPlay/CMakeLists.txt +++ b/ScreenPlay/CMakeLists.txt @@ -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}) diff --git a/Tools/build.py b/Tools/build.py index a3b77ee6..f87bcb70 100644 --- a/Tools/build.py +++ b/Tools/build.py @@ -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()