Author: wyoung
Date: Tue May 18 03:16:37 2010
New Revision: 2637
URL: http://svn.gna.org/viewcvs/mysqlpp?rev=2637&view=rev
Log:
Blind Xcode build fixes. (Doesn't break EL5; will test on OS X later.)
Modified:
trunk/Wishlist
trunk/lib/common.h
trunk/mysql++.bkl
Modified: trunk/Wishlist
URL:
http://svn.gna.org/viewcvs/mysqlpp/trunk/Wishlist?rev=2637&r1=2636&r2=2637&view=diff
==============================================================================
--- trunk/Wishlist (original)
+++ trunk/Wishlist Tue May 18 03:16:37 2010
@@ -21,11 +21,6 @@
Would be nice to get MYSQL_WIN_DIR support, and to make it
link against the built MySQL++ instead of requiring it to be
installed first.
-
- o Add -lmysqlclient for Xcode case
-
- o Xcode project needs to ignore config.h when not doing an autotools
- build. Put conditions in lib/common.h.
o Result::field_num() should be case-insensitive; column names
aren't case-sensitive in SQL. MySQL++ is currently trying to
Modified: trunk/lib/common.h
URL:
http://svn.gna.org/viewcvs/mysqlpp/trunk/lib/common.h?rev=2637&r1=2636&r2=2637&view=diff
==============================================================================
--- trunk/lib/common.h (original)
+++ trunk/lib/common.h Tue May 18 03:16:37 2010
@@ -109,11 +109,12 @@
// We need to use the DOS/Windows path separator here
#define MYSQLPP_PATH_SEPARATOR '\\'
#else
- // If not Windows, we assume some sort of Unixy build environment,
- // where autotools is used. (This includes Cygwin!) #include the
- // config.h file only if this file was included from a non-header
- // file, because headers must not be dependent on config.h.
-# if defined(MYSQLPP_NOT_HEADER)
+ // If not VC++, MinGW, or Xcode, we assume we're on a system using
+ // autoconf, so bring in the config.h file it wrote containing the
+ // config test results. Only do this during the library build, and
+ // even then, not if included from a MySQL++ header file, since
+ // config.h cannot be safely installed with the other headers.
+# if defined(MYSQLPP_NOT_HEADER) && !defined(MYSQLPP_XCODE)
# include "config.h"
# endif
Modified: trunk/mysql++.bkl
URL:
http://svn.gna.org/viewcvs/mysqlpp/trunk/mysql%2B%2B.bkl?rev=2637&r1=2636&r2=2637&view=diff
==============================================================================
--- trunk/mysql++.bkl (original)
+++ trunk/mysql++.bkl Tue May 18 03:16:37 2010
@@ -153,6 +153,11 @@
<include>../lib</include>
</if>
+ <if cond="FORMAT=='xcode2'">
+ <cxxflags>-DMYSQLPP_XCODE</cxxflags>
+ <ldflags>-...@mysql_c_lib_name@</ldflags>
+ </if>
+
<if cond="PLATFORM_WINDOWS_NATIVE=='yes'">
<define>UNICODE</define>
<define>_UNICODE</define>
_______________________________________________
Mysqlpp-commits mailing list
[email protected]
https://mail.gna.org/listinfo/mysqlpp-commits
