Merge pull request #661 from moritz-h/imgui-include

Prefer internal imgui
This commit is contained in:
Bartosz Taudul 2023-11-15 15:43:24 +01:00 committed by GitHub
commit aa5cc655a9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions

View File

@ -1,7 +1,7 @@
CFLAGS += CFLAGS +=
CXXFLAGS := $(CFLAGS) -std=c++17 CXXFLAGS := $(CFLAGS) -std=c++17
DEFINES += -DIMGUI_ENABLE_FREETYPE DEFINES += -DIMGUI_ENABLE_FREETYPE
INCLUDES := $(shell pkg-config --cflags freetype2 capstone wayland-egl egl wayland-cursor xkbcommon) -I../../../imgui INCLUDES := -I../../../imgui $(shell pkg-config --cflags freetype2 capstone wayland-egl egl wayland-cursor xkbcommon)
LIBS := $(shell pkg-config --libs freetype2 capstone wayland-egl egl wayland-cursor xkbcommon) -lpthread -ldl LIBS := $(shell pkg-config --libs freetype2 capstone wayland-egl egl wayland-cursor xkbcommon) -lpthread -ldl
PROJECT := Tracy PROJECT := Tracy

View File

@ -1,7 +1,7 @@
CFLAGS += CFLAGS +=
CXXFLAGS := $(CFLAGS) -std=c++17 CXXFLAGS := $(CFLAGS) -std=c++17
DEFINES += -DIMGUI_ENABLE_FREETYPE DEFINES += -DIMGUI_ENABLE_FREETYPE
INCLUDES := $(shell pkg-config --cflags glfw3 freetype2 capstone) -I../../../imgui INCLUDES := -I../../../imgui $(shell pkg-config --cflags glfw3 freetype2 capstone)
LIBS := $(shell pkg-config --libs glfw3 freetype2 capstone) -lpthread -ldl LIBS := $(shell pkg-config --libs glfw3 freetype2 capstone) -lpthread -ldl
PROJECT := Tracy PROJECT := Tracy