Skip to content

Commit 1805b6b

Browse files
committed
[build] changed to
1 parent 0709713 commit 1805b6b

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1-
test/cmake-build-debug
1+
test/cmake-build
2+
test/cmake-build-cache
23
/cmake-build-debug
4+
/cmake-build
35
.idea/
46
.vscode/
57
.sublimetext/

ekg-ui-library.sublime-project

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,28 +14,28 @@
1414
{
1515
"initializationOptions":
1616
{
17-
"clangd.compile-commands-dir": "./cmake-build-debug"
17+
"clangd.compile-commands-dir": "./cmake-build"
1818
}
1919
}
2020
},
21-
"SublimeLinter.linters.clangtidy.compile_commands": "./cmake-build-debug",
21+
"SublimeLinter.linters.clangtidy.compile_commands": "./cmake-build",
2222
},
2323
"build_systems":
2424
[
2525
{
2626
"name": "Linux Build-&-Test GNU",
2727
"shell_cmd":
28-
"cd $folder && cmake -S . -B ./cmake-build-debug/ -G Ninja -DCMAKE_CXX_COMPILER=/usr/bin/g++ -DCMAKE_EXPORT_COMPILE_COMMANDS=1 -DEKG_LINUX_NOT_FOUND_FREETYPE=1 && cmake --build ./cmake-build-debug/ && cd ./test && cmake -S . -B ./cmake-build-debug -G Ninja -DCMAKE_CXX_COMPILER=/usr/bin/g++ -DEKG_LINUX_NOT_FOUND_FREETYPE=1 && cmake --build ./cmake-build-debug && cd ./bin && ./ekg-gui-showcase-test"
28+
"cd $folder && cmake -S . -B ./cmake-build/ -G Ninja -DCMAKE_CXX_COMPILER=/usr/bin/g++ -DCMAKE_EXPORT_COMPILE_COMMANDS=1 -DEKG_LINUX_NOT_FOUND_FREETYPE=1 && cmake --build ./cmake-build/ && cd ./test && cmake -S . -B ./cmake-build -G Ninja -DCMAKE_CXX_COMPILER=/usr/bin/g++ -DEKG_LINUX_NOT_FOUND_FREETYPE=1 && cmake --build ./cmake-build && cd ./bin && ./ekg-gui-showcase-test"
2929
},
3030
{
3131
"name": "Windows Build-&-Test",
3232
"shell_cmd":
33-
"cd $folder && cmake -S . -B ./cmake-build-debug/ -G Ninja -DCMAKE_EXPORT_COMPILE_COMMANDS=1 -DEKG_LINUX_NOT_FOUND_FREETYPE=1 && cmake --build ./cmake-build-debug/ && cd ./test && cmake -S . -B ./cmake-build-debug -G Ninja -DEKG_LINUX_NOT_FOUND_FREETYPE=1 && cmake --build ./cmake-build-debug && cd ./bin && ./ekg-gui-showcase-test"
33+
"cd $folder && cmake -S . -B ./cmake-build/ -G Ninja -DCMAKE_EXPORT_COMPILE_COMMANDS=1 -DEKG_LINUX_NOT_FOUND_FREETYPE=1 && cmake --build ./cmake-build/ && cd ./test && cmake -S . -B ./cmake-build -G Ninja -DEKG_LINUX_NOT_FOUND_FREETYPE=1 && cmake --build ./cmake-build && cd ./bin && ./ekg-gui-showcase-test"
3434
},
3535
{
3636
"name": "Linux Build-&-Test Clang",
3737
"shell_cmd":
38-
"cd $folder && cmake -S . -B ./cmake-build-debug/ -G Ninja -DCMAKE_CXX_COMPILER=/usr/bin/clang++ -DCMAKE_EXPORT_COMPILE_COMMANDS=1 -DEKG_LINUX_NOT_FOUND_FREETYPE=1 && cmake --build ./cmake-build-debug/ && cd ./test && cmake -S . -B ./cmake-build-debug -G Ninja -DCMAKE_CXX_COMPILER=/usr/bin/clang++ -DEKG_LINUX_NOT_FOUND_FREETYPE=1 && cmake --build ./cmake-build-debug && cd ./bin && ./ekg-gui-showcase-test"
38+
"cd $folder && cmake -S . -B ./cmake-build/ -G Ninja -DCMAKE_CXX_COMPILER=/usr/bin/clang++ -DCMAKE_EXPORT_COMPILE_COMMANDS=1 -DEKG_LINUX_NOT_FOUND_FREETYPE=1 && cmake --build ./cmake-build/ && cd ./test && cmake -S . -B ./cmake-build -G Ninja -DCMAKE_CXX_COMPILER=/usr/bin/clang++ -DEKG_LINUX_NOT_FOUND_FREETYPE=1 && cmake --build ./cmake-build && cd ./bin && ./ekg-gui-showcase-test"
3939
},
4040
],
4141
}

test/src/ekg_gui_showcase_test.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1638,11 +1638,9 @@ int32_t laboratory_testing() {
16381638
ekg::label("", ekg::dock::next | ekg::dock::fill)->set_scaled_height(12);
16391639
ekg::label("wew", ekg::dock::next | ekg::dock::fill);
16401640
ekg::frame("image", {.w = 256, .h = 256}, ekg::dock::none)
1641-
->set_layer(
1642-
&meow_sampler,
1643-
ekg::layer::background
1644-
);
1641+
->set_layer(&meow_sampler, ekg::layer::background);
16451642

1643+
ekg::pop_group_parent();
16461644
ekg::label("ww", ekg::dock::fill);
16471645

16481646
ekg::vec3 clear_color {};

0 commit comments

Comments
 (0)