Author: wyoung
Date: Fri Dec 14 22:02:24 2007
New Revision: 2002
URL: http://svn.gna.org/viewcvs/mysqlpp?rev=2002&view=rev
Log:
Defining both UNICODE and _UNICODE for both VC++ and MinGW. Definitely
necessary for VC++2008, and it's possible this could be needed for MinGW
if you use it with a recent Platform SDK.
Modified:
trunk/mysql++.bkl
Modified: trunk/mysql++.bkl
URL:
http://svn.gna.org/viewcvs/mysqlpp/trunk/mysql%2B%2B.bkl?rev=2002&r1=2001&r2=2002&view=diff
==============================================================================
--- trunk/mysql++.bkl (original)
+++ trunk/mysql++.bkl Fri Dec 14 22:02:24 2007
@@ -80,8 +80,12 @@
<install-to>$(LIBDIR)</install-to>
+ <if cond="FORMAT in ['msvs2003prj', 'mingw']">
+ <define>UNICODE</define>
+ <define>_UNICODE</define>
+ </if>
+
<if cond="FORMAT=='msvs2003prj'">
- <define>_UNICODE</define>
<define>MYSQLPP_MAKING_DLL</define>
<define>HAVE_MYSQL_SSL_SET</define>
<include>$(MYSQL_WIN_DIR)\include</include>
@@ -91,7 +95,6 @@
</if>
<if cond="FORMAT=='mingw'">
- <define>_UNICODE</define>
<define>MYSQLPP_NO_DLL</define>
<define>HAVE_MYSQL_SSL_SET</define>
<include>"$(MYSQL_WIN_DIR)\include"</include>
@@ -147,8 +150,12 @@
<lib-path>.</lib-path>
</if>
+ <if cond="FORMAT in ['msvs2003prj', 'mingw']">
+ <define>UNICODE</define>
+ <define>_UNICODE</define>
+ </if>
+
<if cond="FORMAT=='msvs2003prj'">
- <define>_UNICODE</define>
<lib-path>$(BUILD)</lib-path>
<include>$(MYSQL_WIN_DIR)\include</include>
<lib-path>$(MYSQL_WIN_DIR)\lib\opt</lib-path>
@@ -157,7 +164,6 @@
</if>
<if cond="FORMAT=='mingw'">
- <define>_UNICODE</define>
<define>MYSQLPP_NO_DLL</define>
<ldflags>
-Wl,--enable-auto-import
-Wl,--enable-runtime-pseudo-reloc
_______________________________________________
Mysqlpp-commits mailing list
[email protected]
https://mail.gna.org/listinfo/mysqlpp-commits
