Author: wyoung
Date: Thu Mar 2 01:51:01 2006
New Revision: 1180
URL: http://svn.gna.org/viewcvs/mysqlpp?rev=1180&view=rev
Log:
Various cleanups of the way we're handling the Bakefiles
Modified:
branches/v2.1-bakefile/common.bkl
branches/v2.1-bakefile/examples/examples.bkl
branches/v2.1-bakefile/lib/lib.bkl
Modified: branches/v2.1-bakefile/common.bkl
URL:
http://svn.gna.org/viewcvs/mysqlpp/branches/v2.1-bakefile/common.bkl?rev=1180&r1=1179&r2=1180&view=diff
==============================================================================
--- branches/v2.1-bakefile/common.bkl (original)
+++ branches/v2.1-bakefile/common.bkl Thu Mar 2 01:51:01 2006
@@ -2,6 +2,14 @@
<makefile>
<include file="presets/simple.bkl"/>
+ <set var="MYSQLLIB">@MYSQL_C_LIB@</set>
+ <set var="ZLIB">yes</set>
+
+ <set var="THREAD_TYPE">single</set>
+ <if cond="MYSQLLIB=='mysqlclient_r'">
+ <set var="THREAD_TYPE">multi</set>
+ </if>
+
<option name="BUILD">
<values>debug,release</values>
<values-description>Debug,Release</values-description>
Modified: branches/v2.1-bakefile/examples/examples.bkl
URL:
http://svn.gna.org/viewcvs/mysqlpp/branches/v2.1-bakefile/examples/examples.bkl?rev=1180&r1=1179&r2=1180&view=diff
==============================================================================
--- branches/v2.1-bakefile/examples/examples.bkl (original)
+++ branches/v2.1-bakefile/examples/examples.bkl Thu Mar 2 01:51:01 2006
@@ -1,11 +1,6 @@
<?xml version="1.0"?>
<makefile>
<include file="../common.bkl"/>
-
-
- <!-- Define variables that control make/project file generation -->
- <set var="MYSQLLIB">@MYSQL_C_LIB@</set>
- <set var="ZLIB">yes</set>
<!-- Set up standard build options for all examples -->
@@ -16,7 +11,7 @@
<debug-info>$(DEBUGINFO)</debug-info>
- <if cond="FORMAT=='msvc6prj'">
+ <if cond="FORMAT in ['msvc6prj', 'mingw']">
<define>_UNICODE</define>
<include>c:\mysql\include</include>
<lib-path>c:\mysql\lib\opt</lib-path>
@@ -33,13 +28,12 @@
</if>
</if>
- <if cond="MYSQLLIB == 'mysqlclient'">
- <threading>single</threading>
+ <if cond="FORMAT=='gnu'">
+ <include>/usr/include/mysql</include>
+ <sys-lib>mysqlclient</sys-lib>
</if>
- <if cond="MYSQLLIB == 'mysqlclient_r'">
- <threading>multi</threading>
- </if>
-
+
+ <threading>$(THREAD_TYPE)</threading>
<cxx-rtti>on</cxx-rtti>
<cxx-exceptions>on</cxx-exceptions>
</template>
@@ -54,7 +48,7 @@
<lib-path>$(BUILD)</lib-path>
</if>
- <if cond="FORMAT in ['autoconf','mingw']">
+ <if cond="FORMAT in ['autoconf', 'mingw', 'gnu']">
<lib-path>.</lib-path>
</if>
</template>
Modified: branches/v2.1-bakefile/lib/lib.bkl
URL:
http://svn.gna.org/viewcvs/mysqlpp/branches/v2.1-bakefile/lib/lib.bkl?rev=1180&r1=1179&r2=1180&view=diff
==============================================================================
--- branches/v2.1-bakefile/lib/lib.bkl (original)
+++ branches/v2.1-bakefile/lib/lib.bkl Thu Mar 2 01:51:01 2006
@@ -12,7 +12,7 @@
<debug-info>$(DEBUGINFO)</debug-info>
<include>..</include>
- <if cond="FORMAT=='msvc6prj'">
+ <if cond="FORMAT in ['msvc6prj', 'mingw']">
<define>_UNICODE</define>
<define>MYSQLPP_MAKING_DLL</define>
<include>c:\mysql\include</include>
@@ -20,6 +20,10 @@
<sys-lib>libmysql</sys-lib>
</if>
+ <threading>$(THREAD_TYPE)</threading>
+ <cxx-rtti>on</cxx-rtti>
+ <cxx-exceptions>on</cxx-exceptions>
+
<install-to>$(LIBDIR)</install-to>
</dll>
_______________________________________________
Mysqlpp-commits mailing list
[email protected]
https://mail.gna.org/listinfo/mysqlpp-commits
