VeraCrypt
aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDavid Foerster <david.foerster@informatik.hu-berlin.de>2016-03-31 12:24:41 +0200
committerDavid Foerster <david.foerster@informatik.hu-berlin.de>2016-03-31 12:24:41 +0200
commit39eae0e4c3d4e392feffd19b4e3b9449534d5426 (patch)
treeef0acc250cef2e450bda43e60bfd2c5821bf8544 /src
parentdc1593d60f63aa951c1463ade13c97cfde94d2f5 (diff)
downloadVeraCrypt-39eae0e4c3d4e392feffd19b4e3b9449534d5426.tar.gz
VeraCrypt-39eae0e4c3d4e392feffd19b4e3b9449534d5426.zip
Remove some trailing whitespace
Diffstat (limited to 'src')
-rw-r--r--src/Main/Application.cpp6
-rw-r--r--src/Makefile14
2 files changed, 10 insertions, 10 deletions
diff --git a/src/Main/Application.cpp b/src/Main/Application.cpp
index a4b3c60c..dec416af 100644
--- a/src/Main/Application.cpp
+++ b/src/Main/Application.cpp
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
and are governed by the Apache License 2.0 the full text of which is
contained in the file License.txt included in VeraCrypt binary and source
@@ -27,7 +27,7 @@ namespace VeraCrypt
mUserInterface = new TextUserInterface;
mUserInterfaceType = UserInterfaceType::Text;
return mUserInterface;
- }
+ }
#ifndef TC_NO_GUI
wxApp* Application::CreateGuiApp ()
@@ -35,7 +35,7 @@ namespace VeraCrypt
mUserInterface = new GraphicUserInterface;
mUserInterfaceType = UserInterfaceType::Graphic;
return mUserInterface;
- }
+ }
#endif
FilePath Application::GetConfigFilePath (const wxString &configFileName, bool createConfigDir)
diff --git a/src/Makefile b/src/Makefile
index 23d0c516..70fb26da 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -3,7 +3,7 @@
# Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
# by the TrueCrypt License 3.0.
#
-# Modifications and additions to the original source code (contained in this file)
+# Modifications and additions to the original source code (contained in this file)
# and all other portions of this file are Copyright (c) 2013-2016 IDRIX
# and are governed by the Apache License 2.0 the full text of which is
# contained in the file License.txt included in VeraCrypt binary and source
@@ -114,7 +114,7 @@ endif
ifeq "$(origin DEBUGGER)" "command line"
- C_CXX_FLAGS += -ggdb
+ C_CXX_FLAGS += -ggdb
WX_CONFIGURE_FLAGS += --enable-debug_gdb --enable-debug_info
endif
@@ -172,7 +172,7 @@ ifeq "$(shell uname -s)" "Linux"
WXCONFIG_CFLAGS += -fdata-sections -ffunction-sections
WXCONFIG_CXXFLAGS += -fdata-sections -ffunction-sections
endif
-
+
ifneq "$(origin WXSTATIC)" "command line"
LFLAGS += -ldl
else
@@ -191,7 +191,7 @@ ifeq "$(shell uname -s)" "Darwin"
PLATFORM := MacOSX
APPNAME := VeraCrypt
-
+
export VC_OSX_TARGET ?= 10.7
#check to see if XCode 3 path exists.Otherwise, use XCode 4 path
@@ -284,7 +284,7 @@ WX_CONFIGURE_FLAGS += --enable-unicode -disable-shared --disable-dependency-trac
--disable-gif --disable-pcx --disable-tga --disable-iff --disable-gif --disable-pnm --disable-svg \
--without-expat --without-libtiff --without-libjpeg --without-libpng -without-regex --without-zlib
-ifeq "$(PLATFORM)" "Linux"
+ifeq "$(PLATFORM)" "Linux"
WX_CONFIGURE_FLAGS += --disable-tooltips
endif
@@ -301,7 +301,7 @@ all clean:
PROJ=$$(echo $$DIR | cut -d/ -f1); \
$(MAKE) -C $$DIR -f $$PROJ.make NAME=$$PROJ $(MAKECMDGOALS) || exit $?; \
export LIBS="$(BASE_DIR)/$$DIR/$$PROJ.a $$LIBS"; \
- done
+ done
#------ wxWidgets build ------
@@ -323,6 +323,6 @@ endif
mkdir -p "$(WX_BUILD_DIR)"
@echo Configuring wxWidgets library...
cd "$(WX_BUILD_DIR)" && "$(WX_ROOT)/configure" $(WX_CONFIGURE_FLAGS) >/dev/null
-
+
@echo Building wxWidgets library...
cd "$(WX_BUILD_DIR)" && $(MAKE)