From ad6c7c898620c5bd25b7dffc693f13a0115ef257 Mon Sep 17 00:00:00 2001 From: Thales Sabino Date: Fri, 14 Aug 2020 13:19:27 +0100 Subject: [PATCH 1/3] Add GTK2.0 in the list of build requirements on Unix --- manual/tracy.tex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manual/tracy.tex b/manual/tracy.tex index e1ce2dc0..0447fa8d 100644 --- a/manual/tracy.tex +++ b/manual/tracy.tex @@ -660,7 +660,7 @@ vcpkg install --triplet x64-windows-static freetype glfw3 capstone[arm,arm64,x86 \paragraph{Unix} -On Unix systems you will need to install the \texttt{pkg-config} utility and the following libraries: \texttt{glfw}, \texttt{freetype}, \texttt{capstone}. Some Linux distributions will require you to add a \texttt{lib} prefix and a \texttt{-dev}, or \texttt{-devel} postfix to library names. You may also need to add a seemingly random number to the library name (for example: \texttt{freetype2}, or \texttt{freetype6}). How fun! +On Unix systems you will need to install the \texttt{pkg-config} utility and the following libraries: \texttt{glfw}, \texttt{freetype}, \texttt{capstone}, \texttt{gtk2.0}. Some Linux distributions will require you to add a \texttt{lib} prefix and a \texttt{-dev}, or \texttt{-devel} postfix to library names. You may also need to add a seemingly random number to the library name (for example: \texttt{freetype2}, or \texttt{freetype6}). The GTK library could be installed as \texttt{libgtk2.0-dev} on some systems. How fun! Installation of the libraries on OSX can be facilitated using the \texttt{brew} package manager. From 6e3f19d0c98cc4baed281bb64ed990740918769c Mon Sep 17 00:00:00 2001 From: Thales Sabino Date: Fri, 14 Aug 2020 14:05:00 +0100 Subject: [PATCH 2/3] Update build requirement from GTK2 to GTK3 --- manual/tracy.tex | 2 +- profiler/build/unix/build.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/manual/tracy.tex b/manual/tracy.tex index 0447fa8d..28092e55 100644 --- a/manual/tracy.tex +++ b/manual/tracy.tex @@ -660,7 +660,7 @@ vcpkg install --triplet x64-windows-static freetype glfw3 capstone[arm,arm64,x86 \paragraph{Unix} -On Unix systems you will need to install the \texttt{pkg-config} utility and the following libraries: \texttt{glfw}, \texttt{freetype}, \texttt{capstone}, \texttt{gtk2.0}. Some Linux distributions will require you to add a \texttt{lib} prefix and a \texttt{-dev}, or \texttt{-devel} postfix to library names. You may also need to add a seemingly random number to the library name (for example: \texttt{freetype2}, or \texttt{freetype6}). The GTK library could be installed as \texttt{libgtk2.0-dev} on some systems. How fun! +On Unix systems you will need to install the \texttt{pkg-config} utility and the following libraries: \texttt{glfw}, \texttt{freetype}, \texttt{capstone}, \texttt{GTK3}. Some Linux distributions will require you to add a \texttt{lib} prefix and a \texttt{-dev}, or \texttt{-devel} postfix to library names. You may also need to add a seemingly random number to the library name (for example: \texttt{freetype2}, or \texttt{freetype6}). The GTK library could be installed as \texttt{libgtk-3-dev} on some systems. How fun! Installation of the libraries on OSX can be facilitated using the \texttt{brew} package manager. diff --git a/profiler/build/unix/build.mk b/profiler/build/unix/build.mk index 67be84ef..1e945445 100644 --- a/profiler/build/unix/build.mk +++ b/profiler/build/unix/build.mk @@ -15,8 +15,8 @@ ifeq ($(UNAME),Darwin) LIBS += -framework CoreFoundation -framework AppKit else SRC2 += ../../../nfd/nfd_gtk.c - INCLUDES += $(shell pkg-config --cflags gtk+-2.0) - LIBS += $(shell pkg-config --libs gtk+-2.0) -lGL + INCLUDES += $(shell pkg-config --cflags gtk+-3.0) + LIBS += $(shell pkg-config --libs gtk+-3.0) -lGL endif include ../../../common/unix.mk From c7707d1455b67d7eec4e7a905e4d6bb93d27b0b6 Mon Sep 17 00:00:00 2001 From: Thales Sabino Date: Fri, 14 Aug 2020 14:10:39 +0100 Subject: [PATCH 3/3] Update gcc.yml to install libgtk-3-dev --- .github/workflows/gcc.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gcc.yml b/.github/workflows/gcc.yml index 91fe6740..741a8bb7 100644 --- a/.github/workflows/gcc.yml +++ b/.github/workflows/gcc.yml @@ -19,7 +19,7 @@ jobs: - uses: actions/checkout@v2 - name: Install linux libraries if: ${{ matrix.os == 'ubuntu-20.04' }} - run: sudo apt-get update && sudo apt-get -y install libglfw3-dev libgtk2.0-dev libcapstone-dev libtbb-dev + run: sudo apt-get update && sudo apt-get -y install libglfw3-dev libgtk-3-dev libcapstone-dev libtbb-dev - name: Install macos libraries if: ${{ matrix.os == 'macOS-latest' }} run: brew install capstone tbb pkg-config glfw