diff options
| author | Bartosz Taudul <wolf.pld@gmail.com> | 2020-07-31 19:53:10 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-31 19:53:10 +0300 |
| commit | 9d25f7fb713138feb1139776d7b786a02b5d2a12 (patch) | |
| tree | a496c8a48c638fef6b1254c2f477446c96384263 /csvexport | |
| parent | dbcc908dee13f72094cef14c565e915db835aeda (diff) | |
| parent | 652582b119848838035143a5d621ccbda599ddbf (diff) | |
Merge pull request #79 from jimblandy/build-fedora
Build fixes for Fedora
Diffstat (limited to 'csvexport')
| -rw-r--r-- | csvexport/build/unix/build.mk | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/csvexport/build/unix/build.mk b/csvexport/build/unix/build.mk index a7a67460..364b7c91 100644 --- a/csvexport/build/unix/build.mk +++ b/csvexport/build/unix/build.mk @@ -1,8 +1,10 @@ +include ../../../common/unix.mk + CFLAGS += CXXFLAGS := $(CFLAGS) -std=gnu++17 # DEFINES += -DTRACY_NO_STATISTICS INCLUDES := $(shell pkg-config --cflags capstone) -LIBS := $(shell pkg-config --libs capstone) -lpthread +LIBS += $(shell pkg-config --libs capstone) -lpthread PROJECT := csvexport IMAGE := $(PROJECT)-$(BUILD) @@ -14,11 +16,6 @@ BASE2 := $(shell egrep 'ClCompile.*c"' ../win32/$(PROJECT).vcxproj | sed -e 's/. SRC := $(filter-out $(FILTER),$(BASE)) SRC2 := $(filter-out $(FILTER),$(BASE2)) -TBB := $(shell ld -ltbb -o /dev/null 2>/dev/null; echo $$?) -ifeq ($(TBB),0) - LIBS += -ltbb -endif - OBJDIRBASE := obj/$(BUILD) OBJDIR := $(OBJDIRBASE)/o/o/o |