From 7275a64e944ff87e601a5df377d786754fc5c503 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian=20Frohm=C3=BCller?= Date: Thu, 3 Nov 2022 20:37:37 +0100 Subject: [PATCH 1/4] Fix pathnames in build scripts. --- .gitignore | 4 ++-- .vscode/tasks.json | 4 ++-- README.md | 6 +++--- build.sh | 2 +- clean.sh | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 85bef5b..625cd24 100644 --- a/.gitignore +++ b/.gitignore @@ -13,8 +13,8 @@ _deps # Ignore build directories build -debug -release +Debug +Release package # Ignore IDE artifacts diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 532826c..cce951c 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -19,7 +19,7 @@ "label": "▶️ Run OpenSuperClone", "type": "shell", "linux": { - "command": "sudo ./release/bin/opensuperclone", + "command": "sudo ./Release/bin/opensuperclone", }, "presentation": { "clear": true @@ -30,7 +30,7 @@ "label": "▶️ Run OSCViewer", "type": "shell", "linux": { - "command": "./release/bin/oscviewer", + "command": "./Release/bin/oscviewer", }, "presentation": { "clear": true diff --git a/README.md b/README.md index 1ba1b58..0b5a3c5 100644 --- a/README.md +++ b/README.md @@ -63,14 +63,14 @@ Pre-built binaries aswell as Debian packages for OpenSuperClone can be found on - `libgtk-3-dev` (or `libgtk2.0-dev` if building for GTK2) ```Bash -# Build OpenSuperClone and OSCViewer for Release and install to ./release +# Build OpenSuperClone and OSCViewer for Release and install to ./Release $ ./build.sh # Run OpenSuperClone -$ sudo ./release/bin/opensuperclone +$ sudo ./Release/bin/opensuperclone # Run OSCViewer -$ ./release/bin/oscviewer +$ ./Release/bin/oscviewer ``` ## ✏️ Changelog diff --git a/build.sh b/build.sh index 6764c06..abda3c9 100755 --- a/build.sh +++ b/build.sh @@ -1,7 +1,7 @@ mkdir build # Build for Release and install locally -cmake -S . -B ./build -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=./release +cmake -S . -B ./build -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=./Release cd build make diff --git a/clean.sh b/clean.sh index f601562..3a4dd61 100755 --- a/clean.sh +++ b/clean.sh @@ -1,4 +1,4 @@ rm -r build > /dev/null 2>&1 -rm -r debug > /dev/null 2>&1 -rm -r release > /dev/null 2>&1 +rm -r Debug > /dev/null 2>&1 +rm -r Release > /dev/null 2>&1 rm -r package > /dev/null 2>&1 \ No newline at end of file From 590e93629b49035d66fa09bbe4ca3f7a85d9452e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian=20Frohm=C3=BCller?= Date: Thu, 3 Nov 2022 21:50:08 +0100 Subject: [PATCH 2/4] Disable double buffering for OSCViewers main and top draw area to lessen the flickering. --- src/oscviewer/oscviewer3.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/oscviewer/oscviewer3.c b/src/oscviewer/oscviewer3.c index 5bdbfde..9220a97 100644 --- a/src/oscviewer/oscviewer3.c +++ b/src/oscviewer/oscviewer3.c @@ -577,6 +577,9 @@ int main(int argc, char **argv) // g_signal_connect(main_window, "draw", G_CALLBACK(main_drawing_expose_event), NULL); g_signal_connect(G_OBJECT(main_drawing_area), "button-press-event", G_CALLBACK(on_button_press), NULL); + gtk_widget_set_double_buffered(main_drawing_area, FALSE); + gtk_widget_set_double_buffered(top_drawing_area, FALSE); + g_object_unref(builder); gtk_widget_show_all(main_window); From 2a4d8302e3adf287516b8d2bf3999a446dc9db78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian=20Frohm=C3=BCller?= Date: Thu, 3 Nov 2022 22:25:29 +0100 Subject: [PATCH 3/4] Fix typo in tasks.json. --- .vscode/tasks.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.vscode/tasks.json b/.vscode/tasks.json index cce951c..2e14cce 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -74,7 +74,7 @@ "label": "❌ Uninstall", "type": "shell", "linux": { - "command": "./install.sh", + "command": "./uninstall.sh", }, "presentation": { "clear": true From 86a2c6a2e92399726fb5cde68e7f7f4280a76a47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian=20Frohm=C3=BCller?= Date: Fri, 4 Nov 2022 08:53:00 +0100 Subject: [PATCH 4/4] Fix uninstallation script. --- uninstall.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uninstall.sh b/uninstall.sh index a8efdb6..7c61c79 100755 --- a/uninstall.sh +++ b/uninstall.sh @@ -2,4 +2,7 @@ sudo rm -f /usr/local/bin/opensuperclone sudo rm -f /usr/local/bin/oscviewer sudo rm -f -r /usr/local/bin/oscscripts sudo rm -f -r /usr/local/share/doc/opensuperclone -sudo rm -f -r /usr/local/share/doc/oscviewer \ No newline at end of file +sudo rm -f -r /usr/local/share/doc/oscviewer +sudo rm -f /usr/local/share/applications/opensuperclone.desktop +sudo rm -f /usr/local/share/applications/opensupertool.desktop +sudo rm -f /usr/local/share/applications/oscviewer.desktop \ No newline at end of file