0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add rc file to VS+cmake configuration.

Browse source
This commit is contained in:
Pentarctagon 2021-06-27 22:51:47 -05:00 • committed by Pentarctagon
parent 3c41b209d3
commit 253aca2c32
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CMakeLists.txt
View file

@ -430,6 +430,7 @@ else()
add_definitions(-D_WIN32_WINNT=_WIN32_WINNT_WIN7 -D_CRT_SECURE_NO_WARNINGS -D_WINSOCK_DEPRECATED_NO_WARNINGS -DNOMINMAX)
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG_LUA")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /MANIFEST:NO")
set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:MSVCRT")
# -DNDEBUG is automatically added to all release build types, so manually remove this define from the related variables

8
src/CMakeLists.txt
View file

@ -152,7 +152,7 @@ endif()
if(ENABLE_GAME)
if(WIN32)
add_executable(wesnoth WIN32 wesnoth.cpp)
add_executable(wesnoth WIN32 wesnoth.cpp ../packaging/windows/wesnoth.rc)
target_link_options(wesnoth PRIVATE /WX /WHOLEARCHIVE:wesnoth-widgets)
elseif(APPLE)
add_executable(wesnoth wesnoth.cpp macosx/SDLMain.mm)
@ -230,7 +230,11 @@ endif()
if(ENABLE_SERVER)
GetSources("wesnothd" wesnothd_sources)
add_executable(wesnothd ${wesnothd_sources})
if(WIN32)
add_executable(wesnothd ${wesnothd_sources} ../packaging/windows/wesnothd.rc)
else()
add_executable(wesnothd ${wesnothd_sources})
endif()
if(ENABLE_MYSQL)
target_include_directories(wesnothd SYSTEM PRIVATE ${MYSQL_CFLAGS})