diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json index 4b217c1..0fc3beb 100644 --- a/.vscode/c_cpp_properties.json +++ b/.vscode/c_cpp_properties.json @@ -4,7 +4,15 @@ "name": "Linux", "includePath": [ "${workspaceFolder}/src/intf/**", - "/usr/include/pango-1.0" + "/usr/include/gtk-3.0", + "/usr/include/glib-2.0", + "/usr/lib/x86_64-linux-gnu/glib-2.0/include", + "/usr/include/pango-1.0", + "/usr/include/harfbuzz", + "/usr/include/cairo", + "/usr/include/gdk-pixbuf-2.0", + "/usr/include/atk-1.0", + "/usr/include/libappindicator3-0.1" ], "compilerPath": "/usr/bin/gcc" } diff --git a/Makefile b/Makefile index cf2f3db..a82f9e2 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,6 @@ daemon_sourcefiles := $(shell find src/impl/daemon/ -name *.c) refreshpeers_sourcefiles := $(shell find src/impl/refresh-peers/ -name *.c) shared_sourcefiles := $(shell find src/impl/shared/ -name *.c) libshared := "src/intf/" -libappindicator := "/usr/include/libappindicator3-0.1/" proj_version := $(shell cat project.json | jq .Version -r) @@ -43,7 +42,7 @@ build-cli: build-gui: mkdir -p dist/ && \ - gcc `pkg-config --cflags gtk+-3.0` -shared -fPIC -o dist/libmelonvpngui.so -I ${libshared} -I ${libappindicator} ${gui_sourcefiles} dist/libmelonvpnshared.a `pkg-config --libs gtk+-3.0 appindicator3-0.1` + gcc `pkg-config --cflags gtk+-3.0 appindicator3-0.1` -shared -fPIC -o dist/libmelonvpngui.so -I ${libshared} ${gui_sourcefiles} dist/libmelonvpnshared.a `pkg-config --libs gtk+-3.0 appindicator3-0.1` build-logo: mkdir -p dist/ && \