Merge branch 'master' of github.com:zawwz/lxsh into master

This commit is contained in:
zawz 2020-09-30 16:00:48 +02:00
commit fd19eab3db

View file

@ -9,26 +9,26 @@ BINDIR=.
NAME = $(shell readlink -f . | xargs basename) NAME = $(shell readlink -f . | xargs basename)
# global links # global links
LDFLAGS = -Wl,--no-as-needed -lpthread LDFLAGS = -lpthread
# compiler # compiler
CC=g++ CC=g++
# compiler flags # compiler flags
CXXFLAGS= -I$(IDIR) -Wall -pedantic -std=c++17 CXXFLAGS= -I$(IDIR) -Wall -pedantic -std=c++17
ifeq ($(DEBUG),true) ifeq ($(DEBUG),true)
# debugging flags # debugging flags
CC=clang++ CC=clang++
CXXFLAGS += -g CXXFLAGS += -g
else else
# release flags # release flags
CXXFLAGS += -O2 CXXFLAGS += -O2
endif endif
ifeq ($(STATIC),true) ifeq ($(STATIC),true)
# static links # static links
LDFLAGS += -l:libztd.a LDFLAGS += -l:libztd.a
else else
# dynamic links # dynamic links
LDFLAGS += -lztd LDFLAGS += -lztd
endif endif
## END CONFIG ## ## END CONFIG ##
@ -50,7 +50,7 @@ $(ODIR)/%.o: $(SRCDIR)/%.cpp $(DEPS)
$(CC) $(CXXFLAGS) -c -o $@ $< $(CC) $(CXXFLAGS) -c -o $@ $<
$(BINDIR)/$(NAME): $(OBJ) $(BINDIR)/$(NAME): $(OBJ)
$(CC) $(CXXFLAGS) $(LDFLAGS) -o $@ $^ $(CC) $(CXXFLAGS) -o $@ $^ $(LDFLAGS)
test: $(BINDIR)/$(NAME) test: $(BINDIR)/$(NAME)
$(BINDIR)/$(NAME) $(BINDIR)/$(NAME)