Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/linux_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ jobs:
-DCMAKE_C_COMPILER_LAUNCHER=ccache \
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
-DCMAKE_BUILD_WITH_INSTALL_RPATH=TRUE \
-DCMAKE_INSTALL_RPATH="\$ORIGIN:\$ORIGIN/engine/native"
-DCMAKE_INSTALL_RPATH="\$ORIGIN:\$ORIGIN/engine"

- name: Compile Target Binary
run: |
Expand Down
24 changes: 12 additions & 12 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
[submodule "engine/native/thirdparty/bx"]
path = engine/native/thirdparty/bx
url = https://github.com/bkaradzic/bx
[submodule "engine/native/thirdparty/bimg"]
path = engine/native/thirdparty/bimg
url = https://github.com/bkaradzic/bimg
[submodule "engine/native/thirdparty/bgfx"]
path = engine/native/thirdparty/bgfx
url = https://github.com/bkaradzic/bgfx
[submodule "engine/native/thirdparty/sdl"]
path = engine/native/thirdparty/sdl
url = https://github.com/libsdl-org/SDL
[submodule "engine/thirdparty/bgfx"]
path = engine/thirdparty/bgfx
url = https://github.com/bkaradzic/bgfx.git
[submodule "engine/thirdparty/bx"]
path = engine/thirdparty/bx
url = https://github.com/bkaradzic/bx.git
[submodule "engine/thirdparty/bimg"]
path = engine/thirdparty/bimg
url = https://github.com/bkaradzic/bimg.git
[submodule "engine/thirdparty/sdl"]
path = engine/thirdparty/sdl
url = https://github.com/libsdl-org/SDL.git
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ include(Shaders)
add_subdirectory(engine)

# Main Executable
add_executable(draconic engine/native/main/main.cpp)
add_executable(draconic engine/runtime/main/main.cpp)

target_link_libraries(draconic
PRIVATE
native
runtime
bgfx
bx
bimg
Expand Down
2 changes: 1 addition & 1 deletion cmake/Modules.cmake
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
include_guard(GLOBAL)

set(NATIVE_SOURCE_DIR "${PROJECT_SOURCE_DIR}/engine/native")
set(NATIVE_SOURCE_DIR "${PROJECT_SOURCE_DIR}/engine")

set(NATIVE_THIRD_PARTY_DIR "${NATIVE_SOURCE_DIR}/thirdparty")

Expand Down
4 changes: 2 additions & 2 deletions cmake/Shaders.cmake
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
include_guard(GLOBAL)

set(SHADER_SRC_DIR "${CMAKE_SOURCE_DIR}/engine/native/rendering/shaders")
set(SHADER_SRC_DIR "${CMAKE_SOURCE_DIR}/engine/runtime/rendering/shaders")
set(SHADER_BIN_DIR "${CMAKE_BINARY_DIR}")
set(BGFX_INCLUDE "${CMAKE_SOURCE_DIR}/engine/native/thirdparty/bgfx/src")
set(BGFX_INCLUDE "${CMAKE_SOURCE_DIR}/engine/thirdparty/bgfx/src")
Comment thread
coderabbitai[bot] marked this conversation as resolved.

function(compile_shaders TARGET_NAME)
file(MAKE_DIRECTORY ${SHADER_BIN_DIR})
Expand Down
13 changes: 11 additions & 2 deletions engine/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,11 @@
add_modules_library(native)
target_link_libraries(native PUBLIC platform core input scene rendering)
add_subdirectory(thirdparty SYSTEM)

add_modules_library(platform)
add_modules_library(core SHARED)
add_modules_library(input)
add_modules_library(runtime)

target_link_libraries(platform PUBLIC platform_impl)
target_link_libraries(core PUBLIC definitions math io memory)
target_link_libraries(input PRIVATE SDL3::SDL3-static platform core)
target_link_libraries(runtime PUBLIC platform core input scene rendering)
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
13 changes: 0 additions & 13 deletions engine/native/CMakeLists.txt

This file was deleted.

1 change: 0 additions & 1 deletion engine/native/thirdparty/bgfx
Submodule bgfx deleted from 8532b2
1 change: 0 additions & 1 deletion engine/native/thirdparty/bimg
Submodule bimg deleted from 9114b4
1 change: 0 additions & 1 deletion engine/native/thirdparty/bx
Submodule bx deleted from cac72f
1 change: 0 additions & 1 deletion engine/native/thirdparty/sdl
Submodule sdl deleted from 1aa722
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
5 changes: 5 additions & 0 deletions engine/runtime/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
add_modules_library(rendering)
add_modules_library(scene)

target_link_libraries(rendering PUBLIC rhi rendergraph mesh material quad_renderer renderer)
target_link_libraries(scene PUBLIC renderable transform_component camera)
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
1 change: 1 addition & 0 deletions engine/thirdparty/bgfx
Submodule bgfx added at 5abee1
1 change: 1 addition & 0 deletions engine/thirdparty/bimg
Submodule bimg added at 7a12ad
1 change: 1 addition & 0 deletions engine/thirdparty/bx
Submodule bx added at 771ce6
1 change: 1 addition & 0 deletions engine/thirdparty/sdl
Submodule sdl added at 4f031e
Loading