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 | trunk
Files: files | file ages | folders
SHA3-256:0cf989112eefdbaa4403f5e7183e6ec5e1ea84683ddd9d39421a9461de1a2e12
User & Date: tangent 2018-10-31 18:26:01
Context
2018-10-31
18:26
Assorted fixes to mysql++.bkl for MinGW. Leaf 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 Unified Diffs Ignore Whitespace Patch

Changes to mysql++.bkl.

166
167
168
169
170
171
172
173
174
175
176
177
178

179
180
181
182
183
184
185
...
201
202
203
204
205
206
207

208
209

210
211
212
213
214
215
216
...
231
232
233
234
235
236
237
238


239




240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
...
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303

    <threading>$(THREAD_TYPE)</threading>
    <cxx-rtti>on</cxx-rtti>
    <cxx-exceptions>on</cxx-exceptions>
    <debug-info>$(DEBUGINFO)</debug-info>
    <optimize>$(OPTIMIZE_FLAG)</optimize>

    <if cond="FORMAT in ['autoconf', 'gnu', 'mingw', 'xcode2']">
      <include>lib</include>
        <include>@MYSQL_C_INC_DIR@</include>
        <lib-path>@MYSQL_C_LIB_DIR@</lib-path>
      <lib-path>.</lib-path>
    </if>

    <if cond="FORMAT in ['msvs2003prj', 'msvs2005prj', 'msvs2008prj']">
      <include>../lib</include>
    </if>

    <if cond="FORMAT=='xcode2'">
      <define>HAVE_POSIX_GETOPT</define>
      <define>MYSQLPP_XCODE</define>
................................................................................
    </if>

    <if cond="FORMAT=='mingw'">
      <define>MYSQLPP_NO_DLL</define>
      <ldflags>
        -Wl,--enable-auto-import -Wl,--enable-runtime-pseudo-reloc -Wl,--enable-stdcall-fixup
      </ldflags>

      <include>"$(MYSQL_WIN_DIR)\include"</include>
      <lib-path>"$(MYSQL_WIN_DIR)\lib"</lib-path>

      <sys-lib>mysql</sys-lib>
      <sys-lib>mysqlpp$(DEBUG_SUFFIX)</sys-lib>
    </if>

    <if cond="FORMAT in ['msvs2003prj', 'msvs2005prj', 'msvs2008prj']">
      <lib-path>$(BUILD)</lib-path>
      <include>$(MYSQL_WIN_DIR)\include</include>
................................................................................
      <sys-lib>mysqlclient</sys-lib>
      <sys-lib>mysqlpp$(DEBUG_SUFFIX)</sys-lib>
    </if>
  </template>

  <if cond="BUILDLIBRARY=='yes'">
    <!-- SSQLS v2 parser convenience library -->
    <lib id="ssqls2parse" template="programs">


      <depends>mysqlpp</depends>




      <libname>mysqlpp_ssqls2parse</libname>
      <sources>ssx/parsev2.cpp</sources>
      <include>.</include>
    </lib>

    <!-- Build rules for ssqlsxlat tool -->
    <exe id="ssqlsxlat" template="programs">
      <sources>ssx/genv2.cpp</sources>
      <sources>ssx/main.cpp</sources>
      <depends>ssqls2parse</depends>
      <sys-lib>mysqlpp_ssqls2parse</sys-lib>
    </exe>
  </if>

  <!-- Define library testing programs' output targets, if enabled -->
  <if cond="BUILDTEST=='yes'">
    <exe id="test_array_index" template="programs">
      <sources>test/array_index.cpp</sources>
................................................................................
    <exe id="test_qstream" template="programs">
      <sources>test/qstream.cpp</sources>
    </exe>
    <exe id="test_sqlstream" template="programs">
      <sources>test/sqlstream.cpp</sources>
    </exe>
    <if cond="BUILDLIBRARY=='yes'">
      <exe id="test_ssqls2" template="programs">
        <sources>test/ssqls2.cpp</sources>
        <depends>ssqls2parse</depends>
        <sys-lib>mysqlpp_ssqls2parse</sys-lib>
      </exe>
    </if>
    <if cond="FORMAT!='msvs2003prj'">
      <!-- VC++ 2003 can't compile this -->







|

|
|


>







 







>


>







 







|
>
>

>
>
>
>






|


<
<







 







|







166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
...
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
...
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257


258
259
260
261
262
263
264
...
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310

    <threading>$(THREAD_TYPE)</threading>
    <cxx-rtti>on</cxx-rtti>
    <cxx-exceptions>on</cxx-exceptions>
    <debug-info>$(DEBUGINFO)</debug-info>
    <optimize>$(OPTIMIZE_FLAG)</optimize>

    <if cond="FORMAT in ['autoconf', 'gnu', 'xcode2']">
      <include>lib</include>
      <include>@MYSQL_C_INC_DIR@</include>
      <lib-path>@MYSQL_C_LIB_DIR@</lib-path>
      <lib-path>.</lib-path>
    </if>

    <if cond="FORMAT in ['msvs2003prj', 'msvs2005prj', 'msvs2008prj']">
      <include>../lib</include>
    </if>

    <if cond="FORMAT=='xcode2'">
      <define>HAVE_POSIX_GETOPT</define>
      <define>MYSQLPP_XCODE</define>
................................................................................
    </if>

    <if cond="FORMAT=='mingw'">
      <define>MYSQLPP_NO_DLL</define>
      <ldflags>
        -Wl,--enable-auto-import -Wl,--enable-runtime-pseudo-reloc -Wl,--enable-stdcall-fixup
      </ldflags>
      <include>lib</include>
      <include>"$(MYSQL_WIN_DIR)\include"</include>
      <lib-path>"$(MYSQL_WIN_DIR)\lib"</lib-path>
      <lib-path>.</lib-path>
      <sys-lib>mysql</sys-lib>
      <sys-lib>mysqlpp$(DEBUG_SUFFIX)</sys-lib>
    </if>

    <if cond="FORMAT in ['msvs2003prj', 'msvs2005prj', 'msvs2008prj']">
      <lib-path>$(BUILD)</lib-path>
      <include>$(MYSQL_WIN_DIR)\include</include>
................................................................................
      <sys-lib>mysqlclient</sys-lib>
      <sys-lib>mysqlpp$(DEBUG_SUFFIX)</sys-lib>
    </if>
  </template>

  <if cond="BUILDLIBRARY=='yes'">
    <!-- SSQLS v2 parser convenience library -->
    <template id="ssqlsv2">
      <depends>ssqls2parse</depends>
      <sys-lib>mysqlpp_ssqls2parse</sys-lib>
      <depends>mysqlpp</depends>
      <sys-lib>mysqlpp</sys-lib>
    </template>

    <lib id="ssqls2parse" template="programs,ssqlsv2">
      <libname>mysqlpp_ssqls2parse</libname>
      <sources>ssx/parsev2.cpp</sources>
      <include>.</include>
    </lib>

    <!-- Build rules for ssqlsxlat tool -->
    <exe id="ssqlsxlat" template="programs,ssqlsv2">
      <sources>ssx/genv2.cpp</sources>
      <sources>ssx/main.cpp</sources>


    </exe>
  </if>

  <!-- Define library testing programs' output targets, if enabled -->
  <if cond="BUILDTEST=='yes'">
    <exe id="test_array_index" template="programs">
      <sources>test/array_index.cpp</sources>
................................................................................
    <exe id="test_qstream" template="programs">
      <sources>test/qstream.cpp</sources>
    </exe>
    <exe id="test_sqlstream" template="programs">
      <sources>test/sqlstream.cpp</sources>
    </exe>
    <if cond="BUILDLIBRARY=='yes'">
      <exe id="test_ssqls2" template="programs,ssqlsv2">
        <sources>test/ssqls2.cpp</sources>
        <depends>ssqls2parse</depends>
        <sys-lib>mysqlpp_ssqls2parse</sys-lib>
      </exe>
    </if>
    <if cond="FORMAT!='msvs2003prj'">
      <!-- VC++ 2003 can't compile this -->