Skip to content

M
Mock Turtle
Commit f6651a6d authored by Federico Vaga's avatar Federico Vaga
Browse files
Options

Merge branch 'release/v4.0.0.beta6'

parents 52bd45d9 db620ee9
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
software/lib/Makefile
View file @ f6651a6d
......@@ -8,7 +8,7 @@ REPO_PARENT ?= ../..
-include $(REPO_PARENT)/parent_common.mk
TRTL ?= ../../
TRTL ?= ../..
TRTL_SW = $(TRTL)/software
LIBS = libmockturtle.so
......@@ -16,7 +16,7 @@ LIB = libmockturtle.a
LOBJ := libmockturtle.o
LOBJ += libmockturtle-rt-msg.o
CFLAGS += -Wall -Werror -ggdb -fPIC
CFLAGS += -Wall -Werror -fPIC
CFLAGS += -I. -I$(TRTL_SW)/include $(EXTRACFLAGS)
ARFLAGS = rcv
......
software/tools/Makefile
View file @ f6651a6d
......@@ -8,12 +8,12 @@ REPO_PARENT ?= ../..
-include $(REPO_PARENT)/parent_common.mk
DESTDIR ?= /usr/local
TRTL ?= ../../
TRTL ?= ../..
TRTL_SW = $(TRTL)/software
GIT_VERSION := $(shell git describe --dirty --long --tags)
CFLAGS += -Wall -Werror -ggdb -I$(TRTL_SW)/lib
CFLAGS += -Wall -Werror -I$(TRTL_SW)/lib
CFLAGS += -I$(TRTL_SW)/include
CFLAGS += $(EXTRACFLAGS)
LDFLAGS += -L$(TRTL_SW)/lib
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment