diff --git a/cmake/FreecivInstall.cmake b/cmake/FreecivInstall.cmake index 3a4b81a319..05486cbdb8 100644 --- a/cmake/FreecivInstall.cmake +++ b/cmake/FreecivInstall.cmake @@ -41,10 +41,11 @@ if(WIN32 OR MSYS OR MINGW) # Custom command files to run the applications install( FILES - ${CMAKE_SOURCE_DIR}/dist/freeciv21-server.cmd ${CMAKE_SOURCE_DIR}/data/icons/128x128/freeciv21-client.ico ${CMAKE_SOURCE_DIR}/data/icons/128x128/freeciv21-modpack.ico ${CMAKE_SOURCE_DIR}/data/icons/128x128/freeciv21-server.ico + ${CMAKE_SOURCE_DIR}/dist/windows/freeciv21-server.cmd + ${CMAKE_SOURCE_DIR}/dist/windows/qt.conf DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT freeciv21) endif() diff --git a/dist/freeciv21-server.cmd b/dist/windows/freeciv21-server.cmd similarity index 97% rename from dist/freeciv21-server.cmd rename to dist/windows/freeciv21-server.cmd index 1ccc238913..5863fba92f 100644 --- a/dist/freeciv21-server.cmd +++ b/dist/windows/freeciv21-server.cmd @@ -1,3 +1,3 @@ -@echo off -if not "%1" == "auto" set LANG=%1 -start "%~n0" /D . "%~dp0\freeciv21-server.exe" %2 %3 %4 %5 %6 %7 %8 %9 +@echo off +if not "%1" == "auto" set LANG=%1 +start "%~n0" /D . "%~dp0\freeciv21-server.exe" %2 %3 %4 %5 %6 %7 %8 %9 diff --git a/dist/windows/qt.conf b/dist/windows/qt.conf new file mode 100644 index 0000000000..b842593d71 --- /dev/null +++ b/dist/windows/qt.conf @@ -0,0 +1,5 @@ +[Platforms] +# We force FreeType on Windows because rendering Libertinus with DirectWrite +# looks terrible. +# Dark mode controls window title bars. 1 means follow the system default. +WindowsArguments = fontengine=freetype,darkmode=1