From e7e07f42b336bb7b5c488eb3bcc6397c0a2a03f4 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期一, 24 八月 2020 16:36:09 +0800
Subject: [PATCH] fix conflict

---
 Make.defines.linux |   25 +++++++++++++++++++++++++
 1 files changed, 25 insertions(+), 0 deletions(-)

diff --git a/Make.defines.linux b/Make.defines.linux
new file mode 100755
index 0000000..60bde91
--- /dev/null
+++ b/Make.defines.linux
@@ -0,0 +1,25 @@
+# Common make definitions, customized for each platform
+
+# Definitions required in all program directories to compile and link
+# C programs using gcc.
+
+CC = g++
+COMPILE.c = $(CC) $(CFLAGS) $(CPPFLAGS) -c
+LINK.c = $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS)
+LDFLAGS=
+
+
+CFLAGS = $(INCLUDE) -I. -I./include -I$(ROOT)/common -I$(ROOT)/common/include -g -std=c++11 -mcx16 -Wall  -DLINUX -D_GNU_SOURCE $(EXTRA)
+
+ifeq ($(pic),y)
+	CFLAGS += -fPIC 
+endif
+
+RANLIB=echo
+AR=ar
+AWK=awk
+
+
+# Common temp files to delete from each directory.
+TEMPFILES=core core.* *.o temp.* *.out *.a *.so
+

--
Gitblit v1.8.0