aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJan200101 <sentrycraft123@gmail.com>2020-10-11 18:17:01 +0200
committerJan200101 <sentrycraft123@gmail.com>2020-10-11 18:17:01 +0200
commit7d4e2f33a619b1f46a8f2ba00afa22edca6579e8 (patch)
treec4af21c3d2c727929d9489b3c931cc4b64898bf2 /src
parent26b0417ced82ad849e08db8e8aed0d5529c2b433 (diff)
downloadpolecat-7d4e2f33a619b1f46a8f2ba00afa22edca6579e8.tar.gz
polecat-7d4e2f33a619b1f46a8f2ba00afa22edca6579e8.zip
replace meson with cmake
meson is nice but its completly foreign to me and leaves targets to compile to (e.g Makefile) might revisit in the future but now right now
Diffstat (limited to 'src')
-rw-r--r--src/common.c1
-rw-r--r--src/config.c1
-rw-r--r--src/dxvk.c3
-rw-r--r--src/lutris.c1
-rw-r--r--src/lutris.h2
-rw-r--r--src/main.c1
-rw-r--r--src/meson.build28
-rw-r--r--src/net.c3
-rw-r--r--src/net.h2
-rw-r--r--src/tar.c1
-rw-r--r--src/wine.c3
11 files changed, 5 insertions, 41 deletions
diff --git a/src/common.c b/src/common.c
index c2691fe..352a706 100644
--- a/src/common.c
+++ b/src/common.c
@@ -1,4 +1,3 @@
-#include <polecat-config.h>
#include <stdio.h>
#include <string.h>
diff --git a/src/config.c b/src/config.c
index 26c775a..0126646 100644
--- a/src/config.c
+++ b/src/config.c
@@ -1,4 +1,3 @@
-#include <polecat-config.h>
#include <string.h>
#include <stdio.h>
diff --git a/src/dxvk.c b/src/dxvk.c
index da78851..b4b4fd9 100644
--- a/src/dxvk.c
+++ b/src/dxvk.c
@@ -1,8 +1,7 @@
-#include <polecat-config.h>
#include <stdio.h>
#include <string.h>
-#include <json.h>
+#include <json-c/json.h>
#include <libgen.h>
#include <linux/limits.h>
diff --git a/src/lutris.c b/src/lutris.c
index b06ce40..aa3e085 100644
--- a/src/lutris.c
+++ b/src/lutris.c
@@ -1,4 +1,3 @@
-#include <polecat-config.h>
#include <stdio.h>
#include <string.h>
diff --git a/src/lutris.h b/src/lutris.h
index f3f648d..f3db00f 100644
--- a/src/lutris.h
+++ b/src/lutris.h
@@ -1,7 +1,7 @@
#ifndef LUTRIS_H
#define LUTRIS_H
-#include <json.h>
+#include <json-c/json.h>
enum keyword {
MOVE = 0,
diff --git a/src/main.c b/src/main.c
index 78ad4fe..03dc73c 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,4 +1,3 @@
-#include <polecat-config.h>
#include <stdio.h>
#include <string.h>
diff --git a/src/meson.build b/src/meson.build
deleted file mode 100644
index 06aae89..0000000
--- a/src/meson.build
+++ /dev/null
@@ -1,28 +0,0 @@
-polecat_deps = [libarchive_dep, libcurl_dep, libjson_c_dep]
-
-polecat_sources = files(
- 'common.c',
- 'common.h',
- 'config.c',
- 'config.h',
- 'dxvk.c',
- 'dxvk.h',
- 'lutris.c',
- 'lutris.h',
- 'main.c',
- 'main.h',
- 'net.c',
- 'net.h',
- 'tar.c',
- 'tar.h',
- 'wine.c',
- 'wine.h',
-)
-
-executable(
- 'polecat',
- polecat_sources,
- dependencies : polecat_deps,
- include_directories : conf_inc,
- install : true,
-)
diff --git a/src/net.c b/src/net.c
index 1a9cbdd..5fb1093 100644
--- a/src/net.c
+++ b/src/net.c
@@ -1,11 +1,10 @@
-#include <polecat-config.h>
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
#include <stdint.h>
#include <curl/curl.h>
-#include <json.h>
+#include <json-c/json.h>
#include "net.h"
#include "common.h"
diff --git a/src/net.h b/src/net.h
index 91f6828..5bc5c6e 100644
--- a/src/net.h
+++ b/src/net.h
@@ -1,7 +1,7 @@
#ifndef NET_H
#define NET_H
-#include <json.h>
+#include <json-c/json.h>
size_t WriteMemoryCallback(void*, size_t, size_t, void*);
struct MemoryStruct* downloadToRam(const char* URL);
diff --git a/src/tar.c b/src/tar.c
index 9e6d499..1ffdbe8 100644
--- a/src/tar.c
+++ b/src/tar.c
@@ -1,4 +1,3 @@
-#include <polecat-config.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/src/wine.c b/src/wine.c
index 16de494..28f523f 100644
--- a/src/wine.c
+++ b/src/wine.c
@@ -1,9 +1,8 @@
-#include <polecat-config.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
-#include <json.h>
+#include <json-c/json.h>
#include <libgen.h>
#include <unistd.h>
#include <linux/limits.h>