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

Linux: Solve error when building against dynamic wxWidgets library, especially under Ubuntu.

Browse Source
This commit is contained in:
Mounir IDRASSI
2015-07-11 01:49:23 +02:00
parent 6ef41abdd2
commit 944b6aa53f
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Main/Main.make
View File

@@ -78,10 +78,14 @@ CXXFLAGS += -I$(BASE_DIR)/Main
#------ wxWidgets configuration ------ #------ wxWidgets configuration ------
ifdef TC_NO_GUI ifdef TC_NO_GUI
ifdef VC_WX_STATIC
WX_CONFIG_LIBS := base WX_CONFIG_LIBS := base
else else
WX_CONFIG_LIBS := adv,core,base WX_CONFIG_LIBS := adv,core,base
endif endif
else
WX_CONFIG_LIBS := adv,core,base
endif
ifeq "$(TC_BUILD_CONFIG)" "Release" ifeq "$(TC_BUILD_CONFIG)" "Release"

1
src/Makefile
View File

@@ -80,6 +80,7 @@ ifneq "$(origin VERBOSE)" "command line"
endif endif
ifeq "$(origin WXSTATIC)" "command line" ifeq "$(origin WXSTATIC)" "command line"
export VC_WX_STATIC := 1
WX_CONFIG = $(WX_BUILD_DIR)/wx-config WX_CONFIG = $(WX_BUILD_DIR)/wx-config
WX_CONFIG_ARGS += --static WX_CONFIG_ARGS += --static
endif endif