Author: mysqlpp
Date: Mon Jan 28 20:47:15 2013
New Revision: 2714
URL: http://svn.gna.org/viewcvs/mysqlpp?rev=2714&view=rev
Log:
Reworked the way we're linking to the MySQL C API DLL on MinGW, now that
the linker will link directly to DLLs, without needing an import
library.
Removed:
trunk/libmysqlclient.def
Modified:
trunk/README-MinGW.txt
trunk/mysql++.bkl
Modified: trunk/README-MinGW.txt
URL:
http://svn.gna.org/viewcvs/mysqlpp/trunk/README-MinGW.txt?rev=2714&r1=2713&r2=2714&view=diff
==============================================================================
--- trunk/README-MinGW.txt (original)
+++ trunk/README-MinGW.txt Mon Jan 28 20:47:15 2013
@@ -32,17 +32,6 @@
that is:
bakefile_gen -f mingw
-
-
-Prerequisite: MySQL C API DLL Import Library
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- Before you can build MySQL++ with MinGW, you will need to create
- a MinGW-compatible import library for MySQL's C API library.
- Using the current default install path for MySQL and assuming
- MySQL++ is in c:\mysql++, the commands to do this are:
-
- cd C:\Program Files\MySQL\MySQL Server 5.0\lib\opt
- dlltool -k -d c:\mysql++\libmysqlclient.def -l libmysqlclient.a
Building the Library and Example Programs
@@ -131,12 +120,7 @@
4. Modify Makefile.mingw to match the install location for
the MySQL C API files.
- 5. Create libmysqlclient.a as described above, except with
- minor differences for running under Wine:
-
- $ wine mingw32-dlltool -k -d /native/path/libmysqlclient.def...
-
- 6. Build MySQL++ with:
+ 5. Build MySQL++ with:
$ wine mingw32-make -f Makefile.mingw
Removed: trunk/libmysqlclient.def
URL:
http://svn.gna.org/viewcvs/mysqlpp/trunk/libmysqlclient.def?rev=2713&view=auto
==============================================================================
--- trunk/libmysqlclient.def (original)
+++ trunk/libmysqlclient.def (removed)
@@ -1,148 +1,0 @@
-LIBRARY LIBMYSQL.dll
-EXPORTS
-_dig_vec_lower DATA
-_dig_vec_upper DATA
-bmove_upp
-client_errors DATA
-delete_dynamic
-free_defaults
-get_defaults_files
-getopt_compare_strings
-getopt_ull_limit_value
-handle_options
-init_dynamic_array
-insert_dynamic
-int2str
-is_prefix
-list_add
-list_delete
-load_defaults
-my_end
-my_getopt_print_errors DATA
-my_init
-my_malloc
-my_memdup
-my_no_flags_free
-my_path
-my_print_help
-my_print_variables
-my_realloc
-my_strdup
-myodbc_remove_escape
-mysql_affected_rows@4
-mysql_autocommit
-mysql_change_user
-mysql_character_set_name
-mysql_close@4
-mysql_commit
-mysql_data_seek@12
-mysql_debug
-mysql_disable_reads_from_master
-mysql_disable_rpl_parse
-mysql_dump_debug_info
-mysql_embedded
-mysql_enable_reads_from_master
-mysql_enable_rpl_parse
-mysql_eof
-mysql_errno@4
-mysql_error@4
-mysql_escape_string@12
-mysql_fetch_field@4
-mysql_fetch_field_direct@8
-mysql_fetch_fields
-mysql_fetch_lengths@4
-mysql_fetch_row@4
-mysql_field_count@4
-mysql_field_seek@8
-mysql_field_tell
-mysql_free_result@4
-mysql_get_client_info@0
-mysql_get_client_version
-mysql_get_host_info@4
-mysql_get_parameters
-mysql_get_proto_info@4
-mysql_get_server_info@4
-mysql_get_server_version
-mysql_hex_string
-mysql_info@4
-mysql_init@4
-mysql_insert_id@4
-mysql_kill@8
-mysql_list_dbs
-mysql_list_fields
-mysql_list_processes
-mysql_list_tables
-mysql_master_query
-mysql_more_results@4
-mysql_next_result@4
-mysql_num_fields@4
-mysql_num_rows@4
-mysql_odbc_escape_string
-mysql_options@12
-mysql_ping@4
-mysql_query@8
-mysql_read_query_result
-mysql_real_connect@32
-mysql_real_escape_string@16
-mysql_real_query@12
-mysql_refresh@8
-mysql_rollback
-mysql_row_seek
-mysql_row_tell
-mysql_rpl_parse_enabled
-mysql_rpl_probe
-mysql_rpl_query_type
-mysql_select_db@8
-mysql_send_query
-mysql_set_character_set
-mysql_set_local_infile_default
-mysql_set_local_infile_handler
-mysql_set_server_option@8
-mysql_shutdown@8
-mysql_slave_query
-mysql_sqlstate
-mysql_ssl_set@24
-mysql_stat@4
-mysql_stmt_affected_rows
-mysql_stmt_attr_get
-mysql_stmt_attr_set
-mysql_stmt_bind_param
-mysql_stmt_bind_result
-mysql_stmt_close
-mysql_stmt_data_seek
-mysql_stmt_errno
-mysql_stmt_error
-mysql_stmt_execute
-mysql_stmt_fetch
-mysql_stmt_fetch_column
-mysql_stmt_field_count
-mysql_stmt_free_result
-mysql_stmt_init
-mysql_stmt_insert_id
-mysql_stmt_num_rows
-mysql_stmt_param_count
-mysql_stmt_param_metadata
-mysql_stmt_prepare
-mysql_stmt_reset
-mysql_stmt_result_metadata
-mysql_stmt_row_seek
-mysql_stmt_row_tell
-mysql_stmt_send_long_data
-mysql_stmt_sqlstate
-mysql_stmt_store_result
-mysql_store_result@4
-mysql_thread_end@0
-mysql_thread_id@4
-mysql_thread_init@0
-mysql_thread_safe@0
-mysql_use_result@4
-mysql_warning_count
-set_dynamic
-strcend
-strcont
-strdup_root
-strfill
-strinstr
-strmake
-strmov
-strxmov
Modified: trunk/mysql++.bkl
URL:
http://svn.gna.org/viewcvs/mysqlpp/trunk/mysql%2B%2B.bkl?rev=2714&r1=2713&r2=2714&view=diff
==============================================================================
--- trunk/mysql++.bkl (original)
+++ trunk/mysql++.bkl Mon Jan 28 20:47:15 2013
@@ -121,8 +121,9 @@
<define>MYSQLPP_NO_DLL</define>
<define>HAVE_MYSQL_SSL_SET</define>
<include>"$(MYSQL_WIN_DIR)\include"</include>
+ <ldflags>--enable-stdcall-fixup</ldflags>
<lib-path>"$(MYSQL_WIN_DIR)\lib\opt"</lib-path>
- <sys-lib>mysqlclient</sys-lib>
+ <sys-lib>mysql</sys-lib>
</if>
<if cond="FORMAT=='autoconf'">
_______________________________________________
Mysqlpp-commits mailing list
[email protected]
https://mail.gna.org/listinfo/mysqlpp-commits
