Skip to content

Commit 185f942

Browse files
committed
moved stringEx to separate repo, to build ceafetch run: make
1 parent 713c9d2 commit 185f942

File tree

5 files changed

+10
-48
lines changed

5 files changed

+10
-48
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
*.exe
22
ceafetch
3+
4+
src/stringEx

Makefile

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,24 @@
33
BUILD_DIR := build
44
SRC_DIR := src
55

6-
BUILD_CMD := gcc -o $(BUILD_DIR)/ceafetch $(SRC_DIR)/ceafetch.c $(SRC_DIR)/libs/stringEx.c
6+
i_stringEx := -L./$(SRC_DIR)/stringEx -I./$(SRC_DIR)/stringEx -lstringEx
7+
BUILD_CMD := gcc -o $(BUILD_DIR)/ceafetch $(SRC_DIR)/ceafetch.c $(i_stringEx)
78

89

910
ifeq ($(OS),Windows_NT)
10-
$(BUILD_DIR)/ceafetch.exe: $(SRC_DIR)/ceafetch.c $(BUILD_DIR)
11+
$(BUILD_DIR)/ceafetch.exe: $(SRC_DIR)/ceafetch.c $(BUILD_DIR) $(SRC_DIR)/stringEx
1112
$(BUILD_CMD)
1213
else
13-
$(BUILD_DIR)/ceafetch: $(SRC_DIR)/ceafetch.c $(BUILD_DIR)
14+
$(BUILD_DIR)/ceafetch: $(SRC_DIR)/ceafetch.c $(BUILD_DIR) $(SRC_DIR)/stringEx
1415
$(BUILD_CMD)
1516

1617
endif
1718

1819
$(BUILD_DIR):
1920
mkdir $(BUILD_DIR)
2021

22+
$(SRC_DIR)/stringEx:
23+
cd $(SRC_DIR) && git clone https://github.com/bendikMichal/stringEx && cd stringEx && make
24+
2125
run:
2226
@./$(BUILD_DIR)/./ceafetch

src/ceafetch.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# include <math.h>
77
# include <string.h>
88

9-
# include "libs/stringEx.h"
9+
# include "stringEx/stringEx.h"
1010

1111
# define MAX_LN 64
1212

@@ -132,7 +132,6 @@ int main () {
132132
RAM.all = get_phys_pages() * sysconf(_SC_PAGESIZE);
133133

134134
RAM.used = RAM.all - RAM.available;
135-
136135

137136
// Detect OS
138137
char OS[256];

src/libs/stringEx.c

Lines changed: 0 additions & 37 deletions
This file was deleted.

src/libs/stringEx.h

Lines changed: 0 additions & 6 deletions
This file was deleted.

0 commit comments

Comments
 (0)