Public/VeraCrypt
1
0
Fork 0
mirror of https://github.com/veracrypt/VeraCrypt.git synced 2025-11-11 02:58:02 -06:00
Code Activity

Linux: solve link error on recent Ubuntu when using shared wxWidgets.

Browse Source
This commit is contained in:
Mounir IDRASSI
2015-01-02 17:09:56 +01:00
parent 271d39d942
commit ad9b40d599
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Main/Main.make
View File

@@ -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

5
src/Makefile
View File

@@ -168,8 +168,11 @@ ifeq "$(shell uname -s)" "Linux"
WXCONFIG_CXXFLAGS += -fdata-sections -ffunction-sections
endif
endif
ifneq "$(origin WXSTATIC)" "command line"
LFLAGS += -ldl
endif
endif
#------ Mac OS X configuration ------