Encapsulated SerialPacket, and made adjustments to accomodate it

2014-08-27 15:35:04 +10:00
parent 426c3a52c2
commit 4b5194918b
6 changed files with 43 additions and 29 deletions
@@ -1,5 +1,5 @@
 #config
-INCLUDES+=. packet serial ../gameplay ../map ../utilities
+INCLUDES+=. packet_types ../utilities ../gameplay ../map
 LIBS+=
 CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))

@@ -17,8 +17,7 @@ OUT=$(addprefix $(OUTDIR)/,libcommon.a)
 #targets
 all: $(OBJ) $(OUT)
 	ar -crs $(OUT) $(OBJ)
-	$(MAKE) -C packet
-	$(MAKE) -C serial
+	$(MAKE) -C packet_types

 $(OBJ): | $(OBJDIR)