From 819d1d2b041e6f136774f2888c6e7dcce8bd2e73 Mon Sep 17 00:00:00 2001 From: Johannes Date: Mon, 3 May 2021 21:56:41 +0200 Subject: [PATCH 1/9] [cmake] Add windows resource file for application icon and metadata --- CMakeLists.txt | 5 +++ example/CMakeLists.txt | 7 +++- platform/windows/CMakeLists.txt | 17 +++++++++ platform/windows/inexor_icon_256px.ico | Bin 0 -> 21578 bytes platform/windows/resource.hpp.in | 11 ++++++ platform/windows/win_resource_file.rc.in | 42 +++++++++++++++++++++++ 6 files changed, 81 insertions(+), 1 deletion(-) create mode 100644 platform/windows/CMakeLists.txt create mode 100644 platform/windows/inexor_icon_256px.ico create mode 100644 platform/windows/resource.hpp.in create mode 100644 platform/windows/win_resource_file.rc.in diff --git a/CMakeLists.txt b/CMakeLists.txt index 35be6e286..83d1dd541 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -60,6 +60,11 @@ execute_process( ) add_subdirectory(shaders) + +if(MSVC) + add_subdirectory(platform/windows) +endif() + add_subdirectory(src) if(INEXOR_BUILD_BENCHMARKS) diff --git a/example/CMakeLists.txt b/example/CMakeLists.txt index 44d5eb47c..a52f555e2 100644 --- a/example/CMakeLists.txt +++ b/example/CMakeLists.txt @@ -1,4 +1,9 @@ -add_executable(inexor-vulkan-renderer-example main.cpp) +add_executable(inexor-vulkan-renderer-example +main.cpp +# Windows resource file to set application icon and metadata +${CMAKE_BINARY_DIR}/include/inexor/vulkan-renderer/resource.hpp +${CMAKE_BINARY_DIR}/include/inexor/vulkan-renderer/win_resource_file.rc +) set_target_properties( inexor-vulkan-renderer-example PROPERTIES diff --git a/platform/windows/CMakeLists.txt b/platform/windows/CMakeLists.txt new file mode 100644 index 000000000..06a20da01 --- /dev/null +++ b/platform/windows/CMakeLists.txt @@ -0,0 +1,17 @@ +set(APP_MANUFACTURER_NAME "Inexor collective") +set(APP_DESCRIPTION "Inexor vulkan-renderer") +set(APP_NAME "Inexor engine") +set(APP_LICENSE "MIT License") +set(APP_ORIGINAL_NAME "Inexor vulkan renderer example") +set(APP_VERSION_MAJOR 1) +set(APP_VERSION_MINOR 0) +set(APP_VERSION_PATCH 0) + +# Replace variables in resource file with CMake values +configure_file( + win_resource_file.rc.in ${CMAKE_BINARY_DIR}/include/inexor/vulkan-renderer/win_resource_file.rc +) + +configure_file( + resource.hpp.in ${CMAKE_BINARY_DIR}/include/inexor/vulkan-renderer/resource.hpp +) diff --git a/platform/windows/inexor_icon_256px.ico b/platform/windows/inexor_icon_256px.ico new file mode 100644 index 0000000000000000000000000000000000000000..ab3be7a55f7b29ee995b38f314e1021bd1cae2a9 GIT binary patch literal 21578 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 Date: Mon, 19 Jul 2021 21:29:56 +0200 Subject: [PATCH 2/9] [metadata] Clean up and Add requested changes --- example/CMakeLists.txt | 3 +-- platform/windows/CMakeLists.txt | 17 ----------------- platform/windows/resource.hpp.in | 11 ----------- ...resource_file.rc.in => win_resource_file.rc} | 2 -- 4 files changed, 1 insertion(+), 32 deletions(-) delete mode 100644 platform/windows/CMakeLists.txt delete mode 100644 platform/windows/resource.hpp.in rename platform/windows/{win_resource_file.rc.in => win_resource_file.rc} (98%) diff --git a/example/CMakeLists.txt b/example/CMakeLists.txt index a52f555e2..fedc253c9 100644 --- a/example/CMakeLists.txt +++ b/example/CMakeLists.txt @@ -1,8 +1,7 @@ add_executable(inexor-vulkan-renderer-example main.cpp # Windows resource file to set application icon and metadata -${CMAKE_BINARY_DIR}/include/inexor/vulkan-renderer/resource.hpp -${CMAKE_BINARY_DIR}/include/inexor/vulkan-renderer/win_resource_file.rc +${PROJECT_SOURCE_DIR}/platform/windows/win_resource_file.rc ) set_target_properties( diff --git a/platform/windows/CMakeLists.txt b/platform/windows/CMakeLists.txt deleted file mode 100644 index 06a20da01..000000000 --- a/platform/windows/CMakeLists.txt +++ /dev/null @@ -1,17 +0,0 @@ -set(APP_MANUFACTURER_NAME "Inexor collective") -set(APP_DESCRIPTION "Inexor vulkan-renderer") -set(APP_NAME "Inexor engine") -set(APP_LICENSE "MIT License") -set(APP_ORIGINAL_NAME "Inexor vulkan renderer example") -set(APP_VERSION_MAJOR 1) -set(APP_VERSION_MINOR 0) -set(APP_VERSION_PATCH 0) - -# Replace variables in resource file with CMake values -configure_file( - win_resource_file.rc.in ${CMAKE_BINARY_DIR}/include/inexor/vulkan-renderer/win_resource_file.rc -) - -configure_file( - resource.hpp.in ${CMAKE_BINARY_DIR}/include/inexor/vulkan-renderer/resource.hpp -) diff --git a/platform/windows/resource.hpp.in b/platform/windows/resource.hpp.in deleted file mode 100644 index 1e6b73b23..000000000 --- a/platform/windows/resource.hpp.in +++ /dev/null @@ -1,11 +0,0 @@ -// Specify icon from resource file as icon of executable -#define IDI_ICON1 105 - -#ifdef APSTUDIO_INVOKED -#ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 106 -#define _APS_NEXT_COMMAND_VALUE 40001 -#define _APS_NEXT_CONTROL_VALUE 1001 -#define _APS_NEXT_SYMED_VALUE 101 -#endif -#endif diff --git a/platform/windows/win_resource_file.rc.in b/platform/windows/win_resource_file.rc similarity index 98% rename from platform/windows/win_resource_file.rc.in rename to platform/windows/win_resource_file.rc index c9d8031b4..4657e5ef0 100644 --- a/platform/windows/win_resource_file.rc.in +++ b/platform/windows/win_resource_file.rc @@ -1,5 +1,3 @@ -#include "resource.hpp" - #define APSTUDIO_READONLY_SYMBOLS #include "winres.h" #undef APSTUDIO_READONLY_SYMBOLS From 95ffa28039de2f85a07ef1792e1e150a2ddcca52 Mon Sep 17 00:00:00 2001 From: Johannes Schneider Date: Mon, 19 Jul 2021 21:35:45 +0200 Subject: [PATCH 3/9] [cmake] Fix CMake for Windows --- CMakeLists.txt | 4 ---- 1 file changed, 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 83d1dd541..2872fb62b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -61,10 +61,6 @@ execute_process( add_subdirectory(shaders) -if(MSVC) - add_subdirectory(platform/windows) -endif() - add_subdirectory(src) if(INEXOR_BUILD_BENCHMARKS) From f86850851f2a79013ecb105947de7cf39fb55452 Mon Sep 17 00:00:00 2001 From: Johannes Schneider Date: Mon, 19 Jul 2021 23:13:11 +0200 Subject: [PATCH 4/9] [cmake] Fix configuration of Windows resource file --- CMakeLists.txt | 4 ++++ example/CMakeLists.txt | 2 -- platform/windows/CMakeLists.txt | 1 + .../windows/{win_resource_file.rc => win_resource_file.rc.in} | 0 4 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 platform/windows/CMakeLists.txt rename platform/windows/{win_resource_file.rc => win_resource_file.rc.in} (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2872fb62b..d6475649e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -63,6 +63,10 @@ add_subdirectory(shaders) add_subdirectory(src) +if(MSVC) + add_subdirectory(platform/windows) +endif() + if(INEXOR_BUILD_BENCHMARKS) add_subdirectory(benchmarks) endif() diff --git a/example/CMakeLists.txt b/example/CMakeLists.txt index fedc253c9..4454de1a0 100644 --- a/example/CMakeLists.txt +++ b/example/CMakeLists.txt @@ -1,7 +1,5 @@ add_executable(inexor-vulkan-renderer-example main.cpp -# Windows resource file to set application icon and metadata -${PROJECT_SOURCE_DIR}/platform/windows/win_resource_file.rc ) set_target_properties( diff --git a/platform/windows/CMakeLists.txt b/platform/windows/CMakeLists.txt new file mode 100644 index 000000000..3900ae8db --- /dev/null +++ b/platform/windows/CMakeLists.txt @@ -0,0 +1 @@ +configure_file(win_resource_file.rc.in ${CMAKE_BINARY_DIR}/win_resource_file.rc) diff --git a/platform/windows/win_resource_file.rc b/platform/windows/win_resource_file.rc.in similarity index 100% rename from platform/windows/win_resource_file.rc rename to platform/windows/win_resource_file.rc.in From 42e015e1358f4159a318ee3d794063a3b5673ae0 Mon Sep 17 00:00:00 2001 From: Johannes Schneider Date: Mon, 19 Jul 2021 23:51:50 +0200 Subject: [PATCH 5/9] [cmake] Fix metadata in Windows resource file --- CMakeLists.txt | 2 ++ example/CMakeLists.txt | 1 + platform/windows/CMakeLists.txt | 2 +- platform/windows/win_resource_file.rc.in | 20 ++++++++++---------- 4 files changed, 14 insertions(+), 11 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d6475649e..cca75a122 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -39,7 +39,9 @@ include(conan_setup) # The marked constants in application.hpp will be replaced with the following values set(INEXOR_ENGINE_NAME "Inexor Engine") +set(INEXOR_DEV_TEAM_NAME "Inexor Collective") set(INEXOR_APP_NAME "Inexor Vulkan-renderer example") +set(INEXOR_LICENSE "MIT License") set(INEXOR_ENGINE_VERSION_MAJOR 0) set(INEXOR_ENGINE_VERSION_MINOR 1) diff --git a/example/CMakeLists.txt b/example/CMakeLists.txt index 4454de1a0..8f4b6c997 100644 --- a/example/CMakeLists.txt +++ b/example/CMakeLists.txt @@ -1,5 +1,6 @@ add_executable(inexor-vulkan-renderer-example main.cpp +${CMAKE_BINARY_DIR}/include/inexor/vulkan-renderer/win_resource_file.rc ) set_target_properties( diff --git a/platform/windows/CMakeLists.txt b/platform/windows/CMakeLists.txt index 3900ae8db..7c093b40f 100644 --- a/platform/windows/CMakeLists.txt +++ b/platform/windows/CMakeLists.txt @@ -1 +1 @@ -configure_file(win_resource_file.rc.in ${CMAKE_BINARY_DIR}/win_resource_file.rc) +configure_file(win_resource_file.rc.in ${CMAKE_BINARY_DIR}/include/inexor/vulkan-renderer/win_resource_file.rc) diff --git a/platform/windows/win_resource_file.rc.in b/platform/windows/win_resource_file.rc.in index 4657e5ef0..0652961cd 100644 --- a/platform/windows/win_resource_file.rc.in +++ b/platform/windows/win_resource_file.rc.in @@ -3,8 +3,8 @@ #undef APSTUDIO_READONLY_SYMBOLS VS_VERSION_INFO VERSIONINFO - FILEVERSION ${APP_VERSION_MAJOR},${APP_VERSION_MINOR},${APP_VERSION_PATCH},0 - PRODUCTVERSION ${APP_VERSION_MAJOR},${APP_VERSION_MINOR},${APP_VERSION_PATCH},0 + FILEVERSION ${INEXOR_APP_VERSION_MAJOR},${INEXOR_APP_VERSION_MINOR},${INEXOR_APP_VERSION_PATCH},0 + PRODUCTVERSION ${INEXOR_ENGINE_VERSION_MAJOR},${INEXOR_ENGINE_VERSION_MINOR},${INEXOR_ENGINE_VERSION_PATCH},0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -20,14 +20,14 @@ BEGIN BLOCK "040704b0" BEGIN // These placeholders will be filled out with the values specified by CMake - VALUE "CompanyName", "${APP_MANUFACTURER_NAME}" - VALUE "FileDescription", "${APP_DESCRIPTION}" - VALUE "FileVersion", "${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}.${APP_VERSION_PATCH}" - VALUE "InternalName", "${APP_NAME}" - VALUE "LegalCopyright", "${APP_LICENSE}" - VALUE "OriginalFilename", "${APP_ORIGINAL_NAME}" - VALUE "ProductName", "${APP_NAME}" - VALUE "ProductVersion", "${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}.${APP_VERSION_PATCH}" + VALUE "CompanyName", "${INEXOR_DEV_TEAM_NAME}" + VALUE "FileDescription", "${INEXOR_APP_NAME}" + VALUE "FileVersion", "${INEXOR_APP_VERSION_MAJOR}.${INEXOR_APP_VERSION_MINOR}.${INEXOR_APP_VERSION_PATCH}" + VALUE "InternalName", "${INEXOR_ENGINE_NAME}" + VALUE "LegalCopyright", "${INEXOR_LICENSE}" + VALUE "OriginalFilename", "${INEXOR_APP_NAME}" + VALUE "ProductName", "${INEXOR_APP_NAME}" + VALUE "ProductVersion", "${INEXOR_ENGINE_VERSION_MAJOR}.${INEXOR_ENGINE_VERSION_MINOR}.${INEXOR_ENGINE_VERSION_PATCH}" END END BLOCK "VarFileInfo" From 14a918f2f08e5c6debc6ab5a6cd492e71b1a1512 Mon Sep 17 00:00:00 2001 From: Johannes Schneider Date: Mon, 19 Jul 2021 23:58:53 +0200 Subject: [PATCH 6/9] [cmake] Fix build on platforms other than Windows --- example/CMakeLists.txt | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/example/CMakeLists.txt b/example/CMakeLists.txt index 8f4b6c997..8f2bc1032 100644 --- a/example/CMakeLists.txt +++ b/example/CMakeLists.txt @@ -1,7 +1,13 @@ +if(MSVC) +add_executable(inexor-vulkan-renderer-example + main.cpp + ${CMAKE_BINARY_DIR}/include/inexor/vulkan-renderer/win_resource_file.rc +) +else() add_executable(inexor-vulkan-renderer-example -main.cpp -${CMAKE_BINARY_DIR}/include/inexor/vulkan-renderer/win_resource_file.rc + main.cpp ) +endif() set_target_properties( inexor-vulkan-renderer-example PROPERTIES From b6c5f536231b3726f28dcc9872d199fbc003401a Mon Sep 17 00:00:00 2001 From: Johannes Schneider Date: Tue, 20 Jul 2021 00:07:47 +0200 Subject: [PATCH 7/9] [resource-file] Change language to US English --- platform/windows/win_resource_file.rc.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/windows/win_resource_file.rc.in b/platform/windows/win_resource_file.rc.in index 0652961cd..2c1eb0801 100644 --- a/platform/windows/win_resource_file.rc.in +++ b/platform/windows/win_resource_file.rc.in @@ -32,7 +32,7 @@ BEGIN END BLOCK "VarFileInfo" BEGIN - VALUE "Translation", 0x407, 1200 + VALUE "Translation", 0x0409, 1200 END END From 120b5f35575b248e343c8b8e86296da01c0c3d3a Mon Sep 17 00:00:00 2001 From: Johannes Schneider Date: Thu, 22 Jul 2021 00:19:09 +0200 Subject: [PATCH 8/9] [metadata] Fix build type metadata for Visual Studio multiconfig --- include/inexor/vulkan-renderer/meta.hpp.in | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/include/inexor/vulkan-renderer/meta.hpp.in b/include/inexor/vulkan-renderer/meta.hpp.in index 4c0b01c7a..395e4c978 100644 --- a/include/inexor/vulkan-renderer/meta.hpp.in +++ b/include/inexor/vulkan-renderer/meta.hpp.in @@ -6,14 +6,16 @@ namespace inexor::vulkan_renderer { /// The following data will be replaced by CMake setup. constexpr const char *APP_NAME{"${INEXOR_APP_NAME}"}; -constexpr std::array APP_VERSION{${INEXOR_APP_VERSION_MAJOR}, ${INEXOR_APP_VERSION_MINOR}, - ${INEXOR_APP_VERSION_PATCH}}; +constexpr std::array APP_VERSION{${INEXOR_APP_VERSION_MAJOR}, ${INEXOR_APP_VERSION_MINOR}, ${INEXOR_APP_VERSION_PATCH}}; constexpr const char *APP_VERSION_STR{"${INEXOR_APP_VERSION_MAJOR}.${INEXOR_APP_VERSION_MINOR}.${INEXOR_APP_VERSION_PATCH}"}; constexpr const char* ENGINE_NAME{"${INEXOR_ENGINE_NAME}"}; -constexpr std::array ENGINE_VERSION{${INEXOR_ENGINE_VERSION_MAJOR}, ${INEXOR_ENGINE_VERSION_MINOR}, - ${INEXOR_ENGINE_VERSION_PATCH}}; +constexpr std::array ENGINE_VERSION{${INEXOR_ENGINE_VERSION_MAJOR}, ${INEXOR_ENGINE_VERSION_MINOR}, ${INEXOR_ENGINE_VERSION_PATCH}}; constexpr const char *ENGINE_VERSION_STR{"${INEXOR_ENGINE_VERSION_MAJOR}.${INEXOR_ENGINE_VERSION_MINOR}.${INEXOR_ENGINE_VERSION_PATCH}"}; constexpr const char *BUILD_GIT = "${INEXOR_GIT_SHA}"; -constexpr const char *BUILD_TYPE = "${CMAKE_BUILD_TYPE}"; +#ifndef NDEBUG +constexpr const char *BUILD_TYPE = "Debug"; +#else +constexpr const char *BUILD_TYPE = "Release"; +#endif } // namespace inexor::vulkan_renderer From 0458ae4f5d24c6b29f61d2e9fd0602f7ebeb85e3 Mon Sep 17 00:00:00 2001 From: Johannes Schneider Date: Thu, 22 Jul 2021 18:42:19 +0200 Subject: [PATCH 9/9] [meta] Add requested changes --- include/inexor/vulkan-renderer/meta.hpp.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/inexor/vulkan-renderer/meta.hpp.in b/include/inexor/vulkan-renderer/meta.hpp.in index 395e4c978..c926a5d89 100644 --- a/include/inexor/vulkan-renderer/meta.hpp.in +++ b/include/inexor/vulkan-renderer/meta.hpp.in @@ -12,10 +12,10 @@ constexpr const char* ENGINE_NAME{"${INEXOR_ENGINE_NAME}"}; constexpr std::array ENGINE_VERSION{${INEXOR_ENGINE_VERSION_MAJOR}, ${INEXOR_ENGINE_VERSION_MINOR}, ${INEXOR_ENGINE_VERSION_PATCH}}; constexpr const char *ENGINE_VERSION_STR{"${INEXOR_ENGINE_VERSION_MAJOR}.${INEXOR_ENGINE_VERSION_MINOR}.${INEXOR_ENGINE_VERSION_PATCH}"}; constexpr const char *BUILD_GIT = "${INEXOR_GIT_SHA}"; -#ifndef NDEBUG -constexpr const char *BUILD_TYPE = "Debug"; -#else +#ifdef NDEBUG constexpr const char *BUILD_TYPE = "Release"; +#else +constexpr const char *BUILD_TYPE = "Debug"; #endif } // namespace inexor::vulkan_renderer