#17 Add BaseCommon

4 years ago · 1a20ce5443
parent afe9995141
commit 1a20ce5443
29 changed files with 26 additions and 10 deletions
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@ -12,7 +12,10 @@
                "ENABLE_DEBUG=1",
                "USE_GPSD=1"
            ],
-            "group": "build",
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            },
            "problemMatcher": []
        },
        {
@ -25,10 +28,7 @@
                "ENABLE_DEBUG=1",
                "USE_GPSD=1"
            ],
-            "group": {
-                "kind": "build",
-                "isDefault": true
-            },
+            "group": "build",
            "problemMatcher": []
        }
    ]
--- a/BaseCommon/CCITTChecksum.cpp
+++ b/BaseCommon/CCITTChecksum.cpp
--- a/BaseCommon/CCITTChecksum.h
+++ b/BaseCommon/CCITTChecksum.h
--- a/BaseCommon/Config.cpp
+++ b/BaseCommon/Config.cpp
--- a/BaseCommon/Config.h
+++ b/BaseCommon/Config.h
--- a/BaseCommon/Log.cpp
+++ b/BaseCommon/Log.cpp
--- a/BaseCommon/Log.h
+++ b/BaseCommon/Log.h
--- a/BaseCommon/LogConsoleTarget.cpp
+++ b/BaseCommon/LogConsoleTarget.cpp
--- a/BaseCommon/LogConsoleTarget.h
+++ b/BaseCommon/LogConsoleTarget.h
--- a/BaseCommon/LogFileTarget.cpp
+++ b/BaseCommon/LogFileTarget.cpp
--- a/BaseCommon/LogFileTarget.h
+++ b/BaseCommon/LogFileTarget.h
--- a/BaseCommon/LogSeverity.h
+++ b/BaseCommon/LogSeverity.h
--- a/BaseCommon/LogTarget.cpp
+++ b/BaseCommon/LogTarget.cpp
--- a/BaseCommon/LogTarget.h
+++ b/BaseCommon/LogTarget.h
--- a/BaseCommon/Makefile
+++ b/BaseCommon/Makefile
@ -0,0 +1,12 @@
+SRCS = $(wildcard *.cpp)
+OBJS = $(SRCS:.cpp=.o)
+DEPS = $(SRCS:.cpp=.d)
+
+BaseCommon.a: $(OBJS)
+	$(AR) rcs BaseCommon.a $(OBJS)
+
+%.o : %.cpp
+	$(CC) $(CPPFLAGS) -MMD -MD -c $< -o $@
+
+clean:
+	$(RM) *.o *.d BaseCommon.a
--- a/BaseCommon/NetUtils.cpp
+++ b/BaseCommon/NetUtils.cpp
--- a/BaseCommon/NetUtils.h
+++ b/BaseCommon/NetUtils.h
--- a/BaseCommon/RingBuffer.h
+++ b/BaseCommon/RingBuffer.h
--- a/BaseCommon/SHA256.cpp
+++ b/BaseCommon/SHA256.cpp
--- a/BaseCommon/SHA256.h
+++ b/BaseCommon/SHA256.h
--- a/BaseCommon/StringUtils.cpp
+++ b/BaseCommon/StringUtils.cpp
--- a/BaseCommon/StringUtils.h
+++ b/BaseCommon/StringUtils.h
--- a/BaseCommon/Thread.cpp
+++ b/BaseCommon/Thread.cpp
--- a/BaseCommon/Thread.h
+++ b/BaseCommon/Thread.h
--- a/BaseCommon/Timer.cpp
+++ b/BaseCommon/Timer.cpp
--- a/BaseCommon/Timer.h
+++ b/BaseCommon/Timer.h
--- a/BaseCommon/Utils.cpp
+++ b/BaseCommon/Utils.cpp
--- a/BaseCommon/Utils.h
+++ b/BaseCommon/Utils.h
--- a/14
+++ b/14
@ -45,11 +45,14 @@ DEPS = $(SRCS:.cpp=.d)
 .PHONY: all
 all: dstargateway

-dstargateway : GitVersion.h $(OBJS) 
-	$(CC) $(CPPFLAGS) -o dstargateway $(OBJS) $(LDFLAGS)
+dstargateway : GitVersion.h $(OBJS) BaseCommon/BaseCommon.a
+	$(CC) $(CPPFLAGS) -o dstargateway $(OBJS) BaseCommon/BaseCommon.a $(LDFLAGS)

 %.o : %.cpp
-	$(CC) $(CPPFLAGS) -MMD -MD -c $< -o $@
+	$(CC) -IBaseCommon/ $(CPPFLAGS) -MMD -MD -c $< -o $@
+
+BaseCommon/BaseCommon.a: FORCE
+	$(MAKE) -C BaseCommon

 GitVersion.h : FORCE 
 ifneq ("$(wildcard .git/index)","")
@ -71,8 +74,9 @@ endif

 .PHONY: clean
 clean:
-	@$(RM) GitVersion.h $(OBJS) $(DEPS) dstargateway
-	@$(MAKE) -C Tests clean
+	$(RM) GitVersion.h *.o *.d dstargateway
+	$(MAKE) -C Tests clean
+	$(MAKE) -C BaseCommon clean

 -include $(DEPS)