Skip to content

Commit

Permalink
ARM64: Embed manifest properly (#4718)
Browse files Browse the repository at this point in the history
Teach our ARM64 based builds to embed the manifest file correctly.

This fixes #4707
  • Loading branch information
dscho committed Feb 3, 2025
2 parents e1d7302 + e75782d commit 4ecf57b
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 0 deletions.
1 change: 1 addition & 0 deletions contrib/buildsystems/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,7 @@ if(CMAKE_C_COMPILER_ID STREQUAL "MSVC")
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR})
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR})
add_compile_options(/MP /std:c11)
add_link_options(/MANIFEST:NO)
endif()

#default behaviour
Expand Down
1 change: 1 addition & 0 deletions git.rc.in
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include<winuser.h>
1 VERSIONINFO
FILEVERSION @GIT_MAJOR_VERSION@,@GIT_MINOR_VERSION@,@GIT_MICRO_VERSION@,@GIT_PATCH_LEVEL@
PRODUCTVERSION @GIT_MAJOR_VERSION@,@GIT_MINOR_VERSION@,@GIT_MICRO_VERSION@,@GIT_PATCH_LEVEL@
Expand Down

0 comments on commit 4ecf57b

Please sign in to comment.