diff options
author | unknown <jimw@mysql.com> | 2006-04-30 13:27:38 -0700 |
---|---|---|
committer | unknown <jimw@mysql.com> | 2006-04-30 13:27:38 -0700 |
commit | c3c5f8d6d73ff71e9b49d8ce0bf4fa4be865b1da (patch) | |
tree | 4149d104692e9dafa62ff0ddb7174a16b4a47013 /extra/yassl/testsuite/make.bat | |
parent | 383d35eba7d0aa30f318dfddd165d9e4199e7b93 (diff) | |
parent | 53a4e3ee50367094ec7d49aeef09ea412576803b (diff) | |
download | mariadb-git-c3c5f8d6d73ff71e9b49d8ce0bf4fa4be865b1da.tar.gz |
Merge mysql.com:/home/jimw/my/mysql-5.0-clean
into mysql.com:/home/jimw/my/mysql-5.1-clean
BitKeeper/etc/ignore:
auto-union
BitKeeper/deleted/.del-mysql_upgrade.dsp:
Delete: VC++Files/client/mysql_upgrade.dsp
BitKeeper/deleted/.del-mysql_upgrade_ia64.dsp:
Delete: VC++Files/client/mysql_upgrade_ia64.dsp
BitKeeper/deleted/.del-mysql_upgrade.c:
Delete: client/mysql_upgrade.c
VC++Files/mysql.dsw:
Auto merged
VC++Files/mysql.sln:
Auto merged
VC++Files/mysql_ia64.dsw:
Auto merged
client/mysql.cc:
Auto merged
config/ac-macros/zlib.m4:
Auto merged
configure.in:
Auto merged
extra/yassl/Makefile.am:
Auto merged
extra/yassl/taocrypt/Makefile.am:
Auto merged
include/my_global.h:
Auto merged
include/mysql.h:
Auto merged
libmysql/libmysql.def:
Auto merged
libmysqld/libmysqld.def:
Auto merged
mysql-test/r/grant2.result:
Auto merged
mysql-test/r/sp-security.result:
Auto merged
mysql-test/r/subselect.result:
Auto merged
mysql-test/r/trigger.result:
Auto merged
mysql-test/r/udf.result:
Auto merged
mysql-test/t/grant2.test:
Auto merged
mysql-test/t/rpl_openssl.test:
Auto merged
mysql-test/t/rpl_rotate_logs.test:
Auto merged
mysql-test/t/sp-security.test:
Auto merged
mysql-test/t/trigger.test:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_subselect.cc:
Auto merged
sql-common/client.c:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
client/Makefile.am:
Resolve conflict
config/ac-macros/yassl.m4:
Resolve conflict
mysql-test/include/have_udf.inc:
Resolve conflict
mysql-test/lib/mtr_process.pl:
Resolve conflict
mysql-test/mysql-test-run.pl:
Resolve conflict
mysql-test/r/have_udf.require:
Resolve conflict
mysql-test/r/rpl_openssl.result:
Resolve conflict
mysql-test/t/disabled.def:
Resolve conflict
mysql-test/t/information_schema.test:
Resolve conflict
server-tools/instance-manager/instance_options.cc:
Resolve conflict
sql/mysql_priv.h:
Resolve conflict
sql/set_var.cc:
Resolve conflict
support-files/mysql.spec.sh:
Resolve conflict
Diffstat (limited to 'extra/yassl/testsuite/make.bat')
-rw-r--r-- | extra/yassl/testsuite/make.bat | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/extra/yassl/testsuite/make.bat b/extra/yassl/testsuite/make.bat new file mode 100644 index 00000000000..d8a55b0d3af --- /dev/null +++ b/extra/yassl/testsuite/make.bat @@ -0,0 +1,14 @@ +# quick and dirty build file for testing different MSDEVs +setlocal + +set myFLAGS= /I../include /I../taocrypt/include /I../mySTL /c /W3 /G6 /O2 /MT /D"WIN32" /D"NO_MAIN_DRIVER" + +cl %myFLAGS% testsuite.cpp +cl %myFLAGS% ../examples/client/client.cpp +cl %myFLAGS% ../examples/echoclient/echoclient.cpp +cl %myFLAGS% ../examples/server/server.cpp +cl %myFLAGS% ../examples/echoserver/echoserver.cpp +cl %myFLAGS% ../taocrypt/test/test.cpp + +link.exe /out:testsuite.exe ../src/yassl.lib ../taocrypt/src/taocrypt.lib testsuite.obj client.obj server.obj echoclient.obj echoserver.obj test.obj advapi32.lib Ws2_32.lib + |