Browse Source

Update Makefiles

JDierkse 5 năm trước cách đây
mục cha
commit
b77fd317c7
3 tập tin đã thay đổi với 7 bổ sung25 xóa
  1. 6 11
      Makefile.conf
  2. 0 13
      Makefile.target
  3. 1 1
      Makefiles

+ 6 - 11
Makefile.conf

@@ -2,17 +2,9 @@
 # Makefile.conf
 #
 
-LFLAGS += -lNetwork
-LFLAGS += -L$(ROOTPATH)/Libraries/Network/lib/$(ARCH)
-CFLAGS += -I$(ROOTPATH)/Libraries/Network/include
-
-LFLAGS += -lLogging
-LFLAGS += -L$(ROOTPATH)/Libraries/Logging/lib/$(ARCH)
-CFLAGS += -I$(ROOTPATH)/Libraries/Logging/include
-
-LFLAGS += -lUtilities
-LFLAGS += -L$(ROOTPATH)/Libraries/Utilities/lib/$(ARCH)
-CFLAGS += -I$(ROOTPATH)/Libraries/Utilities/include
+LIBRARIES += Network
+LIBRARIES += Logging
+LIBRARIES += Utilities
 
 CFLAGS += -I$(ROOTPATH)/Libraries/asio/asio/include
 CFLAGS += -I$(ROOTPATH)/Libraries/clipp
@@ -22,3 +14,6 @@ LFLAGS += -pthread
 CFLAGS += -I$(ROOTPATH) -I$(ROOTPATH)/Libraries
 
 DEBUGDIR := .debug
+
+TARGETS += VStarCamFinder
+

+ 0 - 13
Makefile.target

@@ -1,13 +0,0 @@
-#
-# Makefile.target
-#
-
-VStarCamFinder.$(ARCH): $(OBJECTS) Application/VStarCamFinder.o.$(ARCH)
-	$(call build_target_arch,$@,$^)
-
-VStarCamFinder:
-	$(call build_target,$@)
-
-.DEFAULT_GOAL := VStarCamFinder
-
-TARGETS += VStarCamFinder

+ 1 - 1
Makefiles

@@ -1 +1 @@
-Subproject commit cd9ef1a1b0f7b88f36b0c51b4209d1859aca83aa
+Subproject commit 5afd04e99bb8e0d186b928aadb5029d4deb4357b