MySQL++

Check-in [0cf989112e]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Assorted fixes to mysql++.bkl for MinGW.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 0cf989112eefdbaa4403f5e7183e6ec5e1ea84683ddd9d39421a9461de1a2e12
User & Date: tangent 2018-10-31 18:26:01
Context
2019-02-15
23:50
Added support for ulonglong type in MySQL type conversions when building query strings. Reportedly, some compilers can't figure out that mysqlpp::sql_bigint is equivalent, even though it's a typedef for [u]longlong! check-in: 6afcf0be30 user: tangent tags: trunk
2018-10-31
18:26
Assorted fixes to mysql++.bkl for MinGW. check-in: 0cf989112e user: tangent tags: trunk
2018-10-22
23:55
Removed explicit library dependency on "mysqlpp" for test_ssqls2 and ssqlsxlat: we get that from the Bakefile "programs" template we defined. Not only is it redundant, the second declaration breaks under VC++ due to the "_d" suffix in debug builds, which the program template handles for us, but our per-program dependency did not. check-in: 5719c93687 user: tangent tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to mysql++.bkl.

   166    166   
   167    167       <threading>$(THREAD_TYPE)</threading>
   168    168       <cxx-rtti>on</cxx-rtti>
   169    169       <cxx-exceptions>on</cxx-exceptions>
   170    170       <debug-info>$(DEBUGINFO)</debug-info>
   171    171       <optimize>$(OPTIMIZE_FLAG)</optimize>
   172    172   
   173         -    <if cond="FORMAT in ['autoconf', 'gnu', 'mingw', 'xcode2']">
          173  +    <if cond="FORMAT in ['autoconf', 'gnu', 'xcode2']">
   174    174         <include>lib</include>
   175         -        <include>@MYSQL_C_INC_DIR@</include>
   176         -        <lib-path>@MYSQL_C_LIB_DIR@</lib-path>
          175  +      <include>@MYSQL_C_INC_DIR@</include>
          176  +      <lib-path>@MYSQL_C_LIB_DIR@</lib-path>
   177    177         <lib-path>.</lib-path>
   178    178       </if>
          179  +
   179    180       <if cond="FORMAT in ['msvs2003prj', 'msvs2005prj', 'msvs2008prj']">
   180    181         <include>../lib</include>
   181    182       </if>
   182    183   
   183    184       <if cond="FORMAT=='xcode2'">
   184    185         <define>HAVE_POSIX_GETOPT</define>
   185    186         <define>MYSQLPP_XCODE</define>
................................................................................
   201    202       </if>
   202    203   
   203    204       <if cond="FORMAT=='mingw'">
   204    205         <define>MYSQLPP_NO_DLL</define>
   205    206         <ldflags>
   206    207           -Wl,--enable-auto-import -Wl,--enable-runtime-pseudo-reloc -Wl,--enable-stdcall-fixup
   207    208         </ldflags>
          209  +      <include>lib</include>
   208    210         <include>"$(MYSQL_WIN_DIR)\include"</include>
   209    211         <lib-path>"$(MYSQL_WIN_DIR)\lib"</lib-path>
          212  +      <lib-path>.</lib-path>
   210    213         <sys-lib>mysql</sys-lib>
   211    214         <sys-lib>mysqlpp$(DEBUG_SUFFIX)</sys-lib>
   212    215       </if>
   213    216   
   214    217       <if cond="FORMAT in ['msvs2003prj', 'msvs2005prj', 'msvs2008prj']">
   215    218         <lib-path>$(BUILD)</lib-path>
   216    219         <include>$(MYSQL_WIN_DIR)\include</include>
................................................................................
   231    234         <sys-lib>mysqlclient</sys-lib>
   232    235         <sys-lib>mysqlpp$(DEBUG_SUFFIX)</sys-lib>
   233    236       </if>
   234    237     </template>
   235    238   
   236    239     <if cond="BUILDLIBRARY=='yes'">
   237    240       <!-- SSQLS v2 parser convenience library -->
   238         -    <lib id="ssqls2parse" template="programs">
          241  +    <template id="ssqlsv2">
          242  +      <depends>ssqls2parse</depends>
          243  +      <sys-lib>mysqlpp_ssqls2parse</sys-lib>
   239    244         <depends>mysqlpp</depends>
          245  +      <sys-lib>mysqlpp</sys-lib>
          246  +    </template>
          247  +
          248  +    <lib id="ssqls2parse" template="programs,ssqlsv2">
   240    249         <libname>mysqlpp_ssqls2parse</libname>
   241    250         <sources>ssx/parsev2.cpp</sources>
   242    251         <include>.</include>
   243    252       </lib>
   244    253   
   245    254       <!-- Build rules for ssqlsxlat tool -->
   246         -    <exe id="ssqlsxlat" template="programs">
          255  +    <exe id="ssqlsxlat" template="programs,ssqlsv2">
   247    256         <sources>ssx/genv2.cpp</sources>
   248    257         <sources>ssx/main.cpp</sources>
   249         -      <depends>ssqls2parse</depends>
   250         -      <sys-lib>mysqlpp_ssqls2parse</sys-lib>
   251    258       </exe>
   252    259     </if>
   253    260   
   254    261     <!-- Define library testing programs' output targets, if enabled -->
   255    262     <if cond="BUILDTEST=='yes'">
   256    263       <exe id="test_array_index" template="programs">
   257    264         <sources>test/array_index.cpp</sources>
................................................................................
   289    296       <exe id="test_qstream" template="programs">
   290    297         <sources>test/qstream.cpp</sources>
   291    298       </exe>
   292    299       <exe id="test_sqlstream" template="programs">
   293    300         <sources>test/sqlstream.cpp</sources>
   294    301       </exe>
   295    302       <if cond="BUILDLIBRARY=='yes'">
   296         -      <exe id="test_ssqls2" template="programs">
          303  +      <exe id="test_ssqls2" template="programs,ssqlsv2">
   297    304           <sources>test/ssqls2.cpp</sources>
   298    305           <depends>ssqls2parse</depends>
   299    306           <sys-lib>mysqlpp_ssqls2parse</sys-lib>
   300    307         </exe>
   301    308       </if>
   302    309       <if cond="FORMAT!='msvs2003prj'">
   303    310         <!-- VC++ 2003 can't compile this -->