kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

[qt] Add windows resources to build

Browse source 
Signed-off-by: Osyotr <Osyotr@users.noreply.github.com>
fixup
res fixup
This commit is contained in:
Osyotr 2025-01-19 14:31:19 +03:00 • committed by Viktor Havaka
parent edc19ac605
commit 49fe86b529
5 changed files with 34 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cmake/OmimHelpers.cmake
View file

@ -4,6 +4,10 @@ include(OmimConfig)
function(omim_add_executable executable) function(omim_add_executable executable)
add_executable(${executable} ${ARGN}) add_executable(${executable} ${ARGN})
if (PLATFORM_WIN)
target_sources(${executable} PRIVATE "${CMAKE_CURRENT_FUNCTION_LIST_DIR}/windows/OrganicMaps.manifest")
endif()
# Enable warnings for all our binaries. # Enable warnings for all our binaries.
target_compile_options(${executable} PRIVATE ${OMIM_WARNING_FLAGS}) target_compile_options(${executable} PRIVATE ${OMIM_WARNING_FLAGS})
target_include_directories(${executable} SYSTEM PRIVATE ${3PARTY_INCLUDE_DIRS}) target_include_directories(${executable} SYSTEM PRIVATE ${3PARTY_INCLUDE_DIRS})

26
cmake/windows/OrganicMaps.manifest Normal file
View file

@ -0,0 +1,26 @@
<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
<assembly xmlns='urn:schemas-microsoft-com:asm.v1' manifestVersion='1.0'>
<assemblyIdentity
name="org.organicmaps.organicmaps"
version="1.0.0.0"
processorArchitecture="*"
type="win32"
/>
<!-- Declare support for various versions of Windows -->
<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
<application>
<!-- Windows 10 and Windows 11 -->
<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />
</application>
</compatibility>
<application xmlns="urn:schemas-microsoft-com:asm.v3">
<windowsSettings>
<!-- Force the current process to use UTF-8 as the process code page -->
<activeCodePage xmlns="http://schemas.microsoft.com/SMI/2019/WindowsSettings">UTF-8</activeCodePage>
<!-- Enable long paths that exceed MAX_PATH in length -->
<longPathAware xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">true</longPathAware>
</windowsSettings>
</application>
</assembly>

4
qt/CMakeLists.txt
View file

@ -192,6 +192,10 @@ if (PLATFORM_MAC)
) )
endif() endif()
if (PLATFORM_WIN)
target_sources(${PROJECT_NAME} PRIVATE res/windows.rc)
endif()
if (BUILD_DESIGNER) if (BUILD_DESIGNER)
execute_process( execute_process(
COMMAND cp -rf ${OMIM_ROOT}/data/resources-mdpi_light/ ${OMIM_ROOT}/data/resources-mdpi_design/ COMMAND cp -rf ${OMIM_ROOT}/data/resources-mdpi_light/ ${OMIM_ROOT}/data/resources-mdpi_design/

8
qt/MapsWithMe.manifest
View file

@ -1,8 +0,0 @@
<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
<assembly xmlns='urn:schemas-microsoft-com:asm.v1' manifestVersion='1.0'>
<dependency>
<dependentAssembly>
<assemblyIdentity type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' publicKeyToken='6595b64144ccf1df' language='*' processorArchitecture='*' />
</dependentAssembly>
</dependency>
</assembly>

BIN
qt/res/windows.ico
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 62 KiB

After

Width:  |  Height:  |  Size: 38 KiB