diff options
-rwxr-xr-x | src/Main/Main.make | 4 | ||||
-rw-r--r-- | src/Main/TextUserInterface.h | 2 | ||||
-rw-r--r-- | src/Makefile | 3 |
3 files changed, 8 insertions, 1 deletions
diff --git a/src/Main/Main.make b/src/Main/Main.make index 0cb4e15d..18efba64 100755 --- a/src/Main/Main.make +++ b/src/Main/Main.make @@ -81,7 +81,11 @@ CXXFLAGS += -I$(BASE_DIR)/Main #------ wxWidgets configuration ------ +ifdef TC_NO_GUI +WX_CONFIG_LIBS := base +else WX_CONFIG_LIBS := adv,core,base +endif ifeq "$(TC_BUILD_CONFIG)" "Release" diff --git a/src/Main/TextUserInterface.h b/src/Main/TextUserInterface.h index 95db02d7..78874b8c 100644 --- a/src/Main/TextUserInterface.h +++ b/src/Main/TextUserInterface.h @@ -47,7 +47,9 @@ namespace VeraCrypt virtual void ExportSecurityTokenKeyfile () const; virtual shared_ptr <GetStringFunctor> GetAdminPasswordRequestHandler (); virtual void ImportSecurityTokenKeyfiles () const; +#ifndef TC_NO_GUI virtual bool Initialize (int &argc, wxChar **argv) { return wxAppBase::Initialize(argc, argv); } +#endif virtual void InitSecurityTokenLibrary () const; virtual void ListSecurityTokenKeyfiles () const; virtual VolumeInfoList MountAllDeviceHostedVolumes (MountOptions &options) const; diff --git a/src/Makefile b/src/Makefile index 1b084421..f881c87e 100644 --- a/src/Makefile +++ b/src/Makefile @@ -69,7 +69,8 @@ endif ifeq "$(origin NOGUI)" "command line" export TC_NO_GUI := 1 - C_CXX_FLAGS += -DTC_NO_GUI + C_CXX_FLAGS += -DTC_NO_GUI -DwxUSE_GUI=0 + WX_CONFIGURE_FLAGS += --disable-gui endif ifdef PKCS11_INC |