diff options
| author |  mitchell <70453897+orbitalquark@users.noreply.github.com> | 2022-03-01 22:18:50 -0500 |
|---|---|---|
| committer | mitchell <70453897+orbitalquark@users.noreply.github.com> | 2022-03-01 22:18:50 -0500 |
| commit | 45c94a1d395f560c015c6b1a7a3fc3558f7de395 (patch) | |
| tree | a8b21d34371a1d9f80887a67320ce6eeabfe4668 /src | |
| parent | 38eaaabdd89cfed6d446ab13c4cca653d054ff33 (diff) | |
Build with GTK3 by default on Linux using new textadept-build:v2.0 Docker image.
Build with GTK 2 using new GTK2 flag.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Dockerfile | 5 | ||||
| -rw-r--r-- | src/Makefile | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/Dockerfile b/src/Dockerfile index 89d9de9f..2e92c806 100644 --- a/src/Dockerfile +++ b/src/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:bionic +FROM ubuntu:focal LABEL maintainer="textadept" # Fetch packages for: @@ -13,7 +13,7 @@ RUN echo "Fetching packages" \ build-essential ca-certificates curl git gnupg mercurial unzip wget zip \ mingw-w64 \ clang cmake libc++-dev libssl-dev libxml2-dev llvm-dev lzma-dev uuid-dev \ - libgtk2.0-dev libncurses5-dev libncursesw5-dev \ + libgtk2.0-dev libgtk-3-dev libncurses-dev \ luadoc discount \ && apt-get clean @@ -28,7 +28,6 @@ RUN echo "Building osxcross" \ && unzip *.zip && mv osxcross-* /opt/osxcross && rm *.zip \ && wget https://github.com/phracker/MacOSX-SDKs/releases/download/10.13/${sdk}.tar.xz \ && tar xJf ${sdk}.tar.xz \ - && cp -r /usr/include/c++/v1 ${sdk}/usr/include/c++ \ && tar czf /opt/osxcross/tarballs/${sdk}.tar.gz ${sdk} \ && rm -r ${sdk}* \ && cd /opt/osxcross \ diff --git a/src/Makefile b/src/Makefile index 38d21e31..d177e272 100644 --- a/src/Makefile +++ b/src/Makefile @@ -7,7 +7,7 @@ CXXFLAGS := -Os -std=c++17 WGET = wget -O $@ # Define these once for speed and reference them later. -ifndef GTK3 +ifdef GTK2 gtk_flags_linux := $(shell pkg-config --cflags gtk+-2.0 gmodule-2.0) else gtk_flags_linux := $(shell pkg-config --cflags gtk+-3.0 gmodule-2.0) -Wno-deprecated-declarations @@ -248,7 +248,7 @@ else $(linux_exes): CXX := c++ endif $(linux_exes): LDFLAGS := -rdynamic -Wl,--retain-symbols-file -Wl,$(shell pwd)/lua.sym -ifndef GTK3 +ifdef GTK2 ../textadept: LDFLAGS += $(shell pkg-config --libs gtk+-2.0 gmodule-2.0) else ../textadept: LDFLAGS += $(shell pkg-config --libs gtk+-3.0 gmodule-2.0) |