VeraCrypt
aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMounir IDRASSI <mounir.idrassi@idrix.fr>2023-06-13 23:16:39 +0200
committerMounir IDRASSI <mounir.idrassi@idrix.fr>2023-06-13 23:16:39 +0200
commit2639e39976930b8196782497b80795011f130614 (patch)
tree5500a5d9b0c581bb0536298ddae82223e763ac40 /src
parent444152b286788edaab4428bd3ccc1922709da623 (diff)
downloadVeraCrypt-2639e39976930b8196782497b80795011f130614.tar.gz
VeraCrypt-2639e39976930b8196782497b80795011f130614.zip
Linux: fix static build against wxWidgets 3.2.2.1
libcurl support must be explicitely disabled GKT2 must be explicitely set as defaut in VeraCrypt Makefile since wxWidgets 3.2.2.1 uses GKT3 as default
Diffstat (limited to 'src')
-rw-r--r--src/Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/Makefile b/src/Makefile
index a5e68590..98b3dd1a 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -261,6 +261,8 @@ ifeq "$(shell uname -s)" "Linux"
ifeq "$(origin WITHGTK3)" "command line"
WX_CONFIGURE_FLAGS += --with-gtk=3
+ else
+ WX_CONFIGURE_FLAGS += --with-gtk=2
endif
endif
@@ -452,7 +454,7 @@ LFLAGS := $(LFLAGS) $(TC_EXTRA_LFLAGS)
WX_CONFIGURE_FLAGS += --enable-unicode -disable-shared --disable-dependency-tracking --enable-exceptions --enable-std_string --enable-dataobj --enable-mimetype
ifdef VC_WX_MINIMAL
-WX_CONFIGURE_FLAGS += --disable-protocol --disable-protocols --disable-url --disable-ipc --disable-sockets --disable-fs_inet --disable-ole --disable-docview --disable-clipboard \
+WX_CONFIGURE_FLAGS += --disable-protocol --disable-protocols --disable-url --disable-ipc --disable-sockets --without-libcurl --disable-fs_inet --disable-ole --disable-docview --disable-clipboard \
--disable-help --disable-html --disable-mshtmlhelp --disable-htmlhelp --disable-mdi --disable-metafile --disable-addremovectrl --disable-webview \
--disable-xrc --disable-aui --disable-postscript --disable-printarch \
--disable-arcstream --disable-fs_archive --disable-fs_zip --disable-tarstream --disable-zipstream \