port to GCC 4, reorganize implementations of SetKey

git-svn-id: svn://svn.code.sf.net/p/cryptopp/code/trunk/c5@248 57ff6487-cd31-0410-9ec3-f628ee90f5f0

1 files changed, 13 insertions, 5 deletions

diff --git a/cryptlib.dsp b/cryptlib.dsp
index bb2f098..de13a67 100644
--- a/cryptlib.dsp
+++ b/cryptlib.dsp
@@ -27,7 +27,7 @@ CFG=cryptlib - Win32 Debug
 # PROP AllowPerConfigDependencies 0
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
-CPP=xicl6.exe
+CPP=cl.exe
 RSC=rc.exe
 
 !IF  "$(CFG)" == "cryptlib - Win32 DLL-Import Release"
@@ -49,7 +49,7 @@ RSC=rc.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LIB32=xilink6.exe -lib
+LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo
 
@@ -72,7 +72,7 @@ LIB32=xilink6.exe -lib
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LIB32=xilink6.exe -lib
+LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo
 
@@ -95,7 +95,7 @@ LIB32=xilink6.exe -lib
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LIB32=xilink6.exe -lib
+LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo
 
@@ -118,7 +118,7 @@ LIB32=xilink6.exe -lib
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LIB32=xilink6.exe -lib
+LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo
 
@@ -528,6 +528,10 @@ SOURCE=.\safer.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\salsa.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\seal.cpp
 # End Source File
 # Begin Source File
@@ -1012,6 +1016,10 @@ SOURCE=.\safer.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\salsa.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\seal.h
 # End Source File
 # Begin Source File