jayden/nova-engine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use preprocessor to exclude platform specify code instead of cmake

Browse Source
This commit is contained in:
Jayden Grubb
2025-03-31 22:17:35 +10:00
parent e76927f847
commit 6a77722ff5
18 changed files with 80 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.clang-format
View File

@@ -66,7 +66,7 @@ IncludeCategories:
CaseSensitive: false
IncludeIsMainRegex: '([-_](test|unittest))?$'
IndentCaseLabels: true
IndentPPDirectives: BeforeHash
IndentPPDirectives: None
IndentWidth: 4
IndentWrappedFunctionNames: false
KeepEmptyLinesAtTheStartOfBlocks: false

58
engine/CMakeLists.txt
View File

@@ -8,54 +8,30 @@ set(NOVA_VULKAN ON CACHE BOOL "Enable Vulkan support")
set(NOVA_WAYLAND ON CACHE BOOL "Enable Wayland support")
set(NOVA_X11 ON CACHE BOOL "Enable X11 support")
if (WIN32)
set(NOVA_WAYLAND OFF)
set(NOVA_X11 OFF)
else ()
set(NOVA_DX12 OFF)
endif ()
if (NOVA_VULKAN)
find_package(Vulkan REQUIRED)
endif ()
set(ENGINE_SRC
core/debug.cpp
drivers/dx12/render_driver.cpp
drivers/linux/system_driver.cpp
drivers/linux/wayland/system_driver.cpp
drivers/linux/x11/system_driver.cpp
drivers/windows/system_driver.cpp
drivers/vulkan/render_driver.cpp
platform/system.cpp
render/renderer.cpp
render/render_device.cpp
)
if (WIN32)
set(ENGINE_SRC
${ENGINE_SRC}
drivers/windows/system_driver.cpp
)
set(NOVA_WAYLAND OFF)
set(NOVA_X11 OFF)
else ()
set(ENGINE_SRC
${ENGINE_SRC}
drivers/linux/system_driver.cpp
)
set(NOVA_DX12 OFF)
endif ()
if (NOVA_DX12)
set(ENGINE_SRC
${ENGINE_SRC}
drivers/dx12/render_driver.cpp
)
endif ()
if (NOVA_VULKAN)
find_package(Vulkan REQUIRED)
set(ENGINE_SRC
${ENGINE_SRC}
drivers/vulkan/render_driver.cpp
)
endif ()
if (NOVA_WAYLAND)
set(ENGINE_SRC
${ENGINE_SRC}
drivers/linux/wayland/system_driver.cpp
)
endif ()
if (NOVA_X11)
set(ENGINE_SRC
${ENGINE_SRC}
drivers/linux/x11/system_driver.cpp
)
endif ()
list(TRANSFORM ENGINE_SRC PREPEND ${CMAKE_CURRENT_SOURCE_DIR}/src/)
FetchContent_Declare(

2
engine/include/nova/api.h
View File

@@ -6,6 +6,7 @@
#pragma once
// clang-format off
#ifndef NOVA_API
#ifdef NOVA_WINDOWS
#ifdef NOVA_DLL_EXPORT
@@ -23,3 +24,4 @@
#endif
#endif
#endif
// clang-format on

4
engine/src/drivers/dx12/render_driver.cpp
View File

@@ -4,6 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
#ifdef NOVA_DX12
#include "drivers/dx12/render_driver.h"
#include <nova/core/debug.h>
@@ -17,3 +19,5 @@ DX12RenderDriver::DX12RenderDriver() {
DX12RenderDriver::~DX12RenderDriver() {
NOVA_AUTO_TRACE();
}
#endif // NOVA_DX12

4
engine/src/drivers/dx12/render_driver.h
View File

@@ -6,6 +6,8 @@
#pragma once
#ifdef NOVA_DX12
#include <nova/render/render_driver.h>
namespace Nova {
@@ -15,3 +17,5 @@ namespace Nova {
~DX12RenderDriver() override;
};
} // namespace Nova
#endif // NOVA_DX12

12
engine/src/drivers/linux/system_driver.cpp
View File

@@ -4,14 +4,12 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
#ifdef NOVA_LINUX
#include "drivers/linux/system_driver.h"
#ifdef NOVA_WAYLAND
#include "drivers/linux/wayland/system_driver.h"
#endif
#ifdef NOVA_X11
#include "drivers/linux/x11/system_driver.h"
#endif
#include "drivers/linux/wayland/system_driver.h" // IWYU pragma: keep
#include "drivers/linux/x11/system_driver.h" // IWYU pragma: keep
#include <nova/core/debug.h>
@@ -47,3 +45,5 @@ std::unique_ptr<SystemDriver> LinuxSystemDriver::get_default_driver() {
NOVA_WARN("Unsupported display server");
return std::make_unique<LinuxSystemDriver>();
}
#endif // NOVA_LINUX

4
engine/src/drivers/linux/system_driver.h
View File

@@ -6,6 +6,8 @@
#pragma once
#ifdef NOVA_LINUX
#include <nova/platform/system_driver.h>
#include <memory>
@@ -21,3 +23,5 @@ namespace Nova {
static std::unique_ptr<SystemDriver> get_default_driver();
};
} // namespace Nova
#endif // NOVA_LINUX

4
engine/src/drivers/linux/wayland/system_driver.cpp
View File

@@ -4,6 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
#ifdef NOVA_WAYLAND
#include "drivers/linux/wayland/system_driver.h"
#include <nova/core/debug.h>
@@ -17,3 +19,5 @@ WaylandSystemDriver::WaylandSystemDriver() {
WaylandSystemDriver::~WaylandSystemDriver() {
NOVA_AUTO_TRACE();
}
#endif // NOVA_WAYLAND

4
engine/src/drivers/linux/wayland/system_driver.h
View File

@@ -6,6 +6,8 @@
#pragma once
#ifdef NOVA_WAYLAND
#include "drivers/linux/system_driver.h"
namespace Nova {
@@ -15,3 +17,5 @@ namespace Nova {
~WaylandSystemDriver() override;
};
} // namespace Nova
#endif // NOVA_WAYLAND

4
engine/src/drivers/linux/x11/system_driver.cpp
View File

@@ -4,6 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
#ifdef NOVA_X11
#include "drivers/linux/x11/system_driver.h"
#ifdef NOVA_VULKAN
@@ -30,3 +32,5 @@ const char* X11SystemDriver::get_surface_extension() const {
return nullptr;
#endif
}
#endif // NOVA_X11

4
engine/src/drivers/linux/x11/system_driver.h
View File

@@ -6,6 +6,8 @@
#pragma once
#ifdef NOVA_X11
#include "drivers/linux/system_driver.h"
#include <X11/Xlib.h>
@@ -19,3 +21,5 @@ namespace Nova {
[[nodiscard]] const char* get_surface_extension() const override;
};
} // namespace Nova
#endif // NOVA_X11

4
engine/src/drivers/vulkan/render_driver.cpp
View File

@@ -4,6 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
#ifdef NOVA_VULKAN
#include "drivers/vulkan/render_driver.h"
#include <nova/core/debug.h>
@@ -344,3 +346,5 @@ VkAllocationCallbacks* VulkanRenderDriver::_get_allocator(const VkObjectType typ
(void)type;
return nullptr;
}
#endif // NOVA_VULKAN

4
engine/src/drivers/vulkan/render_driver.h
View File

@@ -6,6 +6,8 @@
#pragma once
#ifdef NOVA_VULKAN
#include <nova/render/render_driver.h>
#include <vulkan/vulkan.h>
@@ -51,3 +53,5 @@ namespace Nova {
static VkAllocationCallbacks* _get_allocator(VkObjectType type);
};
} // namespace Nova
#endif // NOVA_VULKAN

4
engine/src/drivers/windows/system_driver.cpp
View File

@@ -4,6 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
#ifdef NOVA_WINDOWS
#include "drivers/windows/system_driver.h"
#ifdef NOVA_VULKAN
@@ -30,3 +32,5 @@ const char* WindowsSystemDriver::get_surface_extension() const {
return nullptr;
#endif
}
#endif // NOVA_WINDOWS

4
engine/src/drivers/windows/system_driver.h
View File

@@ -6,6 +6,8 @@
#pragma once
#ifdef NOVA_WINDOWS
#include <nova/platform/system_driver.h>
#include <windows.h>
@@ -18,3 +20,5 @@ namespace Nova {
[[nodiscard]] const char* get_surface_extension() const override;
};
} // namespace Nova
#endif // NOVA_WINDOWS

8
engine/src/platform/system.cpp
View File

@@ -4,12 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
#ifdef NOVA_WINDOWS
#include "drivers/windows/system_driver.h"
#endif
#ifdef NOVA_LINUX
#include "drivers/linux/system_driver.h"
#endif
#include "drivers/linux/system_driver.h" // IWYU pragma: keep
#include "drivers/windows/system_driver.h" // IWYU pragma: keep
#include <nova/core/debug.h>
#include <nova/platform/system.h>

8
engine/src/render/renderer.cpp
View File

@@ -4,12 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
#ifdef NOVA_DX12
#include "drivers/dx12/render_driver.h"
#endif
#ifdef NOVA_VULKAN
#include "drivers/vulkan/render_driver.h"
#endif
#include "drivers/dx12/render_driver.h" // IWYU pragma: keep
#include "drivers/vulkan/render_driver.h" // IWYU pragma: keep
#include <nova/core/debug.h>
#include <nova/render/renderer.h>