Author: wyoung
Date: Mon Mar 6 18:53:50 2006
New Revision: 1230
URL: http://svn.gna.org/viewcvs/mysqlpp?rev=1230&view=rev
Log:
Fixed several places where VC++ and MinGW build were sharing Bakefile
options that didn't actually apply to both tool chains.
Modified:
branches/v2.1-bakefile/examples/examples.bkl
branches/v2.1-bakefile/lib/lib.bkl
Modified: branches/v2.1-bakefile/examples/examples.bkl
URL:
http://svn.gna.org/viewcvs/mysqlpp/branches/v2.1-bakefile/examples/examples.bkl?rev=1230&r1=1229&r2=1230&view=diff
==============================================================================
--- branches/v2.1-bakefile/examples/examples.bkl (original)
+++ branches/v2.1-bakefile/examples/examples.bkl Mon Mar 6 18:53:50 2006
@@ -14,9 +14,15 @@
<define>_UNICODE</define>
<include>c:\mysql\include</include>
<lib-path>c:\mysql\lib\opt</lib-path>
+ <sys-lib>mysqlpp</sys-lib>
+ </if>
+ <if cond="FORMAT=='msvc6prj'">
<lib-path>..\lib\$(BUILD)</lib-path>
- <sys-lib>mysqlpp</sys-lib>
<sys-lib>libmysql</sys-lib>
+ </if>
+ <if cond="FORMAT=='mingw'">
+ <lib-path>..\lib</lib-path>
+ <sys-lib>mysqlclient</sys-lib>
</if>
<if cond="FORMAT=='autoconf'">
Modified: branches/v2.1-bakefile/lib/lib.bkl
URL:
http://svn.gna.org/viewcvs/mysqlpp/branches/v2.1-bakefile/lib/lib.bkl?rev=1230&r1=1229&r2=1230&view=diff
==============================================================================
--- branches/v2.1-bakefile/lib/lib.bkl (original)
+++ branches/v2.1-bakefile/lib/lib.bkl Mon Mar 6 18:53:50 2006
@@ -23,7 +23,12 @@
<define>MYSQLPP_MAKING_DLL</define>
<include>c:\mysql\include</include>
<lib-path>c:\mysql\lib\opt</lib-path>
+ </if>
+ <if cond="FORMAT=='msvc6prj'">
<sys-lib>libmysql</sys-lib>
+ </if>
+ <if cond="FORMAT=='mingw'">
+ <sys-lib>mysqlclient</sys-lib>
</if>
<threading>$(THREAD_TYPE)</threading>
_______________________________________________
Mysqlpp-commits mailing list
[email protected]
https://mail.gna.org/listinfo/mysqlpp-commits
