From ad9b40d5991688b60f446c4bc44537668df5dbca Mon Sep 17 00:00:00 2001
From: Mounir IDRASSI <mounir.idrassi@idrix.fr>
Date: Fri, 2 Jan 2015 17:09:56 +0100
Subject: Linux: solve link error on recent Ubuntu when using shared wxWidgets.

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

(limited to 'src')

diff --git a/src/Main/Main.make b/src/Main/Main.make
index 02577d8d..39221b46 100644
--- a/src/Main/Main.make
+++ b/src/Main/Main.make
@@ -123,7 +123,7 @@ endif
 
 $(APPNAME): $(LIBS) $(OBJS)
 	@echo Linking $@
-	$(CXX) -o $(APPNAME) $(LFLAGS) $(OBJS) $(LIBS) $(FUSE_LIBS) $(WX_LIBS)
+	$(CXX) -o $(APPNAME) $(OBJS) $(LIBS) $(FUSE_LIBS) $(WX_LIBS) $(LFLAGS)
 
 ifeq "$(TC_BUILD_CONFIG)" "Release"
 ifndef NOSTRIP
diff --git a/src/Makefile b/src/Makefile
index bd1b195d..8fe166f0 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -167,10 +167,13 @@ ifeq "$(shell uname -s)" "Linux"
 		WXCONFIG_CFLAGS += -fdata-sections -ffunction-sections
 		WXCONFIG_CXXFLAGS += -fdata-sections -ffunction-sections
 	endif
+	
+	ifneq "$(origin WXSTATIC)" "command line"
+		LFLAGS += -ldl
+	endif
 
 endif
 
-
 #------ Mac OS X configuration ------
 
 ifeq "$(shell uname -s)" "Darwin"
-- 
cgit v1.2.3