Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/wolfpld/tracy.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Blandy <jimb@red-bean.com>2020-07-31 19:14:12 +0300
committerJim Blandy <jimb@red-bean.com>2020-07-31 19:14:12 +0300
commit652582b119848838035143a5d621ccbda599ddbf (patch)
tree49d435b02d2ad43e4395559aa08b450305950483 /csvexport
parenta12bf2d75314c2e3032b017f41e0785e0ed733d9 (diff)
Factor out makefile TBB detection, apply to all tools.
Diffstat (limited to 'csvexport')
-rw-r--r--csvexport/build/unix/build.mk9
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