|
|
0adf615 |
--- ./Makefile.orig 2015-03-06 12:01:18.000000000 -0700
|
|
|
0adf615 |
+++ ./Makefile 2015-03-07 17:10:40.822991023 -0700
|
|
Jerry James |
575c8c7 |
@@ -20,7 +20,7 @@ MODULES := \
|
|
Jerry James |
575c8c7 |
src/map/mapper src/map/mio src/map/super src/map/if \
|
|
Jerry James |
575c8c7 |
src/map/amap src/map/cov src/map/scl src/map/mpm \
|
|
Jerry James |
575c8c7 |
src/misc/extra src/misc/mvc src/misc/st src/misc/util src/misc/nm \
|
|
Jerry James |
575c8c7 |
- src/misc/vec src/misc/hash src/misc/tim src/misc/bzlib src/misc/zlib \
|
|
Jerry James |
575c8c7 |
+ src/misc/vec src/misc/hash src/misc/tim \
|
|
Jerry James |
575c8c7 |
src/misc/mem src/misc/bar src/misc/bbl \
|
|
Jerry James |
575c8c7 |
src/opt/cut src/opt/fxu src/opt/rwr src/opt/mfs src/opt/sim \
|
|
Jerry James |
575c8c7 |
src/opt/ret src/opt/res src/opt/lpk src/opt/nwk src/opt/rwt \
|
|
|
0adf615 |
@@ -72,7 +72,7 @@ endif
|
|
Jerry James |
575c8c7 |
endif
|
|
Jerry James |
575c8c7 |
|
|
Jerry James |
575c8c7 |
# LIBS := -ldl -lrt
|
|
Jerry James |
575c8c7 |
-LIBS += -ldl
|
|
Jerry James |
575c8c7 |
+LIBS += -Wl,--as-needed -lbz2 -lz -ldl
|
|
Jerry James |
575c8c7 |
ifneq ($(findstring Darwin, $(shell uname)), Darwin)
|
|
Jerry James |
575c8c7 |
LIBS += -lrt
|
|
Jerry James |
575c8c7 |
endif
|
|
|
0adf615 |
@@ -109,15 +109,15 @@ DEP := $(OBJ:.o=.d)
|
|
Jerry James |
575c8c7 |
|
|
Jerry James |
575c8c7 |
%.o: %.c
|
|
Jerry James |
575c8c7 |
@echo "$(MSG_PREFIX)\`\` Compiling:" $(LOCAL_PATH)/$<
|
|
Jerry James |
575c8c7 |
- @$(CC) -c $(CFLAGS) $< -o $@
|
|
Jerry James |
575c8c7 |
+ $(CC) -c $(CFLAGS) $< -o $@
|
|
Jerry James |
575c8c7 |
|
|
Jerry James |
575c8c7 |
%.o: %.cc
|
|
Jerry James |
575c8c7 |
@echo "$(MSG_PREFIX)\`\` Compiling:" $(LOCAL_PATH)/$<
|
|
Jerry James |
575c8c7 |
- @$(CXX) -c $(CXXFLAGS) $< -o $@
|
|
Jerry James |
575c8c7 |
+ $(CXX) -c $(CXXFLAGS) $< -o $@
|
|
Jerry James |
575c8c7 |
|
|
Jerry James |
575c8c7 |
%.o: %.cpp
|
|
Jerry James |
575c8c7 |
@echo "$(MSG_PREFIX)\`\` Compiling:" $(LOCAL_PATH)/$<
|
|
Jerry James |
575c8c7 |
- @$(CXX) -c $(CXXFLAGS) $< -o $@
|
|
Jerry James |
575c8c7 |
+ $(CXX) -c $(CXXFLAGS) $< -o $@
|
|
Jerry James |
575c8c7 |
|
|
Jerry James |
575c8c7 |
%.d: %.c
|
|
Jerry James |
575c8c7 |
@echo "$(MSG_PREFIX)\`\` Generating dependency:" $(LOCAL_PATH)/$<
|
|
|
0adf615 |
--- ./src/base/io/ioReadAiger.c.orig 2015-03-06 12:01:18.000000000 -0700
|
|
|
0adf615 |
+++ ./src/base/io/ioReadAiger.c 2015-03-07 17:10:40.823990943 -0700
|
|
Jerry James |
575c8c7 |
@@ -26,8 +26,8 @@
|
|
Jerry James |
575c8c7 |
#include <string.h>
|
|
Jerry James |
575c8c7 |
#include <assert.h>
|
|
Jerry James |
575c8c7 |
|
|
Jerry James |
575c8c7 |
-#include "misc/bzlib/bzlib.h"
|
|
Jerry James |
575c8c7 |
-#include "misc/zlib/zlib.h"
|
|
Jerry James |
575c8c7 |
+#include <bzlib.h>
|
|
Jerry James |
575c8c7 |
+#include <zlib.h>
|
|
Jerry James |
575c8c7 |
#include "ioAbc.h"
|
|
Jerry James |
575c8c7 |
|
|
Jerry James |
575c8c7 |
ABC_NAMESPACE_IMPL_START
|
|
|
0adf615 |
--- ./src/base/io/ioReadBlifMv.c.orig 2015-03-06 12:01:18.000000000 -0700
|
|
|
0adf615 |
+++ ./src/base/io/ioReadBlifMv.c 2015-03-07 17:10:40.825990781 -0700
|
|
Jerry James |
575c8c7 |
@@ -18,8 +18,8 @@
|
|
Jerry James |
575c8c7 |
|
|
Jerry James |
575c8c7 |
***********************************************************************/
|
|
Jerry James |
575c8c7 |
|
|
Jerry James |
575c8c7 |
-#include "misc/zlib/zlib.h"
|
|
Jerry James |
575c8c7 |
-#include "misc/bzlib/bzlib.h"
|
|
Jerry James |
575c8c7 |
+#include <zlib.h>
|
|
Jerry James |
575c8c7 |
+#include <bzlib.h>
|
|
Jerry James |
575c8c7 |
#include "base/abc/abc.h"
|
|
Jerry James |
575c8c7 |
#include "misc/vec/vecPtr.h"
|
|
Jerry James |
575c8c7 |
#include "ioAbc.h"
|
|
|
0adf615 |
--- ./src/base/io/ioWriteAiger.c.orig 2015-03-06 12:01:18.000000000 -0700
|
|
|
0adf615 |
+++ ./src/base/io/ioWriteAiger.c 2015-03-07 17:10:40.826990701 -0700
|
|
Jerry James |
575c8c7 |
@@ -26,8 +26,8 @@
|
|
Jerry James |
575c8c7 |
#include <string.h>
|
|
Jerry James |
575c8c7 |
#include <assert.h>
|
|
Jerry James |
575c8c7 |
|
|
Jerry James |
575c8c7 |
-#include "misc/bzlib/bzlib.h"
|
|
Jerry James |
575c8c7 |
-#include "misc/zlib/zlib.h"
|
|
Jerry James |
575c8c7 |
+#include <bzlib.h>
|
|
Jerry James |
575c8c7 |
+#include <zlib.h>
|
|
Jerry James |
575c8c7 |
#include "ioAbc.h"
|
|
Jerry James |
575c8c7 |
|
|
Jerry James |
575c8c7 |
|
|
|
0adf615 |
--- ./src/sat/cnf/cnfMan.c.orig 2015-03-06 12:01:18.000000000 -0700
|
|
|
0adf615 |
+++ ./src/sat/cnf/cnfMan.c 2015-03-07 17:10:40.827990620 -0700
|
|
Jerry James |
575c8c7 |
@@ -21,7 +21,7 @@
|
|
Jerry James |
575c8c7 |
#include "cnf.h"
|
|
Jerry James |
575c8c7 |
#include "sat/bsat/satSolver.h"
|
|
Jerry James |
575c8c7 |
#include "sat/bsat/satSolver2.h"
|
|
Jerry James |
575c8c7 |
-#include "misc/zlib/zlib.h"
|
|
Jerry James |
575c8c7 |
+#include <zlib.h>
|
|
Jerry James |
575c8c7 |
|
|
Jerry James |
575c8c7 |
ABC_NAMESPACE_IMPL_START
|
|
Jerry James |
575c8c7 |
|