diff options
| author | Bartosz Taudul <wolf.pld@gmail.com> | 2020-06-19 21:07:06 +0300 |
|---|---|---|
| committer | Bartosz Taudul <wolf.pld@gmail.com> | 2020-06-19 21:07:06 +0300 |
| commit | 25c72455660b6790614d85131208d375b2680300 (patch) | |
| tree | d8af224c2bda8230a2487b848d60a46b1578600d | |
| parent | 5610bd0f8be3e9c1db3a10a86b2841133c87430a (diff) | |
Revert "Use pkg-config to link with TBB, but silence errors."
This reverts commit b4d6833231fea194f2d2912d29c8f2ca452f7178.
pkg-config setup for TBB is debian-specific.
| -rw-r--r-- | capture/build/unix/build.mk | 9 | ||||
| -rw-r--r-- | import-chrome/build/unix/build.mk | 9 | ||||
| -rw-r--r-- | profiler/build/unix/build.mk | 9 | ||||
| -rw-r--r-- | update/build/unix/build.mk | 9 |
4 files changed, 28 insertions, 8 deletions
diff --git a/capture/build/unix/build.mk b/capture/build/unix/build.mk index 95e84f85..5378e008 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) $(shell pkg-config --silence-errors --cflags tbb) -LIBS := $(shell pkg-config --libs capstone) $(shell pkg-config --silence-errors --libs tbb) -lpthread +INCLUDES := $(shell pkg-config --cflags capstone) +LIBS := $(shell pkg-config --libs capstone) -lpthread PROJECT := capture IMAGE := $(PROJECT)-$(BUILD) @@ -14,6 +14,11 @@ 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 0b32889d..fcd1f6b0 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) $(shell pkg-config --silence-errors --cflags tbb) -LIBS := $(shell pkg-config --libs capstone) $(shell pkg-config --silence-errors --libs tbb) -lpthread +INCLUDES := $(shell pkg-config --cflags capstone) +LIBS := $(shell pkg-config --libs capstone) -lpthread PROJECT := import-chrome IMAGE := $(PROJECT)-$(BUILD) @@ -14,6 +14,11 @@ 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 4b6cef03..101141f6 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) $(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 +INCLUDES := $(shell pkg-config --cflags glfw3 freetype2 capstone) -I../../../imgui -I../../libs/gl3w +LIBS := $(shell pkg-config --libs glfw3 freetype2 capstone) -lpthread -ldl PROJECT := Tracy IMAGE := $(PROJECT)-$(BUILD) @@ -25,6 +25,11 @@ 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 676ebff6..371f1f1d 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) $(shell pkg-config --silence-errors --cflags tbb) -LIBS := $(shell pkg-config --libs capstone) $(shell pkg-config --silence-errors --libs tbb) -lpthread +INCLUDES := $(shell pkg-config --cflags capstone) +LIBS := $(shell pkg-config --libs capstone) -lpthread PROJECT := update IMAGE := $(PROJECT)-$(BUILD) @@ -14,6 +14,11 @@ 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 |