From 944b6aa53fd099b4e6477fb1d784f945456e8706 Mon Sep 17 00:00:00 2001
From: Mounir IDRASSI <mounir.idrassi@idrix.fr>
Date: Sat, 11 Jul 2015 01:49:23 +0200
Subject: Linux: Solve error when building against dynamic wxWidgets library,
 especially under Ubuntu.

---
 src/Main/Main.make | 4 ++++
 src/Makefile       | 1 +
 2 files changed, 5 insertions(+)

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
@@ -78,10 +78,14 @@ 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"
 
diff --git a/src/Makefile b/src/Makefile
index 8fe166f0..daaf37a2 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -80,6 +80,7 @@ ifneq "$(origin VERBOSE)" "command line"
 endif
 
 ifeq "$(origin WXSTATIC)" "command line"
+	export VC_WX_STATIC := 1
 	WX_CONFIG = $(WX_BUILD_DIR)/wx-config
 	WX_CONFIG_ARGS += --static
 endif
-- 
cgit v1.2.3