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

Adapt Makefiles for VeraCrypt. Use PKCS#11 headers from source tree is not specified elsewhere.

Browse Source
This commit is contained in:
Mounir IDRASSI
2014-06-08 00:48:01 +02:00
parent 084a8ee85c
commit 4d12001e10
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Main/Main.make
View File

@@ -64,7 +64,7 @@ RESOURCES += ../License.txt.h
RESOURCES += ../Common/Language.xml.h RESOURCES += ../Common/Language.xml.h
ifndef TC_NO_GUI ifndef TC_NO_GUI
RESOURCES += ../Common/Textual_logo_96dpi.bmp.h 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_96dpi.bmp.h
RESOURCES += ../Mount/Drive_icon_mask_96dpi.bmp.h RESOURCES += ../Mount/Drive_icon_mask_96dpi.bmp.h
RESOURCES += ../Mount/Logo_96dpi.bmp.h RESOURCES += ../Mount/Logo_96dpi.bmp.h
@@ -131,7 +131,7 @@ else
-ln -sf $(PWD)/Main/$(APPNAME) $(APPNAME).app/Contents/MacOS/$(APPNAME) -ln -sf $(PWD)/Main/$(APPNAME) $(APPNAME).app/Contents/MacOS/$(APPNAME)
endif 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 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 sed -e 's/_VERSION_/$(patsubst %a,%.1,$(patsubst %b,%.2,$(TC_VERSION)))/' ../Build/Resources/MacOSX/Info.plist.xml >$(APPNAME).app/Contents/Info.plist

4
src/Makefile
View File

@@ -67,6 +67,8 @@ endif
ifdef PKCS11_INC ifdef PKCS11_INC
C_CXX_FLAGS += -I$(PKCS11_INC) C_CXX_FLAGS += -I$(PKCS11_INC)
+else
C_CXX_FLAGS += -I$(CURDIR)/PKCS11
endif endif
ifeq "$(origin RESOURCEDIR)" "command line" ifeq "$(origin RESOURCEDIR)" "command line"
@@ -171,7 +173,7 @@ endif
ifeq "$(shell uname -s)" "Darwin" ifeq "$(shell uname -s)" "Darwin"
PLATFORM := MacOSX PLATFORM := MacOSX
APPNAME := TrueCrypt APPNAME := VeraCrypt
TC_OSX_SDK ?= /Developer/SDKs/MacOSX10.4u.sdk TC_OSX_SDK ?= /Developer/SDKs/MacOSX10.4u.sdk
CC := gcc-4.0 CC := gcc-4.0