diff --git a/capture/build/unix/build.mk b/capture/build/unix/build.mk index 5378e008..95e84f85 100644 --- a/capture/build/unix/build.mk +++ b/capture/build/unix/build.mk @@ -1,8 +1,8 @@ CFLAGS += CXXFLAGS := $(CFLAGS) -std=gnu++17 DEFINES += -DTRACY_NO_STATISTICS -INCLUDES := $(shell pkg-config --cflags capstone) -LIBS := $(shell pkg-config --libs capstone) -lpthread +INCLUDES := $(shell pkg-config --cflags capstone) $(shell pkg-config --silence-errors --cflags tbb) +LIBS := $(shell pkg-config --libs capstone) $(shell pkg-config --silence-errors --libs tbb) -lpthread PROJECT := capture IMAGE := $(PROJECT)-$(BUILD) @@ -14,11 +14,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 diff --git a/import-chrome/build/unix/build.mk b/import-chrome/build/unix/build.mk index fcd1f6b0..0b32889d 100644 --- a/import-chrome/build/unix/build.mk +++ b/import-chrome/build/unix/build.mk @@ -1,8 +1,8 @@ CFLAGS += CXXFLAGS := $(CFLAGS) -std=gnu++17 DEFINES += -DTRACY_NO_STATISTICS -INCLUDES := $(shell pkg-config --cflags capstone) -LIBS := $(shell pkg-config --libs capstone) -lpthread +INCLUDES := $(shell pkg-config --cflags capstone) $(shell pkg-config --silence-errors --cflags tbb) +LIBS := $(shell pkg-config --libs capstone) $(shell pkg-config --silence-errors --libs tbb) -lpthread PROJECT := import-chrome IMAGE := $(PROJECT)-$(BUILD) @@ -14,11 +14,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 diff --git a/profiler/build/unix/build.mk b/profiler/build/unix/build.mk index 101141f6..4b6cef03 100644 --- a/profiler/build/unix/build.mk +++ b/profiler/build/unix/build.mk @@ -1,8 +1,8 @@ CFLAGS += CXXFLAGS := $(CFLAGS) -std=c++17 DEFINES += -DIMGUI_IMPL_OPENGL_LOADER_GL3W -INCLUDES := $(shell pkg-config --cflags glfw3 freetype2 capstone) -I../../../imgui -I../../libs/gl3w -LIBS := $(shell pkg-config --libs glfw3 freetype2 capstone) -lpthread -ldl +INCLUDES := $(shell pkg-config --cflags glfw3 freetype2 capstone) $(shell pkg-config --silence-errors --cflags tbb) -I../../../imgui -I../../libs/gl3w +LIBS := $(shell pkg-config --libs glfw3 freetype2 capstone) $(shell pkg-config --silence-errors --libs tbb) -lpthread -ldl PROJECT := Tracy IMAGE := $(PROJECT)-$(BUILD) @@ -25,11 +25,6 @@ else LIBS += $(shell pkg-config --libs gtk+-2.0) -lGL endif -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 diff --git a/update/build/unix/build.mk b/update/build/unix/build.mk index 371f1f1d..676ebff6 100644 --- a/update/build/unix/build.mk +++ b/update/build/unix/build.mk @@ -1,8 +1,8 @@ CFLAGS += CXXFLAGS := $(CFLAGS) -std=gnu++17 DEFINES += -DTRACY_NO_STATISTICS -INCLUDES := $(shell pkg-config --cflags capstone) -LIBS := $(shell pkg-config --libs capstone) -lpthread +INCLUDES := $(shell pkg-config --cflags capstone) $(shell pkg-config --silence-errors --cflags tbb) +LIBS := $(shell pkg-config --libs capstone) $(shell pkg-config --silence-errors --libs tbb) -lpthread PROJECT := update IMAGE := $(PROJECT)-$(BUILD) @@ -14,11 +14,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