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

Removed workspace and project files from FileList.txt. Cleared 'make convert' error for makefile recipe

pull/263/head
Jeffrey Walton 2016-09-09 03:33:06 -04:00
parent 66928b51c8
commit 677c09584c
4 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Filelist.txt
View File

@ -52,10 +52,7 @@ cpu.cpp
cpu.h cpu.h
crc.cpp crc.cpp
crc.h crc.h
cryptdll.dsp
cryptdll.vcproj cryptdll.vcproj
cryptest.dsp
cryptest.dsw
cryptest.sh cryptest.sh
cryptest.sln cryptest.sln
cryptest.vcproj cryptest.vcproj
@ -64,7 +61,6 @@ cryptest_bds.bdsgroup
cryptest_bds.bdsproj cryptest_bds.bdsproj
cryptest_bds.bpf cryptest_bds.bpf
cryptlib.cpp cryptlib.cpp
cryptlib.dsp
cryptlib.h cryptlib.h
cryptlib.vcproj cryptlib.vcproj
cryptlib_bds.bdsproj cryptlib_bds.bdsproj
@ -84,7 +80,6 @@ dh2.h
dll.cpp dll.cpp
dll.h dll.h
dlltest.cpp dlltest.cpp
dlltest.dsp
dlltest.vcproj dlltest.vcproj
dmac.h dmac.h
dsa.cpp dsa.cpp
@ -285,6 +280,7 @@ validat3.cpp
validate.h validate.h
vmac.cpp vmac.cpp
vmac.h vmac.h
vc60.zip
vs2010.zip vs2010.zip
wait.cpp wait.cpp
wait.h wait.h

2
GNUmakefile
View File

@ -668,7 +668,7 @@ dlltest.exe: cryptopp.dll $(DLLTESTOBJS)
$(CXX) -o $@ $(CXXFLAGS) $(DLLTESTOBJS) -L. -lcryptopp.dll $(LDFLAGS) $(LDLIBS) $(CXX) -o $@ $(CXXFLAGS) $(DLLTESTOBJS) -L. -lcryptopp.dll $(LDFLAGS) $(LDLIBS)
# This recipe prepares the distro files # This recipe prepares the distro files
TEXT_FILES := *.h *.cpp adhoc.cpp.proto License.txt Readme.txt Install.txt Filelist.txt CMakeLists.txt config.recommend Doxyfile cryptest* cryptlib* dlltest* cryptdll* *.sln *.vcproj *.dsw *.dsp cryptopp.rc TestVectors/*.txt TestData/*.dat TEXT_FILES := *.h *.cpp adhoc.cpp.proto License.txt Readme.txt Install.txt Filelist.txt CMakeLists.txt config.recommend Doxyfile cryptest* cryptlib* dlltest* cryptdll* *.sln *.vcproj cryptopp.rc TestVectors/*.txt TestData/*.dat
EXEC_FILES := GNUmakefile GNUmakefile-cross TestData/ TestVectors/ EXEC_FILES := GNUmakefile GNUmakefile-cross TestData/ TestVectors/
ifeq ($(wildcard Filelist.txt),Filelist.txt) ifeq ($(wildcard Filelist.txt),Filelist.txt)

4
config.h
View File

@ -262,7 +262,7 @@ const lword LWORD_MAX = W64LIT(0xffffffffffffffff);
typedef word32 hword; typedef word32 hword;
typedef word64 word; typedef word64 word;
#else #else
#define CRYPTOPP_NATIVE_DWORD_AVAILABLE #define CRYPTOPP_NATIVE_DWORD_AVAILABLE 1
#if defined(__alpha__) || defined(__ia64__) || defined(_ARCH_PPC64) || defined(__x86_64__) || defined(__mips64) || defined(__sparc64__) #if defined(__alpha__) || defined(__ia64__) || defined(_ARCH_PPC64) || defined(__x86_64__) || defined(__mips64) || defined(__sparc64__)
#if defined(__GNUC__) && !defined(__INTEL_COMPILER) && !(CRYPTOPP_GCC_VERSION == 40001 && defined(__APPLE__)) && CRYPTOPP_GCC_VERSION >= 30400 #if defined(__GNUC__) && !defined(__INTEL_COMPILER) && !(CRYPTOPP_GCC_VERSION == 40001 && defined(__APPLE__)) && CRYPTOPP_GCC_VERSION >= 30400
// GCC 4.0.1 on MacOS X is missing __umodti3 and __udivti3 // GCC 4.0.1 on MacOS X is missing __umodti3 and __udivti3
@ -271,7 +271,7 @@ const lword LWORD_MAX = W64LIT(0xffffffffffffffff);
typedef word64 word; typedef word64 word;
typedef __uint128_t dword; typedef __uint128_t dword;
typedef __uint128_t word128; typedef __uint128_t word128;
#define CRYPTOPP_WORD128_AVAILABLE #define CRYPTOPP_WORD128_AVAILABLE 1
#else #else
// if we're here, it means we're on a 64-bit CPU but we don't have a way to obtain 128-bit multiplication results // if we're here, it means we're on a 64-bit CPU but we don't have a way to obtain 128-bit multiplication results
typedef word16 hword; typedef word16 hword;

4
config.recommend
View File

@ -262,7 +262,7 @@ const lword LWORD_MAX = W64LIT(0xffffffffffffffff);
typedef word32 hword; typedef word32 hword;
typedef word64 word; typedef word64 word;
#else #else
#define CRYPTOPP_NATIVE_DWORD_AVAILABLE #define CRYPTOPP_NATIVE_DWORD_AVAILABLE 1
#if defined(__alpha__) || defined(__ia64__) || defined(_ARCH_PPC64) || defined(__x86_64__) || defined(__mips64) || defined(__sparc64__) #if defined(__alpha__) || defined(__ia64__) || defined(_ARCH_PPC64) || defined(__x86_64__) || defined(__mips64) || defined(__sparc64__)
#if defined(__GNUC__) && !defined(__INTEL_COMPILER) && !(CRYPTOPP_GCC_VERSION == 40001 && defined(__APPLE__)) && CRYPTOPP_GCC_VERSION >= 30400 #if defined(__GNUC__) && !defined(__INTEL_COMPILER) && !(CRYPTOPP_GCC_VERSION == 40001 && defined(__APPLE__)) && CRYPTOPP_GCC_VERSION >= 30400
// GCC 4.0.1 on MacOS X is missing __umodti3 and __udivti3 // GCC 4.0.1 on MacOS X is missing __umodti3 and __udivti3
@ -271,7 +271,7 @@ const lword LWORD_MAX = W64LIT(0xffffffffffffffff);
typedef word64 word; typedef word64 word;
typedef __uint128_t dword; typedef __uint128_t dword;
typedef __uint128_t word128; typedef __uint128_t word128;
#define CRYPTOPP_WORD128_AVAILABLE #define CRYPTOPP_WORD128_AVAILABLE 1
#else #else
// if we're here, it means we're on a 64-bit CPU but we don't have a way to obtain 128-bit multiplication results // if we're here, it means we're on a 64-bit CPU but we don't have a way to obtain 128-bit multiplication results
typedef word16 hword; typedef word16 hword;