nullworks/oxide2
1
0
Fork 0
mirror of https://github.com/emily33901/oxide2.git synced 2025-08-03 08:56:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

Proper artifact storing

Browse Source
This commit is contained in:
Emily Hudson 2020-06-29 16:11:14 +01:00
parent d6a5cc5a84
commit 3458d4e5de
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.circleci/config.yml
View File

@ -28,5 +28,8 @@ jobs:
ln -s /usr/bin/clang++-6.0 /usr/bin/clang++
make -j2
- store_artifacts:
path: ~/oxide2/bin/Debug/liboxide.a
destination: liboxide.a
path: ~/oxide2/lib/x64_Release/oxide2/liboxide2.a
destination: liboxide2_x64.a
- store_artifacts:
path: ~/oxide2/lib/x32_Release/oxide2/liboxide2.a
destination: liboxide2_x32.a

4
src/oxide_linux.c
View File

@ -240,7 +240,7 @@ Window window_from_name_search(Display *display, Window display_root, Window cur
}
bool oxide_set_target(const char *target_name) {
auto root = RootWindow(display, screen);
Window root = RootWindow(display, screen);
oxide_target_handle = window_from_name_search(display, root, root, target_name);
return oxide_target_handle != 0;
@ -258,7 +258,7 @@ Oxide_WindowSize oxide_resize() {
Oxide_WindowSize new_size = {.width = 0, .height = 0};
if (oxide_target_handle == 0) return new_size;
auto root = DefaultRootWindow(display);
Window root = DefaultRootWindow(display);
XWindowAttributes window_attribs;
XGetWindowAttributes(display, oxide_target_handle, &window_attribs);