diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-05-08 16:38:24 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-05-08 16:38:24 +0200 |
| commit | fa91c7bc6062c31940cc544365ac39ab1ff213e4 (patch) | |
| tree | ebe138ed16c23ac42eea8666540d8b49f5a675b6 /extra/yassl/taocrypt | |
| parent | 23aeb617edc9ba91703813c07317b9af95cb89a2 (diff) | |
| parent | c3398d13dea8829cec5de3a6d627866a23df93d7 (diff) | |
| download | mariadb-git-fa91c7bc6062c31940cc544365ac39ab1ff213e4.tar.gz | |
Merge 192.168.0.20:mysql/my50-maint-yassl
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
extra/yassl/src/ssl.cpp:
Auto merged
extra/yassl/taocrypt/src/make.bat:
Auto merged
extra/yassl/testsuite/test.hpp:
Auto merged
Diffstat (limited to 'extra/yassl/taocrypt')
| -rw-r--r-- | extra/yassl/taocrypt/benchmark/make.bat | 5 | ||||
| -rw-r--r-- | extra/yassl/taocrypt/src/make.bat | 1 | ||||
| -rw-r--r-- | extra/yassl/taocrypt/test/make.bat | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/extra/yassl/taocrypt/benchmark/make.bat b/extra/yassl/taocrypt/benchmark/make.bat index 63391578cfa..4ebe4b32417 100644 --- a/extra/yassl/taocrypt/benchmark/make.bat +++ b/extra/yassl/taocrypt/benchmark/make.bat @@ -1,10 +1,9 @@ -# quick and dirty build file for testing different MSDEVs +REM quick and dirty build file for testing different MSDEVs setlocal set myFLAGS= /I../include /I../../mySTL /c /W3 /G6 /O2 -#set myFLAGS= /I../include /I../../mySTL /c /W3 cl %myFLAGS% benchmark.cpp -link.exe /out:benchmark.exe ../src/taocrypt.lib benchmark.obj +link.exe /out:benchmark.exe ../src/taocrypt.lib benchmark.obj advapi32.lib diff --git a/extra/yassl/taocrypt/src/make.bat b/extra/yassl/taocrypt/src/make.bat index 3acd50fc875..ecf7e8f8469 100644 --- a/extra/yassl/taocrypt/src/make.bat +++ b/extra/yassl/taocrypt/src/make.bat @@ -2,7 +2,6 @@ REM quick and dirty build file for testing different MSDEVs setlocal set myFLAGS= /I../include /I../../mySTL /c /W3 /G6 /O2 -#set myFLAGS= /I../include /I../../mySTL /c /W3 /O1 cl %myFLAGS% aes.cpp cl %myFLAGS% aestables.cpp diff --git a/extra/yassl/taocrypt/test/make.bat b/extra/yassl/taocrypt/test/make.bat index e1a4cbce7cd..5f01db68d0d 100644 --- a/extra/yassl/taocrypt/test/make.bat +++ b/extra/yassl/taocrypt/test/make.bat @@ -1,4 +1,4 @@ -# quick and dirty build file for testing different MSDEVs +REM quick and dirty build file for testing different MSDEVs setlocal set myFLAGS= /I../include /I../../mySTL /c /W3 /G6 /O2 |