mirror of
https://github.com/veracrypt/VeraCrypt
synced 2024-11-24 12:03:28 +01:00
Linux: Solve error when building against dynamic wxWidgets library, especially under Ubuntu.
This commit is contained in:
parent
6ef41abdd2
commit
944b6aa53f
@ -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"
|
||||
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user