misc: move src/ libraries into libs

Author: Toni500github

Makefile

@@ -61,29 +61,35 @@ LDFLAGS   	+= -L./$(BUILDDIR)/fmt -lfmt -ldl
 CXXFLAGS  	?= -mtune=generic -march=native
 CXXFLAGS        += -fvisibility=hidden -Iinclude -std=c++20 $(VARS) -DVERSION=\"$(VERSION)\" -DLOCALEDIR=\"$(LOCALEDIR)\"
 
-all: genver fmt toml $(TARGET)
+all: genver fmt toml json $(TARGET)
 
 fmt:
 ifeq ($(wildcard $(BUILDDIR)/fmt/libfmt.a),)
 	mkdir -p $(BUILDDIR)/fmt
-	make -C src/fmt BUILDDIR=$(BUILDDIR)/fmt
+	make -C src/libs/fmt BUILDDIR=$(BUILDDIR)/fmt
 endif
 
 toml:
 ifeq ($(wildcard $(BUILDDIR)/toml++/toml.o),)
 	mkdir -p $(BUILDDIR)/toml++
-	make -C src/toml++ BUILDDIR=$(BUILDDIR)/toml++
+	make -C src/libs/toml++ BUILDDIR=$(BUILDDIR)/toml++
+endif
+
+json:
+ifeq ($(wildcard $(BUILDDIR)/json/json.o),)
+	mkdir -p $(BUILDDIR)/json
+	make -C src/libs/json BUILDDIR=$(BUILDDIR)/json
 endif
 
 genver: ./scripts/generateVersion.sh
 ifeq ($(wildcard include/version.h),)
 	./scripts/generateVersion.sh
 endif
 
-$(TARGET): genver fmt toml $(OBJ)
+$(TARGET): genver fmt toml json $(OBJ)
 	mkdir -p $(BUILDDIR)
 	sh ./scripts/generateVersion.sh
-	$(CXX) $(OBJ) $(BUILDDIR)/toml++/toml.o -o $(BUILDDIR)/$(TARGET) $(LDFLAGS)
+	$(CXX) $(OBJ) $(BUILDDIR)/toml++/toml.o $(BUILDDIR)/json/json.o -o $(BUILDDIR)/$(TARGET) $(LDFLAGS)
 	cd $(BUILDDIR)/ && ln -sf $(TARGET) cufetch
 
 locale:

src/display.cpp

@@ -433,5 +433,8 @@ std::vector<std::string> Display::render(const Config& config, const colors_t& c
 void Display::display(const std::vector<std::string>& renderResult)
 {
     for (const std::string& str : renderResult)
-        fmt::print("{}\n", str);
+    {
+        fmt::print("{}", str);
+        fmt::print("\n");
+    }
 }

src/fmt/CMakeLists.txt src/libs/fmt/CMakeLists.txtsrc/fmt/CMakeLists.txt renamed to src/libs/fmt/CMakeLists.txt

@@ -4,7 +4,7 @@
 
 CXX		?= g++
 # CXX_DEFINES 	= -DFMT_LIB_EXPORT -Dfmt_EXPORTS
-CXX_INCLUDES 	= -I../../include
+CXX_INCLUDES 	= -I../../../include
 CXX_FLAGS 	= -O3 -DNDEBUG -fvisibility=hidden -fvisibility-inlines-hidden
 
 all: fmt
@@ -14,10 +14,10 @@ fmt: format.cc os.cc
 	$(CXX) $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -c os.cc -o os.cc.o
 	ar qc libfmt.a os.cc.o format.cc.o
 	ranlib libfmt.a
-	mv -f libfmt.a ../../$(BUILDDIR)/libfmt.a
+	mv -f libfmt.a ../../../$(BUILDDIR)/libfmt.a
 	# $(CXX) -fPIC -O3 -DNDEBUG -shared -Wl,-soname,libfmt.so.10 -o libfmt.so format.cc.o os.cc.o
 
 clean:
-	rm -f *.o *.so *.a ../../$(BUILDDIR)/fmt/.*a
+	rm -f *.o *.so *.a ../../../$(BUILDDIR)/fmt/.*a
 
 .PHONY: clean all fmt

src/fmt/Makefile src/libs/fmt/Makefilesrc/fmt/Makefile renamed to src/libs/fmt/Makefile

@@ -0,0 +1,14 @@
+CXX	?= g++
+SRC 	 = json.cpp
+TARGET   = json.o
+CXXFLAGS = -I../../../include -std=c++20
+
+all: $(TARGET)
+
+$(TARGET):
+	${CXX} $(SRC) $(CXXFLAGS) -c -o ../../../$(BUILDDIR)/$@
+
+clean:
+	rm -rf ../../$(BUILDDIR)/json/$(TARGET)
+
+.PHONY: $(TARGET) clean all

src/fmt/format.cc src/libs/fmt/format.ccsrc/fmt/format.cc renamed to src/libs/fmt/format.cc

@@ -0,0 +1,14 @@
+CXX	?= g++
+SRC 	 = toml.cpp
+TARGET   = toml.o
+CXXFLAGS = -I../../../include -std=c++20
+
+all: $(TARGET)
+
+$(TARGET):
+	${CXX} $(SRC) $(CXXFLAGS) -c -o ../../../$(BUILDDIR)/$@
+
+clean:
+	rm -rf ../../../$(BUILDDIR)/toml++/$(TARGET)
+
+.PHONY: $(TARGET) clean all