riscv
/
yosys
mirror of https://github.com/YosysHQ/yosys.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Siesh1oo/yosys 

Conflicts:
	Makefile
	libs/minisat/System.cc
This commit is contained in:
Siesh1oo 2014-03-13 11:30:50 +01:00
parent 49c0bfa3ad 5a50760e2c
commit bc657b58e4
2 changed files with 7 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -10,6 +10,7 @@
/qtcreator.creator.user /qtcreator.creator.user
/libs/svgviewer/svgviewer.app /libs/svgviewer/svgviewer.app
/Makefile.conf /Makefile.conf
/minisat
/abc /abc
/yosys /yosys
/yosys-abc /yosys-abc

30
Makefile
View File

@ -22,22 +22,11 @@ TARGETS = yosys yosys-config
all: top-all all: top-all
CXXFLAGS = -Wall -Wextra -ggdb -I"$(shell pwd)" -I${DESTDIR}/include -MD -D_YOSYS_ -fPIC -include kernel/posix_compatibility.h CXXFLAGS = -Wall -Wextra -ggdb -I"$(shell pwd)" -MD -D_YOSYS_ -fPIC
LDFLAGS = -L${DESTDIR}/lib LDFLAGS = -rdynamic
LDLIBS = -lstdc++ -lreadline -lm -ldl LDLIBS = -lstdc++ -lreadline -lm -ldl -lrt
QMAKE = qmake-qt4
ifeq (Darwin,$(findstring Darwin,$(shell uname))) SED = sed
# add macports include and library path to search directories, don't use '-rdynamic' and '-lrt':
CXXFLAGS += -I/opt/local/include
LDFLAGS += -L/opt/local/lib
QMAKE = qmake
SED = gsed
else
LDFLAGS += -rdynamic
LDLIBS += -lrt
QMAKE = qmake-qt4
SED = sed
endif
YOSYS_VER := 0.2.0+ YOSYS_VER := 0.2.0+
GIT_REV := $(shell git rev-parse --short HEAD || echo UNKOWN) GIT_REV := $(shell git rev-parse --short HEAD || echo UNKOWN)
@ -132,14 +121,7 @@ yosys-config: yosys-config.in
yosys-svgviewer: libs/svgviewer/*.h libs/svgviewer/*.cpp yosys-svgviewer: libs/svgviewer/*.h libs/svgviewer/*.cpp
cd libs/svgviewer && $(QMAKE) && make cd libs/svgviewer && $(QMAKE) && make
cp `find libs/svgviewer -name svgviewer -type f` yosys-svgviewer cp libs/svgviewer/svgviewer yosys-svgviewer
yosys-minisat: $(DESTDIR)/bin/minisat
$(DESTDIR)/bin/minisat:
test -d minisat || ( git clone https://github.com/niklasso/minisat.git minisat && $(SED) -i -e 's/PRIi64/ & /' minisat/minisat/utils/Options.h )
( cd minisat && git checkout $(MINISATREV) )
( cd minisat && $(MAKE) prefix=$(DESTDIR) DESTDIR="" config install )
@( cd minisat && echo "Installed minisat version `git describe --always --dirty` into $(DESTDIR)." )
abc/abc-$(ABCREV): abc/abc-$(ABCREV):
ifneq ($(ABCREV),default) ifneq ($(ABCREV),default)