Some renaming

CMakeLists.txt

@@ -53,8 +53,9 @@ option(WITH_ZMQ "Compile with cppzmq" OFF)
 option(WITH_CRASHPAD "Compile with crashpad" OFF)
 option(WITH_DISCORD_RPC "Compile with DISCORD RICH PRESENCE" ON)
 option(USE_LTO "Use link-time optimization" OFF)
+option(WITH_BETTER_RENDERER "Experimental multi-backend renderer based on NVRHI" ON)
 
-option(WITH_LIBMANUL "Experimental multi-backend renderer" ON)
+set(BUILD_EXAMPLES OFF CACHE BOOL "" FORCE)
 
 # vcpkg init
 set(VCPKG_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/ref/vcpkg")
@@ -454,6 +455,7 @@ target_include_directories(${PROJECT_NAME} PRIVATE ${GLM_INCLUDE_DIR})
 
 if (WITH_DISCORD_RPC)
 	add_subdirectory(ref/discord-rpc)
+	set_target_properties(discord-rpc PROPERTIES FOLDER "libraries")
 	target_link_libraries(${PROJECT_NAME} discord-rpc)
 
 	# Add the include directory so the compiler can find discord_rpc.h
@@ -510,7 +512,10 @@ if (WIN32)
 	)
 endif ()
 
-if (WITH_LIBMANUL)
-    add_subdirectory("manul")
-	target_link_libraries(${PROJECT_NAME} "manul")
+if (WITH_BETTER_RENDERER)
+    add_subdirectory("betterRenderer")
+	set_target_properties(betterRenderer betterRenderer_fsr2 betterRenderer_shaders PROPERTIES FOLDER "renderers")
+	target_link_libraries(${PROJECT_NAME} "betterRenderer")
 endif ()
+
+

betterRenderer/CMakeLists.txt

@@ -1,5 +1,5 @@
 
-set(LIBMANUL_NAME "manul")
+set(LIBMANUL_NAME "betterRenderer")
 
 set(LIBMANUL_WITH_DX12 OFF)
 set(LIBMANUL_WITH_VULKAN OFF)
@@ -104,6 +104,6 @@ endif ()
 #endif ()
 
 target_sources(${LIBMANUL_NAME} INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/eu07_source/register.cpp")
-
+set_target_properties(nvrhi yaml-cpp fmt EnTT glfw yaml-cpp-parse yaml-cpp-read yaml-cpp-sandbox PROPERTIES FOLDER "libraries")
 target_link_libraries(${LIBMANUL_NAME} ${LIBMANUL_NAME}_fsr2 nvrhi yaml-cpp fmt EnTT glfw)
-add_dependencies(${LIBMANUL_NAME} ${LIBMANUL_NAME}_shaders)
+add_dependencies(${LIBMANUL_NAME} ${LIBMANUL_NAME}_shaders)

betterRenderer/mashadercompiler/CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.24)
 
 set(CMAKE_CXX_STANDARD 17)
 
-project(MaShaderCompiler)
+project(MaSzynaShaderCompiler)
 
 file(GLOB_RECURSE src "src/*.cpp" "src/*.hpp")
 
@@ -10,16 +10,16 @@ file(GLOB_RECURSE src "src/*.cpp" "src/*.hpp")
 # TODO Make sure that it works as well for people who do not use VCPKG
 find_package(directx-dxc CONFIG REQUIRED)
 
-add_executable(MaShaderCompiler ${src})
+add_executable(MaSzynaShaderCompiler ${src})
 
-target_link_libraries(MaShaderCompiler nvrhi yaml-cpp Microsoft::DirectXShaderCompiler Microsoft::DXIL)
+target_link_libraries(MaSzynaShaderCompiler nvrhi yaml-cpp Microsoft::DirectXShaderCompiler Microsoft::DXIL)
 
 if (WIN32)
-    target_link_libraries(MaShaderCompiler delayimp)
-    target_link_options(MaShaderCompiler PRIVATE "/DELAYLOAD:dxcompiler.dll")
+    target_link_libraries(MaSzynaShaderCompiler delayimp)
+    target_link_options(MaSzynaShaderCompiler PRIVATE "/DELAYLOAD:dxcompiler.dll")
 endif ()
 
-# We later pass the DXIL.dll parent directory as first argument to MaShaderCompiler so that it can sign DX12 shaders
+# We later pass the DXIL.dll parent directory as first argument to MaSzynaShaderCompiler so that it can sign DX12 shaders
 get_target_property(dxil_dll_path Microsoft::DXIL IMPORTED_LOCATION)
 get_filename_component(dxil_dll_path ${dxil_dll_path} DIRECTORY)
-set_target_properties(MaShaderCompiler PROPERTIES dxil_path "${dxil_dll_path}")
+set_target_properties(MaSzynaShaderCompiler PROPERTIES dxil_path "${dxil_dll_path}")

betterRenderer/shaders/CMakeLists.txt

@@ -0,0 +1,10 @@
+
+file(GLOB_RECURSE src "*.hlsl*" "*.h")
+list(APPEND src "project.manul")
+
+get_target_property(dxil_path MaSzynaShaderCompiler dxil_path)
+
+add_custom_target(
+        ${LIBMANUL_NAME}_shaders
+        MaSzynaShaderCompiler "${dxil_path}" "${CMAKE_CURRENT_SOURCE_DIR}/project.manul" "$<TARGET_FILE_DIR:${PROJECT_NAME}>/shaders"
+        DEPENDS ${src})