edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-09-20 01:24:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

move manifest to other directory and add MinGW support

Browse source
This commit is contained in:
Jupeyy 2017-10-22 18:06:20 +02:00
parent 9a4efe758c
commit 205b054026
3 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
CMakeLists.txt
View file

@ -753,8 +753,14 @@ if(CLIENT)
if(TARGET_OS STREQUAL "windows")
set(CLIENT_ICON "other/icons/DDNet.rc")
if(MINGW)
set(CLIENT_MANIFEST "other/manifest/dpimanifest.rc")
else()
set(CLIENT_MANIFEST)
endif()
else()
set(CLIENT_ICON)
set(CLIENT_MANIFEST)
endif()
# Target
@ -762,6 +768,7 @@ if(CLIENT)
add_executable(${TARGET_CLIENT}
${CLIENT_SRC}
${CLIENT_ICON}
${CLIENT_MANIFEST}
${DEPS_CLIENT}
$<TARGET_OBJECTS:engine-shared>
$<TARGET_OBJECTS:game-shared>
@ -1304,10 +1311,10 @@ if(MSVC)
TARGET ${CLIENT_EXECUTABLE}
POST_BUILD
COMMAND
"mt.exe" -manifest \"${CMAKE_SOURCE_DIR}/dpimanifest.manifest\" -outputresource:\"${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${CLIENT_EXECUTABLE}.exe\"\;\#1
"mt.exe" -manifest \"${CMAKE_SOURCE_DIR}/other/manifest/dpimanifest.manifest\" -outputresource:\"${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${CLIENT_EXECUTABLE}.exe\"\;\#1
COMMENT "Adding DPI awareness"
)
else()
target_sources(${TARGET_CLIENT} PRIVATE dpimanifest.manifest)
target_sources(${TARGET_CLIENT} PRIVATE other/manifest/dpimanifest.manifest)
endif()
endif()

0
dpimanifest.manifest → other/manifest/dpimanifest.manifest
View file

2
other/manifest/dpimanifest.rc Normal file
View file

@ -0,0 +1,2 @@
#include "winuser.h"
1 RT_MANIFEST dpimanifest.manifest