Author: wyoung
Date: Mon Jan 28 22:41:46 2013
New Revision: 2717
URL: http://svn.gna.org/viewcvs/mysqlpp?rev=2717&view=rev
Log:
- Finished move of MinGW builds from .def file based linking to direct
DLL linking via -lmysql. (Previous checkin was incomplete, and would
result only in the library building, not any of the examples or the
ssqlsxlat tool.)
- Windows builds now look for Connector/C 6.0.2 files, rather than the
devel files under the MySQL 5.1 server install directory.
Modified:
trunk/mysql++.bkl
Modified: trunk/mysql++.bkl
URL:
http://svn.gna.org/viewcvs/mysqlpp/trunk/mysql%2B%2B.bkl?rev=2717&r1=2716&r2=2717&view=diff
==============================================================================
--- trunk/mysql++.bkl (original)
+++ trunk/mysql++.bkl Mon Jan 28 22:41:46 2013
@@ -25,7 +25,7 @@
</option>
<set var="MYSQL_WIN_DIR">
- C:\Program Files\MySQL\MySQL Server 5.1
+ C:\Program Files\MySQL\MySQL Connector C 6.0.2
</set>
<set var="DEBUGINFO">
@@ -121,7 +121,7 @@
<define>MYSQLPP_NO_DLL</define>
<define>HAVE_MYSQL_SSL_SET</define>
<include>"$(MYSQL_WIN_DIR)\include"</include>
- <ldflags>--enable-stdcall-fixup</ldflags>
+ <ldflags>-Wl,--enable-stdcall-fixup</ldflags>
<lib-path>"$(MYSQL_WIN_DIR)\lib\opt"</lib-path>
<sys-lib>mysql</sys-lib>
</if>
@@ -195,11 +195,11 @@
<if cond="FORMAT=='mingw'">
<define>MYSQLPP_NO_DLL</define>
<ldflags>
- -Wl,--enable-auto-import -Wl,--enable-runtime-pseudo-reloc
+ -Wl,--enable-auto-import -Wl,--enable-runtime-pseudo-reloc
-Wl,--enable-stdcall-fixup
</ldflags>
<include>"$(MYSQL_WIN_DIR)\include"</include>
<lib-path>"$(MYSQL_WIN_DIR)\lib\opt"</lib-path>
- <sys-lib>mysqlclient</sys-lib>
+ <sys-lib>mysql</sys-lib>
<sys-lib>mysqlpp$(DEBUG_SUFFIX)</sys-lib>
</if>
@@ -506,10 +506,9 @@
<!-- Copy files into package directory -->
<!-- top directory -->
<command>
- cp -RL *.bat *.txt Bakefiles.bkgen bootstrap ChangeLog \
- cleanmf config.guess config.h.in config.sub configure* \
- dtest exrun install* libmysqlclient.def Makefile.* \
- mysql++.* osver Wishlist $(PKGNAME)
+ cp -RL *.bat *.txt Bakefiles.bkgen bootstrap ChangeLog cleanmf \
+ config.guess config.h.in config.sub configure* dtest exrun \
+ install* Makefile.* mysql++.* osver Wishlist $(PKGNAME)
</command>
<!-- VC++ project file subdirs -->
_______________________________________________
Mysqlpp-commits mailing list
[email protected]
https://mail.gna.org/listinfo/mysqlpp-commits
