From 7d146f1797c360c7e1778a1faf7d711fc8ca3063 Mon Sep 17 00:00:00 2001 From: Joseph Henry Date: Mon, 14 Aug 2017 16:07:30 -0700 Subject: [PATCH] Makefile tweak, copy pico module object files to obj --- make-linux.mk | 2 +- make-mac.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/make-linux.mk b/make-linux.mk index 5acb952..8b81bdb 100644 --- a/make-linux.mk +++ b/make-linux.mk @@ -210,7 +210,7 @@ static_lib: picotcp $(ZTO_OBJS) $(CXX) $(CXXFLAGS) $(LIBZT_FILES) $(STACK_DRIVER_FILES) -c mv *.o obj #mv ext/picotcp/build/lib/*.o obj - #mv ext/picotcp/build/modules/*.o obj + mv ext/picotcp/build/modules/*.o obj ar rcs -o $(STATIC_LIB) obj/*.o $(STACK_LIB) endif ifeq ($(STACK_LWIP),1) diff --git a/make-mac.mk b/make-mac.mk index 22c6d11..1642725 100644 --- a/make-mac.mk +++ b/make-mac.mk @@ -209,7 +209,7 @@ static_lib: picotcp $(ZTO_OBJS) $(CXX) $(CXXFLAGS) $(LIBZT_FILES) $(STACK_DRIVER_FILES) -c mv *.o obj #mv ext/picotcp/build/lib/*.o obj - #mv ext/picotcp/build/modules/*.o obj + mv ext/picotcp/build/modules/*.o obj libtool -static -o $(STATIC_LIB) obj/*.o $(STACK_LIB) endif ifeq ($(STACK_LWIP),1)