From b5bc16afcfa08228c32b7c47241aec0d8323c199 Mon Sep 17 00:00:00 2001
From: OusmBlueNinja <89956790+OusmBlueNinja@users.noreply.github.com>
Date: Sun, 13 Apr 2025 17:49:58 -0500
Subject: [PATCH] Build update
---
imgui.ini | 20 +++++++++---------
.../__pycache__/remake_config.cpython-312.pyc | Bin 965 -> 975 bytes
build.log => remake/build.log | 4 +---
remake/remake_config.py | 2 +-
4 files changed, 12 insertions(+), 14 deletions(-)
rename build.log => remake/build.log (54%)
diff --git a/imgui.ini b/imgui.ini
index d622fe7..cbd1e66 100644
--- a/imgui.ini
+++ b/imgui.ini
@@ -10,24 +10,24 @@ Collapsed=1
[Window][WindowOverViewport_11111111]
Pos=0,19
-Size=1920,1158
+Size=1280,701
Collapsed=0
[Window][Inspector]
-Pos=1408,19
-Size=512,835
+Pos=768,19
+Size=512,505
Collapsed=0
DockId=0x00000005,0
[Window][Scene Tree]
Pos=0,19
-Size=263,1158
+Size=263,701
Collapsed=0
DockId=0x00000001,0
[Window][Viewport]
Pos=265,19
-Size=1141,869
+Size=501,412
Collapsed=0
DockId=0x00000007,0
@@ -36,14 +36,14 @@ Size=1280,19
Collapsed=0
[Window][Performance Info]
-Pos=1408,856
-Size=512,321
+Pos=768,526
+Size=512,194
Collapsed=0
DockId=0x00000006,0
[Window][Console]
-Pos=265,890
-Size=1141,287
+Pos=265,433
+Size=501,287
Collapsed=0
DockId=0x00000008,0
@@ -54,7 +54,7 @@ Collapsed=0
DockId=0x00000007,1
[Docking][Data]
-DockSpace ID=0x11111111 Window=0x1BBC0F80 Pos=0,19 Size=1920,1158 Split=X
+DockSpace ID=0x11111111 Window=0x1BBC0F80 Pos=0,19 Size=1280,701 Split=X
DockNode ID=0x00000003 Parent=0x11111111 SizeRef=1406,1158 Split=X
DockNode ID=0x00000001 Parent=0x00000003 SizeRef=263,701 HiddenTabBar=1 Selected=0x12EF0F59
DockNode ID=0x00000002 Parent=0x00000003 SizeRef=1141,701 Split=Y Selected=0xC450F867
diff --git a/remake/__pycache__/remake_config.cpython-312.pyc b/remake/__pycache__/remake_config.cpython-312.pyc
index 5f246165277e6d9211c88ad3cd01f0aa2cc155cb..36e3ab8eeb0bc0dfbf6f11fcfdbfdf8ae2cb0e25 100644
GIT binary patch
delta 55
zcmX@gex9B8G%qg~0}xzM`;+dnk#{m9myn)*QEF~tcB=m7g^cZtj1wknGTX6T5Ky_y
KtvWe}IT8TLln{ad
delta 45
zcmX@lew3Z}G%qg~0}#CX_dDHsBkyEJM$XNv7~2^c`zISQ+p$jIzRWE%xr{jy07^Cu
A{{R30
diff --git a/build.log b/remake/build.log
similarity index 54%
rename from build.log
rename to remake/build.log
index 8971de4..0a649dd 100644
--- a/build.log
+++ b/remake/build.log
@@ -1,4 +1,2 @@
-[COMPILE] g++ -std=c++20 -Wall -Isrc/include -Isrc/vendor -Isrc/vendor/imgui -IC:/msys64/mingw64/include -Isrc/include -Isrc/vendor -Isrc/vendor/imgui -IC:/msys64/mingw64/include -Isrc\vendor\imgui -IC:\msys64\mingw64\lib\libyaml-cpp.a -MMD -MP -c src\src\Components\TilemapComponent.cpp -o src\build\src\Components\TilemapComponent.o
-[COMPILE] g++ -std=c++20 -Wall -Isrc/include -Isrc/vendor -Isrc/vendor/imgui -IC:/msys64/mingw64/include -Isrc/include -Isrc/vendor -Isrc/vendor/imgui -IC:/msys64/mingw64/include -Isrc\vendor\imgui -IC:\msys64\mingw64\lib\libyaml-cpp.a -MMD -MP -c src\src\utils\utils.cpp -o src\build\src\utils\utils.o
[LINK] g++ src\build\src\Engine.o src\build\src\main.o src\build\src\Renderer.o src\build\src\Components\CameraComponent.o src\build\src\Components\LightComponent.o src\build\src\Components\SpriteComponent.o src\build\src\Components\TilemapComponent.o src\build\src\Entitys\Object.o src\build\src\utils\EngineConfig.o src\build\src\utils\FileDialog.o src\build\src\utils\Logging.o src\build\src\utils\Shader.o src\build\src\utils\utils.o src\build\vendor\imgui\imgui.o src\build\vendor\imgui\imgui_demo.o src\build\vendor\imgui\imgui_draw.o src\build\vendor\imgui\imgui_impl_glfw.o src\build\vendor\imgui\imgui_impl_opengl3.o src\build\vendor\imgui\imgui_tables.o src\build\vendor\imgui\imgui_widgets.o -o src\build\app.exe -LC:\msys64\mingw64\lib -lglfw3 -lglew32 -lopengl32 -lgdi32 -lyaml-cpp -lcomdlg32 -lssl -lcrypto
-[RUN] Executed app.exe successfully.
+[ERROR] Interrupted by user.
diff --git a/remake/remake_config.py b/remake/remake_config.py
index 4837fa3..6481574 100644
--- a/remake/remake_config.py
+++ b/remake/remake_config.py
@@ -20,7 +20,7 @@ LIB_DIRS = [
# Compiler and build options
BUILD_DIR = Path("src/build")
TARGET = BUILD_DIR / "app.exe"
-LOG_FILE = Path("build.log")
+LOG_FILE = Path("./remake/build.log")
CACHE_FILE = Path("./remake/.remake_cache.json")
CXX = "g++"
CXXFLAGS = ["-std=c++20", "-Wall"] + [f"-I{inc}" for inc in INCLUDE_DIRS]