Public/VeraCrypt
1
0
Fork 0
mirror of https://github.com/veracrypt/VeraCrypt.git synced 2025-11-11 11:08:02 -06:00
Code Activity

Remove some trailing whitespace

Browse Source
This commit is contained in:
David Foerster
2016-03-31 12:24:41 +02:00
parent dc1593d60f
commit 39eae0e4c3
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Main/Application.cpp
View File

@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0. 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 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 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 contained in the file License.txt included in VeraCrypt binary and source
@@ -27,7 +27,7 @@ namespace VeraCrypt
mUserInterface = new TextUserInterface; mUserInterface = new TextUserInterface;
mUserInterfaceType = UserInterfaceType::Text; mUserInterfaceType = UserInterfaceType::Text;
return mUserInterface; return mUserInterface;
} }
#ifndef TC_NO_GUI #ifndef TC_NO_GUI
wxApp* Application::CreateGuiApp () wxApp* Application::CreateGuiApp ()
@@ -35,7 +35,7 @@ namespace VeraCrypt
mUserInterface = new GraphicUserInterface; mUserInterface = new GraphicUserInterface;
mUserInterfaceType = UserInterfaceType::Graphic; mUserInterfaceType = UserInterfaceType::Graphic;
return mUserInterface; return mUserInterface;
} }
#endif #endif
FilePath Application::GetConfigFilePath (const wxString &configFileName, bool createConfigDir) FilePath Application::GetConfigFilePath (const wxString &configFileName, bool createConfigDir)

14
src/Makefile
View File

@@ -3,7 +3,7 @@
# Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed # Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
# by the TrueCrypt License 3.0. # 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 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 # 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 # contained in the file License.txt included in VeraCrypt binary and source
@@ -114,7 +114,7 @@ endif
ifeq "$(origin DEBUGGER)" "command line" ifeq "$(origin DEBUGGER)" "command line"
C_CXX_FLAGS += -ggdb C_CXX_FLAGS += -ggdb
WX_CONFIGURE_FLAGS += --enable-debug_gdb --enable-debug_info WX_CONFIGURE_FLAGS += --enable-debug_gdb --enable-debug_info
endif endif
@@ -172,7 +172,7 @@ ifeq "$(shell uname -s)" "Linux"
WXCONFIG_CFLAGS += -fdata-sections -ffunction-sections WXCONFIG_CFLAGS += -fdata-sections -ffunction-sections
WXCONFIG_CXXFLAGS += -fdata-sections -ffunction-sections WXCONFIG_CXXFLAGS += -fdata-sections -ffunction-sections
endif endif
ifneq "$(origin WXSTATIC)" "command line" ifneq "$(origin WXSTATIC)" "command line"
LFLAGS += -ldl LFLAGS += -ldl
else else
@@ -191,7 +191,7 @@ ifeq "$(shell uname -s)" "Darwin"
PLATFORM := MacOSX PLATFORM := MacOSX
APPNAME := VeraCrypt APPNAME := VeraCrypt
export VC_OSX_TARGET ?= 10.7 export VC_OSX_TARGET ?= 10.7
#check to see if XCode 3 path exists.Otherwise, use XCode 4 path #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 \ --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 --without-expat --without-libtiff --without-libjpeg --without-libpng -without-regex --without-zlib
ifeq "$(PLATFORM)" "Linux" ifeq "$(PLATFORM)" "Linux"
WX_CONFIGURE_FLAGS += --disable-tooltips WX_CONFIGURE_FLAGS += --disable-tooltips
endif endif
@@ -301,7 +301,7 @@ all clean:
PROJ=$$(echo $$DIR | cut -d/ -f1); \ PROJ=$$(echo $$DIR | cut -d/ -f1); \
$(MAKE) -C $$DIR -f $$PROJ.make NAME=$$PROJ $(MAKECMDGOALS) || exit $?; \ $(MAKE) -C $$DIR -f $$PROJ.make NAME=$$PROJ $(MAKECMDGOALS) || exit $?; \
export LIBS="$(BASE_DIR)/$$DIR/$$PROJ.a $$LIBS"; \ export LIBS="$(BASE_DIR)/$$DIR/$$PROJ.a $$LIBS"; \
done done
#------ wxWidgets build ------ #------ wxWidgets build ------
@@ -323,6 +323,6 @@ endif
mkdir -p "$(WX_BUILD_DIR)" mkdir -p "$(WX_BUILD_DIR)"
@echo Configuring wxWidgets library... @echo Configuring wxWidgets library...
cd "$(WX_BUILD_DIR)" && "$(WX_ROOT)/configure" $(WX_CONFIGURE_FLAGS) >/dev/null cd "$(WX_BUILD_DIR)" && "$(WX_ROOT)/configure" $(WX_CONFIGURE_FLAGS) >/dev/null
@echo Building wxWidgets library... @echo Building wxWidgets library...
cd "$(WX_BUILD_DIR)" && $(MAKE) cd "$(WX_BUILD_DIR)" && $(MAKE)