mirror of
https://github.com/wolfpld/tracy.git
synced 2024-11-27 00:04:35 +00:00
Merge pull request #661 from moritz-h/imgui-include
Prefer internal imgui
This commit is contained in:
commit
aa5cc655a9
@ -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
|
||||||
|
@ -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
|
||||||
|
Loading…
Reference in New Issue
Block a user