diff options
| author | Siesh1oo <siesh1oo@siesh1oo.no> | 2014-03-13 11:30:50 +0100 |
|---|---|---|
| committer | Siesh1oo <siesh1oo@siesh1oo.no> | 2014-03-13 11:30:50 +0100 |
| commit | bc657b58e4ce13604186a7ad6440925ae82c1e4d (patch) | |
| tree | 9e938ac2601ef2a294677358e0b74d7d70b30f9b | |
| parent | 49c0bfa3adcceb25886d879c54c08ba9b93f6488 (diff) | |
| parent | 5a50760e2c327ded7a4da223fb16591febcb773f (diff) | |
| download | yosys-bc657b58e4ce13604186a7ad6440925ae82c1e4d.tar.gz yosys-bc657b58e4ce13604186a7ad6440925ae82c1e4d.tar.bz2 yosys-bc657b58e4ce13604186a7ad6440925ae82c1e4d.zip | |
Merge branch 'master' of https://github.com/Siesh1oo/yosys
Conflicts:
Makefile
libs/minisat/System.cc
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | Makefile | 30 |
2 files changed, 7 insertions, 24 deletions
diff --git a/.gitignore b/.gitignore index 69d56bfac..10491a3a1 100644 --- a/.gitignore +++ b/.gitignore @@ -10,6 +10,7 @@ /qtcreator.creator.user /libs/svgviewer/svgviewer.app /Makefile.conf +/minisat /abc /yosys /yosys-abc @@ -22,22 +22,11 @@ TARGETS = yosys yosys-config all: top-all -CXXFLAGS = -Wall -Wextra -ggdb -I"$(shell pwd)" -I${DESTDIR}/include -MD -D_YOSYS_ -fPIC -include kernel/posix_compatibility.h -LDFLAGS = -L${DESTDIR}/lib -LDLIBS = -lstdc++ -lreadline -lm -ldl - -ifeq (Darwin,$(findstring Darwin,$(shell uname))) - # 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 +CXXFLAGS = -Wall -Wextra -ggdb -I"$(shell pwd)" -MD -D_YOSYS_ -fPIC +LDFLAGS = -rdynamic +LDLIBS = -lstdc++ -lreadline -lm -ldl -lrt +QMAKE = qmake-qt4 +SED = sed YOSYS_VER := 0.2.0+ 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 cd libs/svgviewer && $(QMAKE) && make - cp `find libs/svgviewer -name svgviewer -type f` 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)." ) + cp libs/svgviewer/svgviewer yosys-svgviewer abc/abc-$(ABCREV): ifneq ($(ABCREV),default) |