petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

Fix: [CMake] os/windows/openttd.manifest is not a generated file

Browse Source
This commit is contained in:
glx22
2021-02-05 22:31:33 +01:00
committed by Loïc Guilloux
parent a667ed945f
commit 99448eedca
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@@ -201,6 +201,11 @@ add_executable(openttd WIN32 ${GENERATED_SOURCE_FILES})
set_target_properties(openttd PROPERTIES OUTPUT_NAME "${BINARY_NAME}") set_target_properties(openttd PROPERTIES OUTPUT_NAME "${BINARY_NAME}")
# All other files are added via target_sources() # All other files are added via target_sources()
if(MSVC)
# Add DPI manifest to project; other WIN32 targets get this via ottdres.rc
target_sources(openttd PRIVATE "${CMAKE_SOURCE_DIR}/os/windows/openttd.manifest")
endif()
add_subdirectory(${CMAKE_SOURCE_DIR}/src) add_subdirectory(${CMAKE_SOURCE_DIR}/src)
add_subdirectory(${CMAKE_SOURCE_DIR}/media/baseset) add_subdirectory(${CMAKE_SOURCE_DIR}/media/baseset)

3
cmake/CompileFlags.cmake
View File

@@ -27,9 +27,6 @@ macro(compile_flags)
# Enable multi-threaded compilation. # Enable multi-threaded compilation.
add_compile_options(/MP) add_compile_options(/MP)
endif() endif()
# Add DPI manifest to project; other WIN32 targets get this via ottdres.rc
list(APPEND GENERATED_SOURCE_FILES "${CMAKE_SOURCE_DIR}/os/windows/openttd.manifest")
endif() endif()
# Add some -D flags for Debug builds. We cannot use add_definitions(), because # Add some -D flags for Debug builds. We cannot use add_definitions(), because