Merge pull request #957 from qw-ctf/windows-to-dist-dir

BUILD: Move windows dist files from project root.
QW-Group · Oct 21, 2024 · c3b9c43 · c3b9c43
2 parents 7064430 + 2df486b
commit c3b9c43
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -778,10 +778,10 @@ set(windows_icon "${CMAKE_CURRENT_BINARY_DIR}/ezQuake.rc")
 set(EZQUAKE_RESOURCE_AUTHOR "QW-Group")
 set(EZQUAKE_RESOURCE_NAME "ezQuake")
 set(EZQUAKE_RESOURCE_DESCRIPTION "ezQuake - a QuakeWorld client")
-set(EZQUAKE_RESOURCE_ICON "${PROJECT_SOURCE_DIR}/ezquake.ico")
+set(EZQUAKE_RESOURCE_ICON "${PROJECT_SOURCE_DIR}/dist/windows/ezquake.ico")
 set(EZQUAKE_RESOURCE_VERSION "${version_major},${version_minor},${version_patch},${version_build}")
 set(EZQUAKE_RESOURCE_COMMIT "${version_commit}")
-configure_file("${PROJECT_SOURCE_DIR}/ezQuake.rc.in" ${windows_icon} @ONLY)
+configure_file("${PROJECT_SOURCE_DIR}/dist/windows/ezQuake.rc.in" ${windows_icon} @ONLY)
 
 if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
     # Mark the executable as a non-console application

diff --git a/ezQuake.rc.in → dist/windows/ezQuake.rc.in b/ezQuake.rc.in → dist/windows/ezQuake.rc.in
diff --git a/ezquake.ico → dist/windows/ezquake.ico b/ezquake.ico → dist/windows/ezquake.ico