diff options
| author | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2014-06-08 00:48:01 +0200 |
|---|---|---|
| committer | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2014-11-08 23:19:32 +0100 |
| commit | 4d12001e10c3c7a1a97bf47428bdebfab54bac91 (patch) | |
| tree | fc90042e3a8fe61d599f65e7bac704909b622375 | |
| parent | 084a8ee85c24fbc7077d6c789c97aacdb31b4e39 (diff) | |
| download | VeraCrypt-4d12001e10c3c7a1a97bf47428bdebfab54bac91.tar.gz VeraCrypt-4d12001e10c3c7a1a97bf47428bdebfab54bac91.zip | |
Adapt Makefiles for VeraCrypt. Use PKCS#11 headers from source tree is not specified elsewhere.
| -rw-r--r-- | src/Main/Main.make | 4 | ||||
| -rw-r--r-- | src/Makefile | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/Main/Main.make b/src/Main/Main.make index 565ed400..a96b1181 100644 --- a/src/Main/Main.make +++ b/src/Main/Main.make @@ -64,7 +64,7 @@ RESOURCES += ../License.txt.h RESOURCES += ../Common/Language.xml.h ifndef TC_NO_GUI RESOURCES += ../Common/Textual_logo_96dpi.bmp.h -RESOURCES += ../Format/TrueCrypt_Wizard.bmp.h +RESOURCES += ../Format/VeraCrypt_Wizard.bmp.h RESOURCES += ../Mount/Drive_icon_96dpi.bmp.h RESOURCES += ../Mount/Drive_icon_mask_96dpi.bmp.h RESOURCES += ../Mount/Logo_96dpi.bmp.h @@ -131,7 +131,7 @@ else -ln -sf $(PWD)/Main/$(APPNAME) $(APPNAME).app/Contents/MacOS/$(APPNAME) endif - cp $(PWD)/Resources/Icons/TrueCrypt.icns $(APPNAME).app/Contents/Resources + cp $(PWD)/Resources/Icons/VeraCrypt.icns $(APPNAME).app/Contents/Resources echo -n APPLTRUE >$(APPNAME).app/Contents/PkgInfo sed -e 's/_VERSION_/$(patsubst %a,%.1,$(patsubst %b,%.2,$(TC_VERSION)))/' ../Build/Resources/MacOSX/Info.plist.xml >$(APPNAME).app/Contents/Info.plist diff --git a/src/Makefile b/src/Makefile index bc3431b8..321d3734 100644 --- a/src/Makefile +++ b/src/Makefile @@ -67,6 +67,8 @@ endif ifdef PKCS11_INC C_CXX_FLAGS += -I$(PKCS11_INC) ++else + C_CXX_FLAGS += -I$(CURDIR)/PKCS11 endif ifeq "$(origin RESOURCEDIR)" "command line" @@ -171,7 +173,7 @@ endif ifeq "$(shell uname -s)" "Darwin" PLATFORM := MacOSX - APPNAME := TrueCrypt + APPNAME := VeraCrypt TC_OSX_SDK ?= /Developer/SDKs/MacOSX10.4u.sdk CC := gcc-4.0 |