VeraCrypt
aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMounir IDRASSI <mounir.idrassi@idrix.fr>2015-01-02 17:09:56 +0100
committerMounir IDRASSI <mounir.idrassi@idrix.fr>2015-01-02 17:12:36 +0100
commitad9b40d5991688b60f446c4bc44537668df5dbca (patch)
treedd121a2981c965b4b5e405e773c9a4afd81bb03c
parent271d39d94277ab3c2a34faeed38caaa0af05dd2f (diff)
downloadVeraCrypt-ad9b40d5991688b60f446c4bc44537668df5dbca.tar.gz
VeraCrypt-ad9b40d5991688b60f446c4bc44537668df5dbca.zip
Linux: solve link error on recent Ubuntu when using shared wxWidgets.
-rw-r--r--src/Main/Main.make2
-rw-r--r--src/Makefile5
2 files changed, 5 insertions, 2 deletions
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"