mirror of
https://github.com/veracrypt/VeraCrypt
synced 2024-09-20 21:06:22 +02:00
Linux: solve link error on recent Ubuntu when using shared wxWidgets.
This commit is contained in:
parent
271d39d942
commit
ad9b40d599
@ -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
|
||||
|
@ -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"
|
||||
|
Loading…
Reference in New Issue
Block a user