Skip to content

Commit 2173db0

Browse files
installed shaders and settings at obelisk (JeanPhilippeKernel#508)
1 parent 29d0bac commit 2173db0

File tree

4 files changed

+14
-18
lines changed

4 files changed

+14
-18
lines changed

Obelisk/CMakeLists.txt

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,4 @@ target_link_libraries(${TARGET_NAME} PUBLIC
4949

5050
set_target_properties(${TARGET_NAME} PROPERTIES INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
5151

52-
install(TARGETS ${TARGET_NAME}
53-
DESTINATION bin
54-
)
55-
56-
57-
58-
52+
install(TARGETS ${TARGET_NAME} DESTINATION bin)

Obelisk/EntryPoint.cpp

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
#include <CLI/CLI.hpp>
2+
#include <Tetragrama/Editor.h>
3+
#include <ZEngine/Applications/GameApplication.h>
24
#include <ZEngine/Core/Memory/MemoryManager.h>
35
#include <ZEngine/EngineConfiguration.h>
46
#include <ZEngine/Logging/Logger.h>
5-
#include <ZEngine/Applications/GameApplication.h>
6-
7-
#include <Tetragrama/Editor.h>
87

98
#ifdef ZENGINE_PLATFORM
109

@@ -23,11 +22,9 @@ int applicationEntryPoint(int argc, char* argv[])
2322
LoggerConfiguration logger_cfg = {};
2423
Logger::Initialize(arena, logger_cfg);
2524

26-
2725
GameApplicationPtr app = nullptr;
2826

29-
30-
CLI::App cli{"ObeliskCLI"};
27+
CLI::App cli{"ObeliskCLI"};
3128
argv = cli.ensure_utf8(argv);
3229

3330
std::string config_file = "";
@@ -37,10 +34,9 @@ int applicationEntryPoint(int argc, char* argv[])
3734

3835
CLI11_PARSE(cli, argc, argv);
3936

40-
4137
if (launch_editor)
4238
{
43-
app = ZPushStructCtor(arena, Tetragrama::Editor);
39+
app = ZPushStructCtor(arena, Tetragrama::Editor);
4440
app->EnableRenderOverlay = true;
4541
}
4642

Resources/CMakeLists.txt

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,15 @@ foreach(FragmentShader ${FragmentShaders})
3131
cmake_path(APPEND ShaderOutputPath ${FragmentShaderOutputFileName} OUTPUT_VARIABLE FragmentShaderOutputPath)
3232

3333

34-
add_custom_target("Compile-${shaderfilename}-fragment" ALL COMMAND glslang-standalone "-V" "-I${ShaderPath}" "-o" "${FragmentShaderOutputPath}" "${FragmentShader}")
34+
add_custom_target("Compile-${shaderfilename}-fragment" ALL COMMAND glslang-standalone "-I${ShaderPath}" "-V" ${Flags} "-o" "${FragmentShaderOutputPath}" "${FragmentShader}")
3535

3636
endforeach()
3737

3838
install(DIRECTORY Editor/Settings DESTINATION bin)
39-
4039
install(DIRECTORY Shaders/Cache DESTINATION bin/Shaders)
40+
41+
# This helps for debugging and development
42+
if (CMAKE_BUILD_TYPE STREQUAL "Debug")
43+
install(DIRECTORY Editor/Settings DESTINATION Obelisk/${CMAKE_BUILD_TYPE})
44+
install(DIRECTORY Shaders/Cache DESTINATION Obelisk/${CMAKE_BUILD_TYPE}/Shaders)
45+
endif()

Scripts/BuildEngine.ps1

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,8 @@ if(-Not $LauncherOnly) {
181181
[string]$clangFormatScript = Join-Path $PSScriptRoot -ChildPath "ClangFormat.ps1"
182182
[string[]]$srcDirectories = @(
183183
(Join-Path $repositoryRootPath -ChildPath "ZEngine"),
184-
(Join-Path $repositoryRootPath -ChildPath "Tetragrama")
184+
(Join-Path $repositoryRootPath -ChildPath "Obelisk"),
185+
(Join-Path $repositoryRootPath -ChildPath "Tetragrama"),
185186
(Join-Path $repositoryRootPath -ChildPath "Resources/Shaders")
186187
)
187188

0 commit comments

Comments
 (0)