nihilist/VeraCrypt
1
0
Fork 0
mirror of https://github.com/veracrypt/VeraCrypt synced 2024-11-10 21:23:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

FreeBSD 11 build and use compatibility

Browse Source
This commit is contained in:
Mounir IDRASSI 2017-04-23 14:18:48 +02:00
parent 100b79ddfa
commit 371b9c904a
No known key found for this signature in database
GPG Key ID: DD0C382D5FCFB8FC
2 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Main/UserInterface.cpp
View File

@ -838,12 +838,12 @@ namespace VeraCrypt
#else #else
// MIME handler for directory seems to be unavailable through wxWidgets // MIME handler for directory seems to be unavailable through wxWidgets
wxString desktop = GetTraits()->GetDesktopEnvironment(); wxString desktop = GetTraits()->GetDesktopEnvironment();
bool xdgOpenPresent = wxFileName::IsFileExecutable (wxT("/usr/bin/xdg-open")); 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")); bool nautilusPresent = wxFileName::IsFileExecutable (wxT("/usr/bin/nautilus")) || wxFileName::IsFileExecutable (wxT("/usr/local/bin/nautilus"));
if (desktop == L"GNOME" || (desktop.empty() && !xdgOpenPresent && nautilusPresent)) 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 ("--no-desktop");
args.push_back (string (path)); args.push_back (string (path));
try try

18
src/Makefile
View File

@ -285,6 +285,24 @@ ifeq "$(shell uname -s)" "FreeBSD"
PLATFORM := FreeBSD PLATFORM := FreeBSD
PLATFORM_UNSUPPORTED := 1 PLATFORM_UNSUPPORTED := 1
C_CXX_FLAGS += -DTC_UNIX -DTC_BSD -DTC_FREEBSD 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 endif