Skip to content

Commit 241cc84

Browse files
committed
WIP: Update build configuration and fix Editor include paths
- Update GitHub Actions to use MSBuild v3 and target VS2026. - Add post-build commands in Premake to copy Assimp DLLs to the output directory on Windows. - Standardize ImGuiEx include paths across Editor panels.
1 parent a76713b commit 241cc84

6 files changed

Lines changed: 16 additions & 7 deletions

File tree

.github/workflows/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,15 +52,15 @@ jobs:
5252
install_lavapipe: false
5353

5454
- name: Set up MSBuild
55-
uses: microsoft/setup-msbuild@v2
55+
uses: microsoft/setup-msbuild@v3
5656
with:
5757
msbuild-architecture: 'x64'
5858

5959
- name: Setup
6060
working-directory: ${{env.GITHUB_WORKSPACE}}
6161
run: |
6262
cd scripts
63-
python Setup.py
63+
python Setup.py vs2026
6464
6565
- name: Build
6666
working-directory: ${{env.GITHUB_WORKSPACE}}

Editor/Source/Panels/ConsolePanel.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#include "ConsolePanel.h"
33

44
#include <imgui/imgui.h>
5-
#include "ImGui/ImGuiEx.h"
5+
#include "Lux/ImGui/ImGuiEx.h"
66

77
namespace Lux {
88

Editor/Source/Panels/ContentBrowserPanel.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#include "Lux/Core/Application.h"
66

77
#include <imgui/imgui.h>
8-
#include "ImGui/ImGuiEx.h"
8+
#include "Lux/ImGui/ImGuiEx.h"
99

1010
#include "Lux/Utilities/StringUtils.h"
1111

Editor/Source/Panels/SceneRendererPanel.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#include "SceneRendererPanel.h"
33

44
#include <imgui/imgui.h>
5-
#include "ImGui/ImGuiEx.h"
5+
#include "Lux/ImGui/ImGuiEx.h"
66

77
namespace Lux {
88

Editor/Source/Panels/TextEditorPanel.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#include "TextEditorPanel.h"
33

44
#include <imgui/imgui.h>
5-
#include "ImGui/ImGuiEx.h"
5+
#include "Lux/ImGui/ImGuiEx.h"
66
#include <fstream>
77
#include <sstream>
88

Editor/premake5.lua

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,18 @@ project "Editor"
3333

3434
filter "system:windows"
3535
systemversion "latest"
36-
3736
defines { "LUX_PLATFORM_WINDOWS" }
3837

38+
filter { "system:windows", "configurations:Debug or configurations:Debug-AS" }
39+
postbuildcommands {
40+
'{COPY} "../Core/vendor/assimp/bin/windows/Debug/assimp-vc143-mtd.dll" "%{cfg.targetdir}"',
41+
}
42+
43+
filter { "system:windows", "configurations:Release or configurations:Dist" }
44+
postbuildcommands {
45+
'{COPY} "../Core/vendor/assimp/bin/windows/Release/assimp-vc143-mt.dll" "%{cfg.targetdir}"',
46+
}
47+
3948
filter "system:linux"
4049
defines { "LUX_PLATFORM_LINUX", "__EMULATE_UUID", "BACKWARD_HAS_DW", "BACKWARD_HAS_LIBUNWIND" }
4150
links { "dw", "dl", "unwind", "pthread" }

0 commit comments

Comments
 (0)