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

Fix linking rdrand.obj twice on Windows using cryptest.nmake

pull/709/head
Jeffrey Walton 2018-08-19 10:06:20 -04:00
parent 5489cfe3c6
commit d41b3c8211
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cryptest.nmake
View File

@ -104,7 +104,7 @@ PLATFORM = x64
AS = ml.exe AS = ml.exe
ASFLAGS = /nologo /D_M_X86 /W3 /Cx /Zi /safeseh ASFLAGS = /nologo /D_M_X86 /W3 /Cx /Zi /safeseh
LIB_SRCS = $(LIB_SRCS) rdrand.cpp rdrand.asm LIB_SRCS = $(LIB_SRCS) rdrand.cpp rdrand.asm
LIB_OBJS = $(LIB_OBJS) rdrand.obj rdrand-x86.obj LIB_OBJS = $(LIB_OBJS) rdrand-x86.obj
LDFLAGS = $(LDFLAGS) /MACHINE:X86 LDFLAGS = $(LDFLAGS) /MACHINE:X86
LDLIBS = $(LDLIBS) kernel32.lib LDLIBS = $(LDLIBS) kernel32.lib
!ENDIF !ENDIF
@ -117,7 +117,7 @@ LDLIBS = $(LDLIBS) kernel32.lib
AS = ml64.exe AS = ml64.exe
ASFLAGS = /nologo /D_M_X64 /W3 /Cx /Zi ASFLAGS = /nologo /D_M_X64 /W3 /Cx /Zi
LIB_SRCS = $(LIB_SRCS) rdrand.cpp rdrand.asm LIB_SRCS = $(LIB_SRCS) rdrand.cpp rdrand.asm
LIB_OBJS = $(LIB_OBJS) rdrand.obj rdrand-x64.obj x64masm.obj x64dll.obj LIB_OBJS = $(LIB_OBJS) rdrand-x64.obj x64masm.obj x64dll.obj
LDFLAGS = $(LDFLAGS) /MACHINE:X64 LDFLAGS = $(LDFLAGS) /MACHINE:X64
LDLIBS = $(LDLIBS) kernel32.lib LDLIBS = $(LDLIBS) kernel32.lib
!ENDIF !ENDIF