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

Revisionc9d2226faad9c0298a2585c066d1265bad1cb9f3 (tree)
Zeit2023-02-04 12:46:49
AutorFs <Fsu0413@vip....>
CommiterFs

Log Message

default built mariadb incompatible with MySQL mariadb step 8

Ändern Zusammenfassung

Diff

--- a/Compile/lib/qtCompile/conf.lua
+++ b/Compile/lib/qtCompile/conf.lua
@@ -1463,7 +1463,8 @@ conf.Q5wx3v5 = {
14631463 -sql-sqlite
14641464 -sql-odbc
14651465 -sql-mysql
1466- "MYSQL_PREFIX=&MYSQLPREFIX&"
1466+ "MYSQL_INCDIR=&MYSQLPREFIX&\include\mariadb"
1467+ "MYSQL_LIBDIR=&MYSQLPREFIX&\lib\mariadb"
14671468 -make-tool
14681469 jom
14691470 ]],
@@ -1501,7 +1502,8 @@ conf.Q5wx6v5 = {
15011502 -sql-sqlite
15021503 -sql-odbc
15031504 -sql-mysql
1504- "MYSQL_PREFIX=&MYSQLPREFIX&"
1505+ "MYSQL_INCDIR=&MYSQLPREFIX&\include\mariadb"
1506+ "MYSQL_LIBDIR=&MYSQLPREFIX&\lib\mariadb"
15051507 -make-tool
15061508 jom
15071509 ]],
@@ -1539,7 +1541,8 @@ conf.Q5wx3v7 = {
15391541 -sql-sqlite
15401542 -sql-odbc
15411543 -sql-mysql
1542- "MYSQL_PREFIX=&MYSQLPREFIX&"
1544+ "MYSQL_INCDIR=&MYSQLPREFIX&\include\mariadb"
1545+ "MYSQL_LIBDIR=&MYSQLPREFIX&\lib\mariadb"
15431546 -make-tool
15441547 jom
15451548 -skip
@@ -1579,7 +1582,8 @@ conf.Q5wx6v7 = {
15791582 -sql-sqlite
15801583 -sql-odbc
15811584 -sql-mysql
1582- "MYSQL_PREFIX=&MYSQLPREFIX&"
1585+ "MYSQL_INCDIR=&MYSQLPREFIX&\include\mariadb"
1586+ "MYSQL_LIBDIR=&MYSQLPREFIX&\lib\mariadb"
15831587 -make-tool
15841588 jom
15851589 -skip
@@ -1619,7 +1623,8 @@ conf.Q5wx3v9 = {
16191623 -sql-sqlite
16201624 -sql-odbc
16211625 -sql-mysql
1622- "MYSQL_PREFIX=&MYSQLPREFIX&"
1626+ "MYSQL_INCDIR=&MYSQLPREFIX&\include\mariadb"
1627+ "MYSQL_LIBDIR=&MYSQLPREFIX&\lib\mariadb"
16231628 -make-tool
16241629 jom
16251630 -webengine-proprietary-codecs
@@ -1700,7 +1705,8 @@ conf.Q5wx6v9 = {
17001705 -sql-sqlite
17011706 -sql-odbc
17021707 -sql-mysql
1703- "MYSQL_PREFIX=&MYSQLPREFIX&"
1708+ "MYSQL_INCDIR=&MYSQLPREFIX&\include\mariadb"
1709+ "MYSQL_LIBDIR=&MYSQLPREFIX&\lib\mariadb"
17041710 -make-tool
17051711 jom
17061712 -webengine-proprietary-codecs
@@ -1781,7 +1787,8 @@ conf.Q5wx6v2 = {
17811787 -sql-sqlite
17821788 -sql-odbc
17831789 -sql-mysql
1784- "MYSQL_PREFIX=&MYSQLPREFIX&"
1790+ "MYSQL_INCDIR=&MYSQLPREFIX&\include\mariadb"
1791+ "MYSQL_LIBDIR=&MYSQLPREFIX&\lib\mariadb"
17851792 -make-tool
17861793 jom
17871794 -skip
@@ -1897,7 +1904,8 @@ conf.Q5wx6m8 = {
18971904 -sql-sqlite
18981905 -sql-odbc
18991906 -sql-mysql
1900- "MYSQL_PREFIX=&MYSQLPREFIX&"
1907+ "MYSQL_INCDIR=&MYSQLPREFIX&\include\mariadb"
1908+ "MYSQL_LIBDIR=&MYSQLPREFIX&\lib\mariadb"
19011909 -make-tool
19021910 "mingw32-make -j%PARALLELNUM%"
19031911 ]],
@@ -2045,7 +2053,8 @@ conf.Q5mx6 = {
20452053 -securetransport
20462054 -sql-sqlite
20472055 -sql-mysql
2048- "MYSQL_PREFIX=&MYSQLPREFIX&"
2056+ "MYSQL_INCDIR=&MYSQLPREFIX&/include/mariadb"
2057+ "MYSQL_LIBDIR=&MYSQLPREFIX&/lib/mariadb"
20492058 -make-tool
20502059 "make -j$PARALLELNUM"
20512060 -skip
@@ -2084,7 +2093,8 @@ conf.Q5mx6nf = {
20842093 -securetransport
20852094 -sql-sqlite
20862095 -sql-mysql
2087- "MYSQL_PREFIX=&MYSQLPREFIX&"
2096+ "MYSQL_INCDIR=&MYSQLPREFIX&/include/mariadb"
2097+ "MYSQL_LIBDIR=&MYSQLPREFIX&/lib/mariadb"
20882098 -make-tool
20892099 "make -j$PARALLELNUM"
20902100 -rpath
@@ -2547,7 +2557,7 @@ conf.q6_2wx6v9 = {
25472557 -DFEATURE_sql_sqlite=ON
25482558 -DFEATURE_sql_odbc=ON
25492559 -DFEATURE_sql_mysql=ON
2550- -DMySQL_INCLUDE_DIR="&MYSQLPREFIX&\include"
2560+ -DMySQL_INCLUDE_DIR="&MYSQLPREFIX&\include\mariadb"
25512561 -DMySQL_LIBRARY="&MYSQLPREFIX&\lib\mariadb\libmariadb.lib"
25522562 -DFEATURE_system_sqlite=OFF
25532563 -DBUILD_qtwebengine=OFF
@@ -2719,7 +2729,7 @@ conf.q6_2wx6v2 = {
27192729 -DFEATURE_sql_sqlite=ON
27202730 -DFEATURE_sql_odbc=ON
27212731 -DFEATURE_sql_mysql=ON
2722- -DMySQL_INCLUDE_DIR="&MYSQLPREFIX&\include"
2732+ -DMySQL_INCLUDE_DIR="&MYSQLPREFIX&\include\mariadb"
27232733 -DMySQL_LIBRARY="&MYSQLPREFIX&\lib\mariadb\libmariadb.lib"
27242734 -DFEATURE_system_sqlite=OFF
27252735 -DBUILD_qtwebengine=OFF
@@ -2758,7 +2768,7 @@ conf.q6_2wx6m1 = {
27582768 -DFEATURE_sql_sqlite=ON
27592769 -DFEATURE_sql_odbc=ON
27602770 -DFEATURE_sql_mysql=ON
2761- -DMySQL_INCLUDE_DIR="&MYSQLPREFIX&\include"
2771+ -DMySQL_INCLUDE_DIR="&MYSQLPREFIX&\include\mariadb"
27622772 -DMySQL_LIBRARY="&MYSQLPREFIX&\lib\mariadb\liblibmariadb.dll.a"
27632773 -DFEATURE_system_sqlite=OFF
27642774 -DBUILD_qtopcua=OFF
@@ -2895,7 +2905,7 @@ conf.q6_2wx6m2 = {
28952905 -DFEATURE_sql_sqlite=ON
28962906 -DFEATURE_sql_odbc=ON
28972907 -DFEATURE_sql_mysql=ON
2898- -DMySQL_INCLUDE_DIR="&MYSQLPREFIX&\include"
2908+ -DMySQL_INCLUDE_DIR="&MYSQLPREFIX&\include\mariadb"
28992909 -DMySQL_LIBRARY="&MYSQLPREFIX&\lib\mariadb\liblibmariadb.dll.a"
29002910 -DFEATURE_system_sqlite=OFF
29012911 -DBUILD_qtopcua=OFF
@@ -2972,7 +2982,7 @@ conf.q6_2wx6u5 = {
29722982 -DFEATURE_sql_sqlite=ON
29732983 -DFEATURE_sql_odbc=ON
29742984 -DFEATURE_sql_mysql=ON
2975- -DMySQL_INCLUDE_DIR="&MYSQLPREFIX&\include"
2985+ -DMySQL_INCLUDE_DIR="&MYSQLPREFIX&\include\mariadb"
29762986 -DMySQL_LIBRARY="&MYSQLPREFIX&\lib\mariadb\liblibmariadb.dll.a"
29772987 -DFEATURE_system_sqlite=OFF
29782988 -DBUILD_qtwebengine=OFF
@@ -3014,7 +3024,7 @@ conf.q6_2wx6s5 = {
30143024 -DFEATURE_sql_sqlite=ON
30153025 -DFEATURE_sql_odbc=ON
30163026 -DFEATURE_sql_mysql=ON
3017- -DMySQL_INCLUDE_DIR="&MYSQLPREFIX&\include"
3027+ -DMySQL_INCLUDE_DIR="&MYSQLPREFIX&\include\mariadb"
30183028 -DMySQL_LIBRARY="&MYSQLPREFIX&\lib\mariadb\liblibmariadb.dll.a"
30193029 -DFEATURE_system_sqlite=OFF
30203030 -DBUILD_qtwebengine=OFF
@@ -3109,7 +3119,7 @@ conf.q6_2mal = {
31093119 -DFEATURE_securetransport=ON
31103120 -DFEATURE_sql_sqlite=ON
31113121 -DFEATURE_sql_mysql=ON
3112- -DMySQL_INCLUDE_DIR="&MYSQLPREFIX&/include"
3122+ -DMySQL_INCLUDE_DIR="&MYSQLPREFIX&/include/mariadb"
31133123 -DMySQL_LIBRARY="&MYSQLPREFIX&/lib/mariadb/libmariadb.3.dylib"
31143124 -DFEATURE_system_sqlite=OFF
31153125 -DBUILD_qtwebengine=OFF
@@ -3152,7 +3162,7 @@ conf.q6_2malnf = {
31523162 -DFEATURE_securetransport=ON
31533163 -DFEATURE_sql_sqlite=ON
31543164 -DFEATURE_sql_mysql=ON
3155- -DMySQL_INCLUDE_DIR="&MYSQLPREFIX&/include"
3165+ -DMySQL_INCLUDE_DIR="&MYSQLPREFIX&/include/mriadb"
31563166 -DMySQL_LIBRARY="&MYSQLPREFIX&/lib/mariadb/libmariadb.3.dylib"
31573167 -DFEATURE_system_sqlite=OFF
31583168 -DBUILD_qtwebengine=OFF
@@ -3839,7 +3849,7 @@ conf.q6_4wx6v9 = {
38393849 -DFEATURE_sql_sqlite=ON
38403850 -DFEATURE_sql_odbc=ON
38413851 -DFEATURE_sql_mysql=ON
3842- -DMySQL_INCLUDE_DIR="&MYSQLPREFIX&\include"
3852+ -DMySQL_INCLUDE_DIR="&MYSQLPREFIX&\include\mariadb"
38433853 -DMySQL_LIBRARY="&MYSQLPREFIX&\lib\mariadb\libmariadb.lib"
38443854 -DFEATURE_system_sqlite=OFF
38453855 -DFEATURE_webengine_proprietary_codecs=ON
@@ -3879,7 +3889,7 @@ conf.q6_4wx6v2 = {
38793889 -DFEATURE_sql_sqlite=ON
38803890 -DFEATURE_sql_odbc=ON
38813891 -DFEATURE_sql_mysql=ON
3882- -DMySQL_INCLUDE_DIR="&MYSQLPREFIX&\include"
3892+ -DMySQL_INCLUDE_DIR="&MYSQLPREFIX&\include\mariadb"
38833893 -DMySQL_LIBRARY="&MYSQLPREFIX&\lib\mariadb\libmariadb.lib"
38843894 -DFEATURE_system_sqlite=OFF
38853895 -DFEATURE_webengine_proprietary_codecs=ON
@@ -4014,7 +4024,7 @@ conf.q6_4wx6g2 = {
40144024 -DFEATURE_sql_sqlite=ON
40154025 -DFEATURE_sql_odbc=ON
40164026 -DFEATURE_sql_mysql=ON
4017- -DMySQL_INCLUDE_DIR="&MYSQLPREFIX&\include"
4027+ -DMySQL_INCLUDE_DIR="&MYSQLPREFIX&\include\mariadb"
40184028 -DMySQL_LIBRARY="&MYSQLPREFIX&\lib\mariadb\liblibmariadb.dll.a"
40194029 -DFEATURE_system_sqlite=OFF
40204030 -DBUILD_qtopcua=OFF
@@ -4112,7 +4122,7 @@ conf.q6_4wx6u5 = {
41124122 -DFEATURE_sql_sqlite=ON
41134123 -DFEATURE_sql_odbc=ON
41144124 -DFEATURE_sql_mysql=ON
4115- -DMySQL_INCLUDE_DIR="&MYSQLPREFIX&\include"
4125+ -DMySQL_INCLUDE_DIR="&MYSQLPREFIX&\include\mariadb"
41164126 -DMySQL_LIBRARY="&MYSQLPREFIX&\lib\mariadb\liblibmariadb.dll.a"
41174127 -DFEATURE_system_sqlite=OFF
41184128 -DBUILD_qtwebengine=OFF
@@ -4154,7 +4164,7 @@ conf.q6_4wx6s5 = {
41544164 -DFEATURE_sql_sqlite=ON
41554165 -DFEATURE_sql_odbc=ON
41564166 -DFEATURE_sql_mysql=ON
4157- -DMySQL_INCLUDE_DIR="&MYSQLPREFIX&\include"
4167+ -DMySQL_INCLUDE_DIR="&MYSQLPREFIX&\include\mariadb"
41584168 -DMySQL_LIBRARY="&MYSQLPREFIX&\lib\mariadb\liblibmariadb.dll.a"
41594169 -DFEATURE_system_sqlite=OFF
41604170 -DBUILD_qtwebengine=OFF
@@ -4249,7 +4259,7 @@ conf.q6_4mal = {
42494259 -DFEATURE_securetransport=ON
42504260 -DFEATURE_sql_sqlite=ON
42514261 -DFEATURE_sql_mysql=ON
4252- -DMySQL_INCLUDE_DIR="&MYSQLPREFIX&/include"
4262+ -DMySQL_INCLUDE_DIR="&MYSQLPREFIX&/include/mariadb"
42534263 -DMySQL_LIBRARY="&MYSQLPREFIX&/lib/mariadb/libmariadb.3.dylib"
42544264 -DFEATURE_system_sqlite=OFF
42554265 -DFEATURE_webengine_proprietary_codecs=ON
@@ -4293,7 +4303,7 @@ conf.q6_4malnf = {
42934303 -DFEATURE_securetransport=ON
42944304 -DFEATURE_sql_sqlite=ON
42954305 -DFEATURE_sql_mysql=ON
4296- -DMySQL_INCLUDE_DIR="&MYSQLPREFIX&/include"
4306+ -DMySQL_INCLUDE_DIR="&MYSQLPREFIX&/include/mariadb"
42974307 -DMySQL_LIBRARY="&MYSQLPREFIX&/lib/mariadb/libmariadb.3.dylib"
42984308 -DFEATURE_system_sqlite=OFF
42994309 -DFEATURE_webengine_proprietary_codecs=ON
@@ -4717,7 +4727,7 @@ conf.q6_5wx6v2 = {
47174727 -DFEATURE_sql_sqlite=ON
47184728 -DFEATURE_sql_odbc=ON
47194729 -DFEATURE_sql_mysql=ON
4720- -DMySQL_INCLUDE_DIR="&MYSQLPREFIX&\include"
4730+ -DMySQL_INCLUDE_DIR="&MYSQLPREFIX&\include\mariadb"
47214731 -DMySQL_LIBRARY="&MYSQLPREFIX&\lib\mariadb\libmariadb.lib"
47224732 -DFEATURE_system_sqlite=OFF
47234733 -DFEATURE_webengine_proprietary_codecs=ON
@@ -4896,7 +4906,7 @@ conf.q6_5wx6g2 = {
48964906 -DFEATURE_sql_sqlite=ON
48974907 -DFEATURE_sql_odbc=ON
48984908 -DFEATURE_sql_mysql=ON
4899- -DMySQL_INCLUDE_DIR="&MYSQLPREFIX&\include"
4909+ -DMySQL_INCLUDE_DIR="&MYSQLPREFIX&\include\mariadb"
49004910 -DMySQL_LIBRARY="&MYSQLPREFIX&\lib\mariadb\liblibmariadb.dll.a"
49014911 -DFEATURE_system_sqlite=OFF
49024912 -DBUILD_qtgrpc=OFF
@@ -5039,7 +5049,7 @@ conf.q6_5wx6u5 = {
50395049 -DFEATURE_sql_sqlite=ON
50405050 -DFEATURE_sql_odbc=ON
50415051 -DFEATURE_sql_mysql=ON
5042- -DMySQL_INCLUDE_DIR="&MYSQLPREFIX&\include"
5052+ -DMySQL_INCLUDE_DIR="&MYSQLPREFIX&\include\mariadb"
50435053 -DMySQL_LIBRARY="&MYSQLPREFIX&\lib\mariadb\liblibmariadb.dll.a"
50445054 -DFEATURE_system_sqlite=OFF
50455055 -DBUILD_qtgrpc=OFF
@@ -5081,7 +5091,7 @@ conf.q6_5wx6s5 = {
50815091 -DFEATURE_sql_sqlite=ON
50825092 -DFEATURE_sql_odbc=ON
50835093 -DFEATURE_sql_mysql=ON
5084- -DMySQL_INCLUDE_DIR="&MYSQLPREFIX&\include"
5094+ -DMySQL_INCLUDE_DIR="&MYSQLPREFIX&\include\mariadb"
50855095 -DMySQL_LIBRARY="&MYSQLPREFIX&\lib\mariadb\liblibmariadb.dll.a"
50865096 -DFEATURE_system_sqlite=OFF
50875097 -DBUILD_qtgrpc=OFF
@@ -5181,7 +5191,7 @@ conf.q6_5mal = {
51815191 -DFEATURE_securetransport=ON
51825192 -DFEATURE_sql_sqlite=ON
51835193 -DFEATURE_sql_mysql=ON
5184- -DMySQL_INCLUDE_DIR="&MYSQLPREFIX&/include"
5194+ -DMySQL_INCLUDE_DIR="&MYSQLPREFIX&/include/mariadb"
51855195 -DMySQL_LIBRARY="&MYSQLPREFIX&/lib/mariadb/libmariadb.3.dylib"
51865196 -DFEATURE_system_sqlite=OFF
51875197 -DFEATURE_webengine_proprietary_codecs=ON
@@ -5225,7 +5235,7 @@ conf.q6_5malnf = {
52255235 -DFEATURE_securetransport=ON
52265236 -DFEATURE_sql_sqlite=ON
52275237 -DFEATURE_sql_mysql=ON
5228- -DMySQL_INCLUDE_DIR="&MYSQLPREFIX&/include"
5238+ -DMySQL_INCLUDE_DIR="&MYSQLPREFIX&/include/mariadb"
52295239 -DMySQL_LIBRARY="&MYSQLPREFIX&/lib/mariadb/libmariadb.3.dylib"
52305240 -DFEATURE_system_sqlite=OFF
52315241 -DFEATURE_webengine_proprietary_codecs=ON