OSDN -- Open-Source-Software-Entwicklung und Downloads
Übersetzungsstatus von Deutsch translation status for de
  • R/O
  • HTTP
  • SSH
  • HTTPS
Fork

Commit

Tags
Keine Tags

Frequently used words (click to add to your profile)

javaandroidc++linuxc#windowsobjective-ccocoaqtpython誰得phprubygameguibathyscaphec計画中(planning stage)翻訳omegatframeworktwitterdomtestvb.netdirectxゲームエンジンbtronarduinopreviewer

Commit MetaInfo

Revision5fa661873f5685b6476c754f40b1c022afb81c3f (tree)
Zeit2023-02-04 10:47:50
AutorFs <Fsu0413@vip....>
CommiterFs

Log Message

mariadb dll path mariadb step 6

Ändern Zusammenfassung

Diff

--- a/Compile/lib/mariadbCompile/conf.lua
+++ b/Compile/lib/mariadbCompile/conf.lua
@@ -42,7 +42,7 @@ conf.m3_1wx3v5 = {
4242 mariadbVersion = "3.1.19",
4343 host = "Win8",
4444 toolchain = "MSVC2015-32",
45- -- libPath = { "bin\\libssl-1_1.dll", "bin\\libcrypto-1_1.dll" },
45+ libPath = { "lib\\mariadb\\libmariadb.dll" },
4646 configureParameter = [[
4747 -GNinja
4848 -DCMAKE_INSTALL_PREFIX=&INSTALLROOT&
@@ -65,7 +65,7 @@ conf.m3_1wx6v5 = {
6565 mariadbVersion = "3.1.19",
6666 host = "Win8",
6767 toolchain = "MSVC2015-64",
68- -- libPath = { "bin\\libssl-1_1-x64.dll", "bin\\libcrypto-1_1-x64.dll" },
68+ libPath = { "lib\\mariadb\\libmariadb.dll" },
6969 configureParameter = [[
7070 -GNinja
7171 -DCMAKE_INSTALL_PREFIX=&INSTALLROOT&
@@ -88,7 +88,7 @@ conf.m3_1wx3v7 = {
8888 mariadbVersion = "3.1.19",
8989 host = "Win10",
9090 toolchain = "MSVC2017-32",
91- -- libPath = { "bin\\libssl-1_1.dll", "bin\\libcrypto-1_1.dll" },
91+ libPath = { "lib\\mariadb\\libmariadb.dll" },
9292 configureParameter = [[
9393 -GNinja
9494 -DCMAKE_INSTALL_PREFIX=&INSTALLROOT&
@@ -111,7 +111,7 @@ conf.m3_1wx6v7 = {
111111 mariadbVersion = "3.1.19",
112112 host = "Win10",
113113 toolchain = "MSVC2017-64",
114- -- libPath = { "bin\\libssl-1_1-x64.dll", "bin\\libcrypto-1_1-x64.dll" },
114+ libPath = { "lib\\mariadb\\libmariadb.dll" },
115115 configureParameter = [[
116116 -GNinja
117117 -DCMAKE_INSTALL_PREFIX=&INSTALLROOT&
@@ -134,7 +134,7 @@ conf.m3_1wx3v9 = {
134134 mariadbVersion = "3.1.19",
135135 host = "Win10",
136136 toolchain = "MSVC2019-32",
137- -- libPath = { "bin\\libssl-1_1.dll", "bin\\libcrypto-1_1.dll" },
137+ libPath = { "lib\\mariadb\\libmariadb.dll" },
138138 configureParameter = [[
139139 -GNinja
140140 -DCMAKE_INSTALL_PREFIX=&INSTALLROOT&
@@ -157,7 +157,7 @@ conf.m3_1wx6v9 = {
157157 mariadbVersion = "3.1.19",
158158 host = "Win10",
159159 toolchain = "MSVC2019-64",
160- -- libPath = { "bin\\libssl-1_1-x64.dll", "bin\\libcrypto-1_1-x64.dll" },
160+ libPath = { "lib\\mariadb\\libmariadb.dll" },
161161 configureParameter = [[
162162 -GNinja
163163 -DCMAKE_INSTALL_PREFIX=&INSTALLROOT&
@@ -180,7 +180,7 @@ conf.m3_1wx6v2 = {
180180 mariadbVersion = "3.1.19",
181181 host = "Win10",
182182 toolchain = "MSVC2022-64",
183- -- libPath = { "bin\\libssl-1_1-x64.dll", "bin\\libcrypto-1_1-x64.dll" },
183+ libPath = { "lib\\mariadb\\libmariadb.dll" },
184184 configureParameter = [[
185185 -GNinja
186186 -DCMAKE_INSTALL_PREFIX=&INSTALLROOT&
@@ -200,13 +200,13 @@ conf.m3_1wx6v2 = {
200200
201201 --------------------------------------------------------------------
202202
203+-- build failed due to conflicting function definition???
203204 conf.m3_1wx3g8 = {
204205 name = "mariadb_connector_c3.1.19-Windows-x86-MinGW-GCC&TARGETTOOLVERSION&",
205206 mariadbVersion = "3.1.19",
206207 host = "Win10",
207208 toolchain = "MinGW810-32",
208- -- libPath = { "bin\\libssl-1_1.dll", "bin\\libcrypto-1_1.dll" },
209- -- staticlibPath = { "lib\\libssl.a", "lib\\libcrypto.a" },
209+ libPath = { "lib\\mariadb\\libmariadb.dll" },
210210 configureParameter = [[
211211 -GNinja
212212 -DCMAKE_INSTALL_PREFIX=&INSTALLROOT&
@@ -229,8 +229,7 @@ conf.m3_1wx6g8 = {
229229 mariadbVersion = "3.1.19",
230230 host = "Win10",
231231 toolchain = "MinGW810-64",
232- -- libPath = { "bin\\libssl-1_1.dll", "bin\\libcrypto-1_1.dll" },
233- -- staticlibPath = { "lib\\libssl.a", "lib\\libcrypto.a" },
232+ libPath = { "lib\\mariadb\\libmariadb.dll" },
234233 configureParameter = [[
235234 -GNinja
236235 -DCMAKE_INSTALL_PREFIX=&INSTALLROOT&
@@ -254,8 +253,7 @@ conf.m3_1mal = {
254253 name = "mariadb_connector_c3.1.19-macOS-ALL-AppleClang&TARGETTOOLVERSION&",
255254 mariadbVersion = "3.1.19",
256255 host = "macOSM1",
257- -- libPath = { "lib/libssl.3.dylib", "lib/libcrypto.3.dylib" },
258- -- staticlibPath = { "lib/libssl.a", "lib/libcrypto.a" },
256+ libPath = { "lib/mariadb/libmariadb.3.dylib" },
259257 configureParameter = [[
260258 -GNinja
261259 -DCMAKE_INSTALL_PREFIX=&INSTALLROOT&
@@ -282,7 +280,7 @@ conf.m3_3wx6v9 = {
282280 mariadbVersion = "3.3.3",
283281 host = "Win10",
284282 toolchain = "MSVC2019-64",
285- -- libPath = { "bin\\libssl-1_1-x64.dll", "bin\\libcrypto-1_1-x64.dll" },
283+ libPath = { "lib\\mariadb\\libmariadb.dll" },
286284 configureParameter = [[
287285 -GNinja
288286 -DCMAKE_INSTALL_PREFIX=&INSTALLROOT&
@@ -305,7 +303,7 @@ conf.m3_3wx6v2 = {
305303 mariadbVersion = "3.3.3",
306304 host = "Win10",
307305 toolchain = "MSVC2022-64",
308- -- libPath = { "bin\\libssl-1_1-x64.dll", "bin\\libcrypto-1_1-x64.dll" },
306+ libPath = { "lib\\mariadb\\libmariadb.dll" },
309307 configureParameter = [[
310308 -GNinja
311309 -DCMAKE_INSTALL_PREFIX=&INSTALLROOT&
@@ -330,8 +328,7 @@ conf.m3_3wx6g1 = {
330328 mariadbVersion = "3.3.3",
331329 host = "Win10",
332330 toolchain = "MinGW1120-64",
333- -- libPath = { "bin\\libssl-1_1.dll", "bin\\libcrypto-1_1.dll" },
334- -- staticlibPath = { "lib\\libssl.a", "lib\\libcrypto.a" },
331+ libPath = { "lib\\mariadb\\libmariadb.dll" },
335332 configureParameter = [[
336333 -GNinja
337334 -DCMAKE_INSTALL_PREFIX=&INSTALLROOT&
@@ -354,8 +351,7 @@ conf.m3_3wx6g2 = {
354351 mariadbVersion = "3.3.3",
355352 host = "Win10",
356353 toolchain = "MinGW1210-64",
357- -- libPath = { "bin\\libssl-1_1.dll", "bin\\libcrypto-1_1.dll" },
358- -- staticlibPath = { "lib\\libssl.a", "lib\\libcrypto.a" },
354+ libPath = { "lib\\mariadb\\libmariadb.dll" },
359355 configureParameter = [[
360356 -GNinja
361357 -DCMAKE_INSTALL_PREFIX=&INSTALLROOT&
@@ -380,8 +376,7 @@ conf.m3_3wx6u5 = {
380376 mariadbVersion = "3.3.3",
381377 host = "Win10",
382378 toolchain = "MinGWLLVM-ucrt15-64",
383- -- libPath = { "bin\\libssl-1_1.dll", "bin\\libcrypto-1_1.dll" },
384- -- staticlibPath = { "lib\\libssl.a", "lib\\libcrypto.a" },
379+ libPath = { "lib\\mariadb\\libmariadb.dll" },
385380 configureParameter = [[
386381 -GNinja
387382 -DCMAKE_INSTALL_PREFIX=&INSTALLROOT&
@@ -406,8 +401,7 @@ conf.m3_3wx6s5 = {
406401 mariadbVersion = "3.3.3",
407402 host = "Win10",
408403 toolchain = "MinGWLLVM-msvcrt15-64",
409- -- libPath = { "bin\\libssl-1_1.dll", "bin\\libcrypto-1_1.dll" },
410- -- staticlibPath = { "lib\\libssl.a", "lib\\libcrypto.a" },
404+ libPath = { "lib\\mariadb\\libmariadb.dll" },
411405 configureParameter = [[
412406 -GNinja
413407 -DCMAKE_INSTALL_PREFIX=&INSTALLROOT&
@@ -433,8 +427,7 @@ conf.m3_3mal = {
433427 name = "mariadb_connector_c3.3.3-macOS-ALL-AppleClang&TARGETTOOLVERSION&",
434428 mariadbVersion = "3.3.3",
435429 host = "macOSM1",
436- -- libPath = { "lib/libssl.3.dylib", "lib/libcrypto.3.dylib" },
437- -- staticlibPath = { "lib/libssl.a", "lib/libcrypto.a" },
430+ libPath = { "lib/mariadb/libmariadb.3.dylib" },
438431 configureParameter = [[
439432 -GNinja
440433 -DCMAKE_INSTALL_PREFIX=&INSTALLROOT&