diff options
| author | Clifford Wolf <clifford@clifford.at> | 2014-10-12 14:48:19 +0200 |
|---|---|---|
| committer | Clifford Wolf <clifford@clifford.at> | 2014-10-12 14:48:19 +0200 |
| commit | 0913e968f59aed413dcb9bc5e392a554e2711ad7 (patch) | |
| tree | 05503f96b9febd326b9669f956870a6c9684fc35 /Makefile | |
| parent | 2fdb3a4a91e2dc07f9aa75c478c6b8bfa1d1eb19 (diff) | |
| download | yosys-0913e968f59aed413dcb9bc5e392a554e2711ad7.tar.gz yosys-0913e968f59aed413dcb9bc5e392a554e2711ad7.tar.bz2 yosys-0913e968f59aed413dcb9bc5e392a554e2711ad7.zip | |
More win32/abc fixes
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 8 |
1 files changed, 6 insertions, 2 deletions
@@ -95,7 +95,7 @@ CXXFLAGS := $(filter-out -fPIC,$(CXXFLAGS)) LDFLAGS := $(filter-out -rdynamic,$(LDFLAGS)) -s LDLIBS := $(filter-out -lrt,$(LDLIBS)) ABCMKARGS += ARCHFLAGS="-DLIN -DSIZEOF_VOID_P=4 -DSIZEOF_LONG=4 -DSIZEOF_INT=4 -DWIN32_NO_DLL -x c++ -fpermissive -w -pthread" -ABCMKARGS += LIBS="lib/x86/pthreadVC2.lib" READLINE=0 +ABCMKARGS += LIBS="lib/x86/pthreadVC2.lib -s" READLINE=0 EXE = .exe else ifneq ($(CONFIG),none) @@ -220,7 +220,7 @@ yosys$(EXE): $(OBJS) kernel/version_$(GIT_REV).cc: Makefile $(P) rm -f kernel/version_*.o kernel/version_*.d kernel/version_*.cc - $(Q) echo "namespace Yosys { extern const char *yosys_version_str; const char *yosys_version_str=\"Yosys $(YOSYS_VER) (git sha1 $(GIT_REV), $(CXX) ` \ + $(Q) echo "namespace Yosys { extern const char *yosys_version_str; const char *yosys_version_str=\"Yosys $(YOSYS_VER) (git sha1 $(GIT_REV), $(notdir $(CXX)) ` \ $(CXX) --version | tr ' ()' '\n' | grep '^[0-9]' | head -n1` $(filter -f% -m% -O% -DNDEBUG,$(CXXFLAGS)))\"; }" > kernel/version_$(GIT_REV).cc yosys-config: yosys-config.in @@ -315,8 +315,12 @@ qtcreator: ifeq ($(CONFIG),mxe) dist: $(TARGETS) $(EXTRA_TARGETS) rm -rf yosys-win32-$(YOSYS_VER) + rm -rf yosys-win32-$(YOSYS_VER).zip mkdir -p yosys-win32-$(YOSYS_VER) cp -r yosys.exe share/ yosys-win32-$(YOSYS_VER)/ +ifeq ($(ENABLE_ABC),1) + cp -r yosys-abc.exe abc/lib/x86/pthreadVC2.dll yosys-win32-$(YOSYS_VER)/ +endif echo -en 'This is Yosys $(YOSYS_VER) for Win32.\r\n' > yosys-win32-$(YOSYS_VER)/readme.txt echo -en 'Documentation at http://www.clifford.at/yosys/.\r\n' >> yosys-win32-$(YOSYS_VER)/readme.txt zip -r yosys-win32-$(YOSYS_VER).zip yosys-win32-$(YOSYS_VER)/ |