From 633d972ec4d8236b41b8907e783b262ae4985697 Mon Sep 17 00:00:00 2001 From: Shawn Chain Date: Fri, 5 Oct 2018 12:12:24 +0800 Subject: [PATCH] Fix link parameters --- common.mk | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/common.mk b/common.mk index 16e0902..e2a7724 100644 --- a/common.mk +++ b/common.mk @@ -2,26 +2,25 @@ # Add -DDCS_LINK to the end of the CFLAGS line below to add DCS linking to StarNet # Add -DDEXTRA_LINK to the end of the CFLAGS line below to add DExtra linking to StarNet -ifeq ($(OPENWRT),1) DATADIR := "/etc/mmdvm/ircddbgateway" LOGDIR := "/var/log/mmdvm" CONFDIR := "/etc" BINDIR := "/usr/bin" CFLAGS += -DLOG_DIR='$(LOGDIR)' -DCONF_DIR='$(CONFDIR)' -DDATA_DIR='$(DATADIR)' -LIBS += -lwxbase_u +LIBS += LDFLAGS := -else -DATADIR := "/usr/share/ircddbgateway" -LOGDIR := "/var/log" -CONFDIR := "/etc" -BINDIR := "/usr/bin" +# else +# DATADIR := "/usr/share/ircddbgateway" +# LOGDIR := "/var/log" +# CONFDIR := "/etc" +# BINDIR := "/usr/bin" -CXX := $(shell wx-config --cxx) -CFLAGS := -O2 -Wall $(shell wx-config --cxxflags) -DLOG_DIR='$(LOGDIR)' -DCONF_DIR='$(CONFDIR)' -DDATA_DIR='$(DATADIR)' -GUILIBS := $(shell wx-config --libs adv,core,base) -LIBS := $(shell wx-config --libs base) -LDFLAGS := +# CXX := $(shell wx-config --cxx) +# CFLAGS := -O2 -Wall $(shell wx-config --cxxflags) -DLOG_DIR='$(LOGDIR)' -DCONF_DIR='$(CONFDIR)' -DDATA_DIR='$(DATADIR)' +# GUILIBS := $(shell wx-config --libs adv,core,base) +# LIBS := $(shell wx-config --libs base) +# LDFLAGS := -endif +# endif