diff options
| author | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2016-05-02 07:19:29 +0200 |
|---|---|---|
| committer | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2016-05-02 07:19:29 +0200 |
| commit | 0b914c8f5d690dfc1bdfbca1e1083372c5ed84d8 (patch) | |
| tree | b106600a18dcd0b4586aee4da9533b6c15264b40 /src/Makefile | |
| parent | 650d913f51304c348158cbe7bb8b47cd6d4a4a58 (diff) | |
| parent | faea63cb3c135316c035152dbdb1d5b98ae43907 (diff) | |
| download | VeraCrypt-0b914c8f5d690dfc1bdfbca1e1083372c5ed84d8.tar.gz VeraCrypt-0b914c8f5d690dfc1bdfbca1e1083372c5ed84d8.zip | |
Merge pull request #55 from davidfoerster/xdg-config-paths
Use XDG_CONFIG_HOME to determine the path of the configuration
Diffstat (limited to 'src/Makefile')
| -rw-r--r-- | src/Makefile | 14 |
1 files changed, 7 insertions, 7 deletions
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) |