diff --git a/.gitignore b/.gitignore index c50cbc0..0e68ba1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +bin/ local/ spacetray *~ @@ -5,6 +6,9 @@ spacetray # CLion .idea/ +# CMake +cmake-build-debug/ + # Prerequisites *.d diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 0000000..22a20a1 --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,6 @@ +cmake_minimum_required(VERSION 3.26) +project(spacetray C) + +set(CMAKE_C_STANDARD 11) + +add_executable(spacetray spacetray.c) diff --git a/Makefile b/Makefile index d109fbf..4afc205 100644 --- a/Makefile +++ b/Makefile @@ -1,17 +1,23 @@ all: - $(CC) -Wall -g `pkg-config --cflags --libs gtk+-2.0 --libs libcurl --libs json-c --libs libnotify` -DLIBNOTIFY -o spacetray spacetray.c + $(CC) -Wall -g `pkg-config --cflags --libs gtk+-2.0 --libs libcurl --libs json-c --libs libnotify` -DLIBNOTIFY -o bin/spacetray spacetray.c nonotify: - $(CC) -Wall -g `pkg-config --cflags --libs gtk+-2.0 --libs libcurl --libs json-c` -o spacetray spacetray.c + $(CC) -Wall -g `pkg-config --cflags --libs gtk+-2.0 --libs libcurl --libs json-c` -o bin/spacetray spacetray.c clean: - rm -f spacetray + rm -f ./bin/spacetray + +run: + ./bin/spacetray all2: - $(CC) -Wall -g `pkg-config --cflags --libs gtk+-2.0 --libs appindicator-0.1 --libs libcurl --libs json-c --libs libnotify` -DLIBNOTIFY -o spacetray spacetray.c + $(CC) -Wall -g `pkg-config --cflags --libs gtk+-2.0 --libs appindicator-0.1 --libs libcurl --libs json-c --libs libnotify` -DLIBNOTIFY -o bin/spacetray2 spacetray2.c nonotify2: - $(CC) -Wall -g `pkg-config --cflags --libs gtk+-2.0 --libs appindicator-0.1 --libs libcurl --libs json-c` -o spacetray spacetray.c + $(CC) -Wall -g `pkg-config --cflags --libs gtk+-2.0 --libs appindicator-0.1 --libs libcurl --libs json-c` -o bin/spacetray2 spacetray2.c clean2: - rm -f spacetray2 + rm -f ./bin/spacetray2 + +run2: + ./bin/spacetray2 diff --git a/bin/.gitkeep b/bin/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/spacetray.iml b/spacetray.iml deleted file mode 100644 index 72fbf47..0000000 --- a/spacetray.iml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file