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 | |||
| 81 | 81 | ||
| 82 | #------ wxWidgets configuration ------ | 82 | #------ wxWidgets configuration ------ |
| 83 | 83 | ||
| 84 | ifdef TC_NO_GUI | ||
| 85 | WX_CONFIG_LIBS := base | ||
| 86 | else | ||
| 84 | WX_CONFIG_LIBS := adv,core,base | 87 | WX_CONFIG_LIBS := adv,core,base |
| 88 | endif | ||
| 85 | 89 | ||
| 86 | ifeq "$(TC_BUILD_CONFIG)" "Release" | 90 | ifeq "$(TC_BUILD_CONFIG)" "Release" |
| 87 | 91 | ||
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 | |||
| 47 | virtual void ExportSecurityTokenKeyfile () const; | 47 | virtual void ExportSecurityTokenKeyfile () const; |
| 48 | virtual shared_ptr <GetStringFunctor> GetAdminPasswordRequestHandler (); | 48 | virtual shared_ptr <GetStringFunctor> GetAdminPasswordRequestHandler (); |
| 49 | virtual void ImportSecurityTokenKeyfiles () const; | 49 | virtual void ImportSecurityTokenKeyfiles () const; |
| 50 | #ifndef TC_NO_GUI | ||
| 50 | virtual bool Initialize (int &argc, wxChar **argv) { return wxAppBase::Initialize(argc, argv); } | 51 | virtual bool Initialize (int &argc, wxChar **argv) { return wxAppBase::Initialize(argc, argv); } |
| 52 | #endif | ||
| 51 | virtual void InitSecurityTokenLibrary () const; | 53 | virtual void InitSecurityTokenLibrary () const; |
| 52 | virtual void ListSecurityTokenKeyfiles () const; | 54 | virtual void ListSecurityTokenKeyfiles () const; |
| 53 | virtual VolumeInfoList MountAllDeviceHostedVolumes (MountOptions &options) const; | 55 | 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 | |||
| 69 | 69 | ||
| 70 | ifeq "$(origin NOGUI)" "command line" | 70 | ifeq "$(origin NOGUI)" "command line" |
| 71 | export TC_NO_GUI := 1 | 71 | export TC_NO_GUI := 1 |
| 72 | C_CXX_FLAGS += -DTC_NO_GUI | 72 | C_CXX_FLAGS += -DTC_NO_GUI -DwxUSE_GUI=0 |
| 73 | WX_CONFIGURE_FLAGS += --disable-gui | ||
| 73 | endif | 74 | endif |
| 74 | 75 | ||
| 75 | ifdef PKCS11_INC | 76 | ifdef PKCS11_INC |