diff options
| author | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2017-04-23 14:18:48 +0200 |
|---|---|---|
| committer | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2017-04-23 14:18:48 +0200 |
| commit | 371b9c904aef37863aa57e2e848915df9ba9da9b (patch) | |
| tree | d8ee5e97d733f1538b253560323f5427da1c2956 /src | |
| parent | 100b79ddfa3c2ecbe29cc1c89277e7e109778094 (diff) | |
| download | VeraCrypt-371b9c904aef37863aa57e2e848915df9ba9da9b.tar.gz VeraCrypt-371b9c904aef37863aa57e2e848915df9ba9da9b.zip | |
FreeBSD 11 build and use compatibility
Diffstat (limited to 'src')
| -rw-r--r-- | src/Main/UserInterface.cpp | 6 | ||||
| -rw-r--r-- | src/Makefile | 18 |
2 files changed, 21 insertions, 3 deletions
diff --git a/src/Main/UserInterface.cpp b/src/Main/UserInterface.cpp index fa2088f1..c79cef2b 100644 --- a/src/Main/UserInterface.cpp +++ b/src/Main/UserInterface.cpp @@ -838,12 +838,12 @@ namespace VeraCrypt #else // MIME handler for directory seems to be unavailable through wxWidgets wxString desktop = GetTraits()->GetDesktopEnvironment(); - bool xdgOpenPresent = wxFileName::IsFileExecutable (wxT("/usr/bin/xdg-open")); - bool nautilusPresent = wxFileName::IsFileExecutable (wxT("/usr/bin/nautilus")); + bool xdgOpenPresent = wxFileName::IsFileExecutable (wxT("/usr/bin/xdg-open")) || wxFileName::IsFileExecutable (wxT("/usr/local/bin/xdg-open")); + bool nautilusPresent = wxFileName::IsFileExecutable (wxT("/usr/bin/nautilus")) || wxFileName::IsFileExecutable (wxT("/usr/local/bin/nautilus")); if (desktop == L"GNOME" || (desktop.empty() && !xdgOpenPresent && nautilusPresent)) { - args.push_back ("--no-default-window"); + // args.push_back ("--no-default-window"); // This option causes nautilus not to launch under FreeBSD 11 args.push_back ("--no-desktop"); args.push_back (string (path)); try diff --git a/src/Makefile b/src/Makefile index dea172f6..1b71f27f 100644 --- a/src/Makefile +++ b/src/Makefile @@ -285,6 +285,24 @@ ifeq "$(shell uname -s)" "FreeBSD" PLATFORM := FreeBSD PLATFORM_UNSUPPORTED := 1 C_CXX_FLAGS += -DTC_UNIX -DTC_BSD -DTC_FREEBSD + + CC := cc + CXX := c++ + + ifeq "$(SIMD_SUPPORTED)" "1" + CFLAGS += -msse2 -maes + CXXFLAGS += -msse2 -maes + + ifeq "$(origin SSSE3)" "command line" + CFLAGS += -mssse3 + CXXFLAGS += -mssse3 + endif + + ifeq "$(origin SSE41)" "command line" + CFLAGS += -mssse3 -msse4.1 + CXXFLAGS += -mssse3 -msse4.1 + endif + endif endif |