diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e389f3a..7eccdae 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -23,8 +23,6 @@ jobs: - name: Download gBar uses: actions/checkout@v3.3.0 - with: - submodules: recursive - name: Run meson run: | diff --git a/.gitmodules b/.gitmodules index 7748e45..e69de29 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +0,0 @@ -[submodule "thirdparty/stb"] - path = thirdparty/stb - url = https://github.com/nothings/stb diff --git a/README.md b/README.md index a65b6ed..e120f3e 100644 --- a/README.md +++ b/README.md @@ -17,9 +17,9 @@ My personal blazingly fast and efficient status bar + widgets, in case anyone fi - meson, gcc/clang, ninja ## Building and installation (Manually) -1. Clone gBar recursively +1. Clone gBar ``` - git clone https://github.com/scorpion-26/gBar --recursive + git clone https://github.com/scorpion-26/gBar ``` 2. Configure with meson diff --git a/flake.nix b/flake.nix index 620c50e..8098aab 100644 --- a/flake.nix +++ b/flake.nix @@ -29,7 +29,6 @@ gtk3 gtk-layer-shell libpulseaudio - stb libdbusmenu-gtk3 libsass ]; diff --git a/meson.build b/meson.build index 77c846c..c7c79bb 100644 --- a/meson.build +++ b/meson.build @@ -121,16 +121,9 @@ endif add_global_arguments('-DUSE_LOGFILE', language: 'cpp') -# stb -fs = import('fs') -stb = include_directories('thirdparty') -add_global_arguments('-DHAS_STB', language: 'cpp') - - libgBar = library('gBar', sources, dependencies: dependencies, - include_directories: stb, install: true) pkg = import('pkgconfig') diff --git a/meson_options.txt b/meson_options.txt index b0c4500..8e6e9e4 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -4,7 +4,7 @@ option('WithHyprland', type: 'boolean', value : true) # Workspaces general, enables Wayland protocol option('WithWorkspaces', type: 'boolean', value : true) -# Tray icons, requires stb git submodule +# Tray icons option('WithSNI', type: 'boolean', value : true) option('WithNvidia', type: 'boolean', value : true) diff --git a/src/Config.h b/src/Config.h index 4e98b9c..dee6094 100644 --- a/src/Config.h +++ b/src/Config.h @@ -123,7 +123,7 @@ public: bool hasBlueZ = false; #endif -#if defined WITH_SNI && defined HAS_STB +#ifdef WITH_SNI bool hasSNI = true; #else bool hasSNI = false; diff --git a/src/SNI.cpp b/src/SNI.cpp index 4709e5b..dd99aaa 100644 --- a/src/SNI.cpp +++ b/src/SNI.cpp @@ -11,9 +11,6 @@ #include #include -#define STB_IMAGE_IMPLEMENTATION -#include - #include #include #include diff --git a/thirdparty/stb b/thirdparty/stb deleted file mode 160000 index 5736b15..0000000 --- a/thirdparty/stb +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 5736b15f7ea0ffb08dd38af21067c314d6a3aae9