From 634f5da8c988a5e83edfb5053260ea110bce337d Mon Sep 17 00:00:00 2001 From: wangzhengquan <wangzhengquan85@126.com> Date: 星期一, 20 七月 2020 18:28:20 +0800 Subject: [PATCH] 解决冲突 --- /dev/null | 0 queue/Makefile | 3 +-- queue/libshm_queue.so | 0 3 files changed, 1 insertions(+), 2 deletions(-) diff --git a/demo/pub_sub b/demo/pub_sub deleted file mode 100755 index 0db5c9f..0000000 --- a/demo/pub_sub +++ /dev/null Binary files differ diff --git a/demo/req_rep b/demo/req_rep deleted file mode 100755 index 68dfe30..0000000 --- a/demo/req_rep +++ /dev/null Binary files differ diff --git a/queue/Makefile b/queue/Makefile index 14b1e08..3c8a4e2 100644 --- a/queue/Makefile +++ b/queue/Makefile @@ -41,8 +41,7 @@ #dynamic lib $(DLIBSQUEUE): $(SOURCES) rm -f *.o - $(CC) -fPIC -shared $(CFLAGS) $(LDFLAGS) $^ -o $@ - #$(CC) -fPIC -shared $(CFLAGS) $(LDFLAGS) -o $@ $^ -Wl,--whole-archive $(ROOT)/lib/libusgcommon.a -Wl,--no-whole-archive + $(CC) -fPIC -shared $(CFLAGS) $^ -o $@ $(LDFLAGS) $(LDLIBS) #PREFIX is environment variable, but if it is not set, then set default value diff --git a/queue/libshm_queue.so b/queue/libshm_queue.so index 4270d68..598c829 100755 --- a/queue/libshm_queue.so +++ b/queue/libshm_queue.so Binary files differ diff --git a/test/communication b/test/communication deleted file mode 100755 index 5fa1b7c..0000000 --- a/test/communication +++ /dev/null Binary files differ diff --git a/test2/pub_sub b/test2/pub_sub deleted file mode 100755 index a3fbccd..0000000 --- a/test2/pub_sub +++ /dev/null Binary files differ diff --git a/test2/req_rep b/test2/req_rep deleted file mode 100755 index 3b2b4b0..0000000 --- a/test2/req_rep +++ /dev/null Binary files differ -- Gitblit v1.8.0