mirror of
https://gitlab.com/kelteseth/ScreenPlay.git
synced 2024-11-25 12:13:00 +01:00
Formatting
This commit is contained in:
parent
2008ff9235
commit
da5bd382a8
@ -6,7 +6,9 @@ get_project_version(PROJECT_VERSION)
|
|||||||
|
|
||||||
# This must be set before project()
|
# This must be set before project()
|
||||||
if(APPLE)
|
if(APPLE)
|
||||||
set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64" CACHE STRING "" FORCE)
|
set(CMAKE_OSX_ARCHITECTURES
|
||||||
|
"arm64;x86_64"
|
||||||
|
CACHE STRING "" FORCE)
|
||||||
set(SCREENPLAY_QML_MODULES_PATH "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/ScreenPlay.app/Contents/MacOS/qml")
|
set(SCREENPLAY_QML_MODULES_PATH "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/ScreenPlay.app/Contents/MacOS/qml")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
@ -70,7 +72,7 @@ endif()
|
|||||||
option(SCREENPLAY_OSX_BUNDLE "Enable distribution macOS bundle" OFF)
|
option(SCREENPLAY_OSX_BUNDLE "Enable distribution macOS bundle" OFF)
|
||||||
option(SCREENPLAY_STEAM "For FOSS distribution so we do not bundle proprietary code." ON)
|
option(SCREENPLAY_STEAM "For FOSS distribution so we do not bundle proprietary code." ON)
|
||||||
option(SCREENPLAY_DEPLOY "Marks this version as an official deploy version. This version uses different import paths and other settings."
|
option(SCREENPLAY_DEPLOY "Marks this version as an official deploy version. This version uses different import paths and other settings."
|
||||||
OFF)
|
OFF)
|
||||||
option(SCREENPLAY_TESTS "Enables UI tests." ON)
|
option(SCREENPLAY_TESTS "Enables UI tests." ON)
|
||||||
option(SCREENPLAY_INSTALLER "Indicates whether an installer via the Qt Installer Framework is created." OFF)
|
option(SCREENPLAY_INSTALLER "Indicates whether an installer via the Qt Installer Framework is created." OFF)
|
||||||
option(SCREENPLAY_GODOT "Compiles ScreenPlayGodotWallpaper." ON)
|
option(SCREENPLAY_GODOT "Compiles ScreenPlayGodotWallpaper." ON)
|
||||||
|
@ -60,10 +60,7 @@ if(WIN32)
|
|||||||
target_link_libraries(ScreenPlayWallpaperLib PUBLIC shcore.lib)
|
target_link_libraries(ScreenPlayWallpaperLib PUBLIC shcore.lib)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
add_executable(
|
add_executable(${PROJECT_NAME} ${SOURCES} ${HEADER})
|
||||||
${PROJECT_NAME}
|
|
||||||
${SOURCES}
|
|
||||||
${HEADER})
|
|
||||||
|
|
||||||
qt_add_qml_module(
|
qt_add_qml_module(
|
||||||
${PROJECT_NAME}
|
${PROJECT_NAME}
|
||||||
|
@ -4,12 +4,13 @@
|
|||||||
#define NOMINMAX
|
#define NOMINMAX
|
||||||
#endif
|
#endif
|
||||||
#include <windows.h>
|
#include <windows.h>
|
||||||
|
|
||||||
|
// Do not change windows.h order !
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
#include <iostream>
|
|
||||||
#include <shellscalingapi.h>
|
|
||||||
#include <vector>
|
|
||||||
#include <optional>
|
|
||||||
#include <functional>
|
#include <functional>
|
||||||
|
#include <iostream>
|
||||||
|
#include <optional>
|
||||||
|
#include <vector>
|
||||||
|
|
||||||
// Do not sort !
|
// Do not sort !
|
||||||
#include "WinUser.h"
|
#include "WinUser.h"
|
||||||
|
Loading…
Reference in New Issue
Block a user