From 39fdcb0c57bfeba598f00d77f190e731f26b25a1 Mon Sep 17 00:00:00 2001 From: sola.lu <sola.lu@greentest.com.cn> Date: 周四, 24 4月 2025 18:25:01 +0800 Subject: [PATCH] 1.修改一下,把当前库改为刚从origin仓库拉去下来,然后添加了cmake构建文件的状态。 --- libscpi/Makefile | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libscpi/Makefile b/libscpi/Makefile index 33c3737..9a0b5ee 100644 --- a/libscpi/Makefile +++ b/libscpi/Makefile @@ -1,9 +1,9 @@ VERSION = 2.1.0 LIBNAME = scpi -CFLAGS += -Wextra -Wmissing-prototypes -Wimplicit -g -Iinc +CFLAGS += -Wextra -Wmissing-prototypes -Wimplicit -Iinc CFLAGS_SHARED += $(CFLAGS) -fPIC -LDFLAGS += -Wl,--as-needed +LDFLAGS += -lm -Wl,--as-needed #TESTCFLAGS += $(CFLAGS) `pkg-config --cflags cunit` #TESTLDFLAGS += $(LDFLAGS) `pkg-config --libs cunit` TESTCFLAGS += $(CFLAGS) @@ -85,16 +85,16 @@ $(DISTDIR): mkdir -p $@ -$(OBJDIR_STATIC)/%.o: src/%.c $(HDRS) $(OBJDIR_STATIC) +$(OBJDIR_STATIC)/%.o: src/%.c $(HDRS) | $(OBJDIR_STATIC) $(CC) -c $(CFLAGS) $(CPPFLAGS) -o $@ $< -$(OBJDIR_SHARED)/%.o: src/%.c $(HDRS) $(OBJDIR_SHARED) +$(OBJDIR_SHARED)/%.o: src/%.c $(HDRS) | $(OBJDIR_SHARED) $(CC) -c $(CFLAGS_SHARED) $(CPPFLAGS) -o $@ $< -$(DISTDIR)/$(STATICLIB): $(DISTDIR) $(OBJS_STATIC) +$(DISTDIR)/$(STATICLIB): $(OBJS_STATIC) | $(DISTDIR) $(AR) $(STATICLIBFLAGS) $(DISTDIR)/$(STATICLIB) $(OBJS_STATIC) -$(DISTDIR)/$(SHAREDLIBVER): $(DISTDIR) $(OBJS_SHARED) +$(DISTDIR)/$(SHAREDLIBVER): $(OBJS_SHARED) | $(DISTDIR) $(CC) $(SHAREDLIBFLAGS) -o $(DISTDIR)/$(SHAREDLIBVER) $(OBJS_SHARED) $(TESTDIR)/%.o: $(TESTDIR)/%.c -- Gitblit v1.9.1