mirror of
https://github.com/veracrypt/VeraCrypt
synced 2024-11-10 13:13:34 +01:00
Fix the compilation against WxWidgets when NOGUI=1 (#570)
* Revert "Linux: Fix failure to run VeraCrypt binary built for console mode on headless machines (fix issue https://github.com/veracrypt/VeraCrypt/issues/531)" The build failure still exists for system wxGTK compiled with '--disable-gui': ``` In file included from TextUserInterface.cpp:27: TextUserInterface.h: In member function ‘virtual bool VeraCrypt::TextUserInterface::Initialize(int&, wxChar**)’: TextUserInterface.h:50:63: error: ‘wxAppBase’ has not been declared 50 | virtual bool Initialize (int &argc, wxChar **argv) { return wxAppBase::Initialize(argc, argv); } ``` This reverts commit737e1f126b
. * Revert "Linux: fix compilation error when building console-only version of VeraCrypt that is statically linked to wxWidgets" The build failure still exists for system wxGTK compiled with '--disable-gui': ``` In file included from TextUserInterface.cpp:27: TextUserInterface.h: In member function ‘virtual bool VeraCrypt::TextUserInterface::Initialize(int&, wxChar**)’: TextUserInterface.h:50:63: error: ‘wxAppBase’ has not been declared 50 | virtual bool Initialize (int &argc, wxChar **argv) { return wxAppBase::Initialize(argc, argv); } ``` This reverts commit14bee5e6a2
. * src/Main/Main.make: simplify the WX_CONFIG_LIBS logic Irrespective of whether we are linking against widgets statically or dynamically, pull in only 'base' when GUI is disabled, and 'adv,core,base' when GUI is enabled. When GUI is disabled, the C/CXX flag must include '-DwxUSE_GUI=0' for this to work. * src/Makefile: pass '-DwxUSE_GUI=0' when NOGUI=1 veracrypt with NOGUI=1 fails to properly link against wxGTK compiled with '--disable-gui' only using the 'base' library because the wx's setup.h implicitly defines wxUSE_GUI=1, which then changes the definition of various structures, requiring symbols from the core library as well. For example, wxwidgets include/wx/app.h defines: #if wxUSE_GUI class WXDLLIMPEXP_CORE wxAppBase : public wxAppConsole ... [snip] ... #else // !GUI // wxApp is defined in core and we cannot define another one in wxBase, // so use the preprocessor to allow using wxApp in console programs too #define wxApp wxAppConsole #endif // GUI/!GUI To fix this, pass '-DwxUSE_GUI=0' when compiling veracrypt with NOGUI=1. Closes: https://github.com/veracrypt/VeraCrypt/issues/531
This commit is contained in:
parent
31611ad315
commit
de52f51f5b
@ -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"
|
||||
|
||||
|
@ -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;
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user