diff options
| author | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2015-07-11 01:49:23 +0200 |
|---|---|---|
| committer | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2015-07-11 01:58:36 +0200 |
| commit | 944b6aa53fd099b4e6477fb1d784f945456e8706 (patch) | |
| tree | b27eae3d2eed0e4213bda0c8993f08b7bd3bf501 | |
| parent | 6ef41abdd2122c36d9387cc4bbdbcfc81315b94b (diff) | |
| download | VeraCrypt-944b6aa53fd099b4e6477fb1d784f945456e8706.tar.gz VeraCrypt-944b6aa53fd099b4e6477fb1d784f945456e8706.zip | |
Linux: Solve error when building against dynamic wxWidgets library, especially under Ubuntu.
| -rw-r--r-- | src/Main/Main.make | 4 | ||||
| -rw-r--r-- | src/Makefile | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/src/Main/Main.make b/src/Main/Main.make index 26d3bb31..67acf18c 100644 --- a/src/Main/Main.make +++ b/src/Main/Main.make @@ -77,12 +77,16 @@ CXXFLAGS += -I$(BASE_DIR)/Main #------ wxWidgets configuration ------ ifdef TC_NO_GUI +ifdef VC_WX_STATIC WX_CONFIG_LIBS := base else WX_CONFIG_LIBS := adv,core,base endif +else +WX_CONFIG_LIBS := adv,core,base +endif ifeq "$(TC_BUILD_CONFIG)" "Release" CXXFLAGS += $(shell $(WX_CONFIG) $(WX_CONFIG_ARGS) --cxxflags) diff --git a/src/Makefile b/src/Makefile index 8fe166f0..daaf37a2 100644 --- a/src/Makefile +++ b/src/Makefile @@ -79,8 +79,9 @@ ifneq "$(origin VERBOSE)" "command line" MAKEFLAGS += -s endif ifeq "$(origin WXSTATIC)" "command line" + export VC_WX_STATIC := 1 WX_CONFIG = $(WX_BUILD_DIR)/wx-config WX_CONFIG_ARGS += --static endif |