Minor changes to fix Windows project files

BitKeeper/deleted/.del-libmysql.def~f5dffcb3ed925d28:
  Delete: VC++Files/libmysql/libmysql.def
VC++Files/client/mysqlclient.dsp:
  Add strtod.c to get rid of linker errors
VC++Files/mysql.dsw:
  Add dependency on mysys for batch build

3 files changed, 22 insertions, 109 deletions

diff --git a/VC++Files/client/mysqlclient.dsp b/VC++Files/client/mysqlclient.dsp
index 58ec040a63d..46a4d2c89eb 100644
--- a/VC++Files/client/mysqlclient.dsp
+++ b/VC++Files/client/mysqlclient.dsp
@@ -7,25 +7,25 @@
 CFG=mysqlclient - Win32 Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
-!MESSAGE
+!MESSAGE 
 !MESSAGE NMAKE /f "mysqlclient.mak".
-!MESSAGE
+!MESSAGE 
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
+!MESSAGE 
 !MESSAGE NMAKE /f "mysqlclient.mak" CFG="mysqlclient - Win32 Debug"
-!MESSAGE
+!MESSAGE 
 !MESSAGE Possible choices for configuration are:
-!MESSAGE
+!MESSAGE 
 !MESSAGE "mysqlclient - Win32 Release" (based on "Win32 (x86) Static Library")
 !MESSAGE "mysqlclient - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE
+!MESSAGE 
 
 # Begin Project
 # PROP AllowPerConfigDependencies 0
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
-CPP=xicl6.exe
+CPP=cl.exe
 RSC=rc.exe
 
 !IF  "$(CFG)" == "mysqlclient - Win32 Release"
@@ -48,7 +48,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 /out:"..\lib_release\mysqlclient.lib"
 
@@ -72,11 +72,11 @@ 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 /out:"..\lib_debug\mysqlclient.lib"
 
-!ENDIF
+!ENDIF 
 
 # Begin Target
 
@@ -252,7 +252,7 @@ SOURCE=..\mysys\mf_iocache2.c
 
 # ADD CPP /Od
 
-!ENDIF
+!ENDIF 
 
 # End Source File
 # Begin Source File
@@ -310,6 +310,10 @@ SOURCE=..\mysys\my_error.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\mysys\my_file.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\mysys\my_fopen.c
 # End Source File
 # Begin Source File
@@ -358,10 +362,6 @@ SOURCE=..\mysys\my_open.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\mysys\my_file.c
-# End Source File
-# Begin Source File
-
 SOURCE=..\mysys\my_pread.c
 # End Source File
 # Begin Source File
@@ -490,6 +490,10 @@ SOURCE=..\strings\strnmov.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\strings\strtod.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\strings\strtoll.c
 # End Source File
 # Begin Source File
diff --git a/VC++Files/libmysql/libmysql.def b/VC++Files/libmysql/libmysql.def
deleted file mode 100755
index 726a53864f3..00000000000
--- a/VC++Files/libmysql/libmysql.def
+++ /dev/null
@@ -1,94 +0,0 @@
-LIBRARY		LIBMYSQL
-DESCRIPTION	'MySQL 3.23 Client Library'
-VERSION		2.5
-EXPORTS
-	mysql_affected_rows
-	mysql_close
-	mysql_connect
-	mysql_create_db
-	mysql_data_seek
-	mysql_debug
-	mysql_drop_db
-	mysql_dump_debug_info
-	mysql_eof
-	mysql_errno
-	mysql_error
-	mysql_escape_string
-	mysql_fetch_field
-	mysql_fetch_field_direct
-	mysql_fetch_fields
-	mysql_fetch_lengths
-	mysql_fetch_row
-	mysql_field_count
-	mysql_field_seek
-	mysql_field_tell
-	mysql_free_result
-	mysql_get_client_info
-	mysql_get_host_info
-	mysql_get_proto_info
-	mysql_get_server_info
-	mysql_info
-	mysql_init
-	mysql_insert_id
-	mysql_kill
-	mysql_list_dbs
-	mysql_list_fields
-	mysql_list_processes
-	mysql_list_tables
-	mysql_num_fields
-	mysql_num_rows
-	mysql_odbc_escape_string
-	mysql_options
-	mysql_ping
-	mysql_query
-	mysql_real_connect
-	mysql_real_query
-	mysql_refresh
-	mysql_row_seek
-	mysql_row_tell
-	mysql_select_db
-	mysql_shutdown
-	mysql_stat
-	mysql_store_result
-	mysql_thread_id
-	mysql_use_result
-	bmove_upp
-	delete_dynamic
-	_dig_vec
-	init_dynamic_array
-	insert_dynamic
-	int2str
-	is_prefix
-	list_add
-	list_delete
-	max_allowed_packet
-	my_casecmp
-	my_init
-	my_end
-	my_strdup
-	my_malloc
-	my_memdup
-	my_no_flags_free
-	my_realloc
-	my_thread_end
-	my_thread_init
-	net_buffer_length
-	set_dynamic
-	strcend
-	strdup_root
-	strfill
-	strinstr
-	strmake
-	strmov
-	strxmov
-	myodbc_remove_escape
-	mysql_thread_safe
-	mysql_character_set_name
-	mysql_change_user
-	mysql_send_query
-	mysql_read_query_result
-	mysql_real_escape_string
-	load_defaults
-	free_defaults
-
-
diff --git a/VC++Files/mysql.dsw b/VC++Files/mysql.dsw
index 4db81e31755..e0df167f58d 100644
--- a/VC++Files/mysql.dsw
+++ b/VC++Files/mysql.dsw
@@ -38,6 +38,9 @@ Package=<5>
 
 Package=<4>
 {{{
+    Begin Project Dependency
+    Project_Dep_Name mysys
+    End Project Dependency
 }}}
 
 ###############################################################################