Author: mysqlpp
Date: Wed Apr 5 01:35:31 2006
New Revision: 1278
URL: http://svn.gna.org/viewcvs/mysqlpp?rev=1278&view=rev
Log:
Fixed MinGW link issue! Two parts:
- Adjust example linking so that libmysqlpp_util is mentioned on the
link line before libmysqlpp and libmysqlclient
- Don't use declspec stuff. MinGW's linker doesn't seem entirely
happy with this -- lots of "Info" messages telling that it fixed
problems automatically -- but it at least copes.
Modified:
trunk/examples/examples.bkl
trunk/lib/lib.bkl
Modified: trunk/examples/examples.bkl
URL:
http://svn.gna.org/viewcvs/mysqlpp/trunk/examples/examples.bkl?rev=1278&r1=1277&r2=1278&view=diff
==============================================================================
--- trunk/examples/examples.bkl (original)
+++ trunk/examples/examples.bkl Wed Apr 5 01:35:31 2006
@@ -4,11 +4,14 @@
<set var="EXAMPLES">yes</set>
- <!-- Set up standard build options for all examples -->
- <template id="example">
+ <!-- Set up build options common to all examples -->
+ <template id="common">
+ <threading>$(THREAD_TYPE)</threading>
+ <cxx-rtti>on</cxx-rtti>
+ <cxx-exceptions>on</cxx-exceptions>
+ <debug-info>$(DEBUGINFO)</debug-info>
+
<include>../lib</include>
-
- <debug-info>$(DEBUGINFO)</debug-info>
<if cond="FORMAT in ['msvc6prj', 'mingw']">
<define>_UNICODE</define>
@@ -21,10 +24,10 @@
<sys-lib>libmysql</sys-lib>
</if>
<if cond="FORMAT=='mingw'">
+ <define>MYSQLPP_NO_DLL</define>
<lib-path>..\lib</lib-path>
<sys-lib>mysqlclient</sys-lib>
</if>
-
<if cond="FORMAT=='autoconf'">
<cxxflags>@PTHREAD_CFLAGS@</cxxflags>
<ldflags>@PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@</ldflags>
@@ -36,99 +39,93 @@
<sys-lib>z</sys-lib>
</if>
</if>
-
<if cond="FORMAT=='gnu'">
<include>/usr/include/mysql</include>
<include>/usr/include/mysql++</include>
<sys-lib>mysqlpp</sys-lib>
<sys-lib>mysqlclient</sys-lib>
</if>
-
- <threading>$(THREAD_TYPE)</threading>
- <cxx-rtti>on</cxx-rtti>
- <cxx-exceptions>on</cxx-exceptions>
</template>
- <!-- Extend 'example' template for the subset of examples that
- use the util module. -->
- <template id="std-example" template="example">
+ <!-- Additional options specific to examples that depend on
+ the util module. -->
+ <template id="std-example">
<depends>util</depends>
<sys-lib>mysqlpp_util</sys-lib>
<if cond="FORMAT=='msvc6prj'">
<lib-path>$(BUILD)</lib-path>
</if>
-
<if cond="FORMAT in ['autoconf', 'mingw', 'gnu']">
<lib-path>.</lib-path>
</if>
</template>
- <!-- Define output targets, if examples are enabled -->
+ <!-- Define output targets, if commons are enabled -->
<if cond="EXAMPLES=='yes'">
<!-- The "util" convenience library -->
- <lib id="util" template="example">
+ <lib id="util" template="common">
<libname>mysqlpp_util</libname>
<sources>util.cpp</sources>
</lib>
<!-- The "standard" examples, being the ones that depend on
the util library. -->
- <exe id="resetdb" template="std-example">
+ <exe id="resetdb" template="std-example,common">
<sources>resetdb.cpp</sources>
</exe>
- <exe id="simple1" template="std-example">
+ <exe id="simple1" template="std-example,common">
<sources>simple1.cpp</sources>
</exe>
- <exe id="simple2" template="std-example">
+ <exe id="simple2" template="std-example,common">
<sources>simple2.cpp</sources>
</exe>
- <exe id="simple3" template="std-example">
+ <exe id="simple3" template="std-example,common">
<sources>simple3.cpp</sources>
</exe>
- <exe id="usequery" template="std-example">
+ <exe id="usequery" template="std-example,common">
<sources>usequery.cpp</sources>
</exe>
- <exe id="multiquery" template="std-example">
+ <exe id="multiquery" template="std-example,common">
<sources>multiquery.cpp</sources>
</exe>
- <exe id="custom1" template="std-example">
+ <exe id="custom1" template="std-example,common">
<sources>custom1.cpp</sources>
</exe>
- <exe id="custom2" template="std-example">
+ <exe id="custom2" template="std-example,common">
<sources>custom2.cpp</sources>
</exe>
- <exe id="custom3" template="std-example">
+ <exe id="custom3" template="std-example,common">
<sources>custom3.cpp</sources>
</exe>
- <exe id="custom4" template="std-example">
+ <exe id="custom4" template="std-example,common">
<sources>custom4.cpp</sources>
</exe>
- <exe id="custom5" template="std-example">
+ <exe id="custom5" template="std-example,common">
<sources>custom5.cpp</sources>
</exe>
- <exe id="custom6" template="std-example">
+ <exe id="custom6" template="std-example,common">
<sources>custom6.cpp</sources>
</exe>
- <exe id="dbinfo" template="std-example">
+ <exe id="dbinfo" template="std-example,common">
<sources>dbinfo.cpp</sources>
</exe>
- <exe id="fieldinf1" template="std-example">
+ <exe id="fieldinf1" template="std-example,common">
<sources>fieldinf1.cpp</sources>
</exe>
- <exe id="xaction" template="std-example">
+ <exe id="xaction" template="std-example,common">
<sources>xaction.cpp</sources>
</exe>
<!-- The "nonstandard" examples -->
- <exe id="cgi_image" template="example">
+ <exe id="cgi_image" template="common">
<sources>cgi_image.cpp</sources>
</exe>
- <exe id="load_file" template="example">
+ <exe id="load_file" template="common">
<sources>load_file.cpp</sources>
</exe>
- <exe id="updel" template="example">
+ <exe id="updel" template="common">
<sources>updel.cpp</sources>
</exe>
</if>
Modified: trunk/lib/lib.bkl
URL:
http://svn.gna.org/viewcvs/mysqlpp/trunk/lib/lib.bkl?rev=1278&r1=1277&r2=1278&view=diff
==============================================================================
--- trunk/lib/lib.bkl (original)
+++ trunk/lib/lib.bkl Wed Apr 5 01:35:31 2006
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<makefile>
- <requires version="0.2.0"/> <!-- for fileList() -->
+ <requires version="0.1.9"/>
<include file="../common.bkl"/>
<using module="datafiles"/>
@@ -18,14 +18,15 @@
<if cond="FORMAT in ['msvc6prj', 'mingw']">
<define>_UNICODE</define>
- <define>MYSQLPP_MAKING_DLL</define>
<include>c:\mysql\include</include>
<lib-path>c:\mysql\lib\opt</lib-path>
</if>
<if cond="FORMAT=='msvc6prj'">
+ <define>MYSQLPP_MAKING_DLL</define>
<sys-lib>libmysql</sys-lib>
</if>
<if cond="FORMAT=='mingw'">
+ <define>MYSQLPP_NO_DLL</define>
<sys-lib>mysqlclient</sys-lib>
</if>
_______________________________________________
Mysqlpp-commits mailing list
[email protected]
https://mail.gna.org/listinfo/mysqlpp-commits
