arne
/
cryptopp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix ARM compile under VS2013

pull/398/head
Jeffrey Walton 2017-03-20 15:11:27 -04:00
parent f502ee9218
commit 2ea91ba1b9
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cpu.h
View File

@ -22,7 +22,7 @@
# if defined(__GNUC__) # if defined(__GNUC__)
# include <stdint.h> # include <stdint.h>
# endif # endif
# if defined(__ARM_NEON) # if defined(__ARM_NEON) || defined(_MSC_VER)
# include <arm_neon.h> # include <arm_neon.h>
# endif # endif
# if defined(__GNUC__) && !defined(__apple_build_version__) # if defined(__GNUC__) && !defined(__apple_build_version__)

5
cryptest.nmake
View File

@ -78,6 +78,8 @@ CXXFLAGS = $(CXXFLAGS) /FI sdkddkver.h
!ENDIF !ENDIF
!IF "$(WINDOWSPHONEKITDIR)" != "" || "$(UNIVERSALCRTSDKDIR)" != "" || "$(UCRTVERSION)" != "" !IF "$(WINDOWSPHONEKITDIR)" != "" || "$(UNIVERSALCRTSDKDIR)" != "" || "$(UCRTVERSION)" != ""
CXXFLAGS = $(CXXFLAGS) /FI winapifamily.h CXXFLAGS = $(CXXFLAGS) /FI winapifamily.h
!ELSEIF "$(PLATFORM)" == "ARM" || "$(PLATFORM)" == "arm" || "$(PLATFORM)" == "ARM64" || "$(PLATFORM)" == "arm64"
CXXFLAGS = $(CXXFLAGS) /FI winapifamily.h
!ENDIF !ENDIF
# Check for empty Platform and Processor # Check for empty Platform and Processor
@ -122,7 +124,8 @@ LDFLAGS = $(LDFLAGS) /MACHINE:X64
LDLIBS = $(LDLIBS) ws2_32.lib kernel32.lib LDLIBS = $(LDLIBS) ws2_32.lib kernel32.lib
!ENDIF !ENDIF
!IF "$(PLATFORM)" == "ARM" || "$(PLATFORM)" == "arm" # We still don't know what we need for ARM64 on Windows. ARM64 and arm64 may be incorrect
!IF "$(PLATFORM)" == "ARM" || "$(PLATFORM)" == "arm" || "$(PLATFORM)" == "ARM64" || "$(PLATFORM)" == "arm64"
# CXXFLAGS = $(CXXFLAGS) /D_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1 /DWINAPI_FAMILY=WINAPI_FAMILY_DESKTOP_APP # CXXFLAGS = $(CXXFLAGS) /D_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1 /DWINAPI_FAMILY=WINAPI_FAMILY_DESKTOP_APP
CXXFLAGS = $(CXXFLAGS) /DWINAPI_FAMILY=WINAPI_FAMILY_PHONE_APP CXXFLAGS = $(CXXFLAGS) /DWINAPI_FAMILY=WINAPI_FAMILY_PHONE_APP
# CXXFLAGS = $(CXXFLAGS) /DWINAPI_FAMILY=WINAPI_FAMILY_APP # CXXFLAGS = $(CXXFLAGS) /DWINAPI_FAMILY=WINAPI_FAMILY_APP