OSDN -- Develop and Download Open Source Software
  • R/O
  • HTTP
  • SSH
  • HTTPS
Fork

Commit

Tags
No Tags

Frequently used words (click to add to your profile)

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

Commit MetaInfo

Revisionebca562a21d9a5dfbcf7979a329271f84d5141fa (tree)
Time2023-02-05 13:37:39
AuthorFs <Fsu0413@vip....>
CommiterFs

Log Message

remove Qt 5.12 static full

Change Summary

Incremental Difference

--- a/Compile/lib/opensslCompile/conf.lua
+++ b/Compile/lib/opensslCompile/conf.lua
@@ -188,24 +188,6 @@ conf.o1wx6v7 = {
188188 ]],
189189 }
190190
191-conf.o1wx6v7st = {
192- name = "OpenSSL1.1.1s-Windows-x86_64-VS2017-&TARGETTOOLVERSION&-static",
193- opensslVersion = "1.1.1s",
194- host = "Win10",
195- toolchain = "MSVC2017-64",
196- variant = {"-static"},
197- staticlibPath = { "lib\\libssl.lib", "lib\\libcrypto.lib" },
198- configureParameter = [[
199- no-asm
200- no-shared
201- enable-static-engine
202- --prefix=&INSTALLROOT&
203- --openssldir=&INSTALLROOT&\ssl
204- VC-WIN64A
205- -FS
206- ]],
207-}
208-
209191 --------------------------------------------------------------------
210192
211193 conf.o1wx3v9 = {
--- a/Compile/lib/qtCompile/conf.lua
+++ b/Compile/lib/qtCompile/conf.lua
@@ -378,51 +378,6 @@ conf.Q2wx3v7st = {
378378 ]],
379379 }
380380
381-conf.Q2wx3v7sf = {
382- name = "Qt5.12.12-Windows-x86-VS2017-&HOSTTOOLVERSION&-staticFull",
383- qtVersion = "5.12.12",
384- host = "Win10",
385- toolchain = "MSVC2017-32",
386- variant = {"-staticFull"},
387- opensslConf = "o1wx3v7st",
388- configureParameter = [[
389- -prefix
390- &INSTALLROOT&
391- -opensource
392- -static
393- -release
394- -confirm-license
395- -platform
396- win32-msvc
397- -pch
398- -static-runtime
399- -plugin-manifests
400- -nomake
401- examples
402- -nomake
403- tests
404- -no-compile-examples
405- -qt-doubleconversion
406- -qt-zlib
407- -qt-pcre
408- -no-icu
409- -opengl
410- es2
411- -angle
412- -ssl
413- -openssl-linked
414- -I
415- &OPENSSLDIR&\include
416- -L
417- &OPENSSLDIR&\lib
418- "OPENSSL_LIBS=libssl.lib libcrypto.lib advapi32.lib Crypt32.lib user32.lib gdi32.lib wsock32.lib ws2_32.lib"
419- -sql-sqlite
420- -sql-odbc
421- -make-tool
422- jom
423- ]],
424-}
425-
426381 conf.Q2wx6v7 = {
427382 name = "Qt5.12.12-Windows-x86_64-VS2017-&HOSTTOOLVERSION&",
428383 qtVersion = "5.12.12",
@@ -463,51 +418,6 @@ conf.Q2wx6v7 = {
463418 ]],
464419 }
465420
466-conf.Q2wx6v7sf = {
467- name = "Qt5.12.12-Windows-x86_64-VS2017-&HOSTTOOLVERSION&-staticFull",
468- qtVersion = "5.12.12",
469- host = "Win10",
470- toolchain = "MSVC2017-64",
471- variant = {"-staticFull"},
472- opensslConf = "o1wx6v7st",
473- configureParameter = [[
474- -prefix
475- &INSTALLROOT&
476- -opensource
477- -static
478- -release
479- -confirm-license
480- -platform
481- win32-msvc
482- -pch
483- -static-runtime
484- -plugin-manifests
485- -nomake
486- examples
487- -nomake
488- tests
489- -no-compile-examples
490- -qt-doubleconversion
491- -qt-zlib
492- -qt-pcre
493- -no-icu
494- -opengl
495- es2
496- -angle
497- -ssl
498- -openssl-linked
499- -I
500- &OPENSSLDIR&\include
501- -L
502- &OPENSSLDIR&\lib
503- "OPENSSL_LIBS=libssl.lib libcrypto.lib advapi32.lib Crypt32.lib user32.lib gdi32.lib wsock32.lib ws2_32.lib"
504- -sql-sqlite
505- -sql-odbc
506- -make-tool
507- jom
508- ]],
509-}
510-
511421 conf.Q2wx3v9 = {
512422 name = "Qt5.12.12-Windows-x86-VS2019-&HOSTTOOLVERSION&",
513423 qtVersion = "5.12.12",
@@ -629,51 +539,6 @@ conf.Q2wx3m7 = {
629539 ]],
630540 }
631541
632-conf.Q2wx3m7sf = {
633- name = "Qt5.12.12-Windows-x86-MinGW&HOSTTOOLVERSION&-staticFull",
634- qtVersion = "5.12.12",
635- host = "Win8",
636- toolchain = "MinGW730-32",
637- variant = {"-staticFull"},
638- opensslConf = "o1wx3m7",
639- configureParameter = [[
640- -prefix
641- &INSTALLROOT&
642- -opensource
643- -static
644- -release
645- -confirm-license
646- -platform
647- win32-g++
648- -pch
649- -static-runtime
650- -plugin-manifests
651- -nomake
652- examples
653- -nomake
654- tests
655- -no-compile-examples
656- -qt-doubleconversion
657- -qt-zlib
658- -qt-pcre
659- -no-icu
660- -opengl
661- es2
662- -angle
663- -ssl
664- -openssl-linked
665- -I
666- &OPENSSLDIR&\include
667- -L
668- &OPENSSLDIR&\lib
669- "OPENSSL_LIBS=libssl libcrypto libadvapi32 libcrypt32 libuser32 libgdi32 libwsock32 libws2_32"
670- -sql-sqlite
671- -sql-odbc
672- -make-tool
673- "mingw32-make -j%PARALLELNUM%"
674- ]],
675-}
676-
677542 conf.Q2wx6m7 = {
678543 name = "Qt5.12.12-Windows-x86_64-MinGW&HOSTTOOLVERSION&",
679544 qtVersion = "5.12.12",
@@ -713,51 +578,6 @@ conf.Q2wx6m7 = {
713578 ]],
714579 }
715580
716-conf.Q2wx6m7sf = {
717- name = "Qt5.12.12-Windows-x86_64-MinGW&HOSTTOOLVERSION&-staticFull",
718- qtVersion = "5.12.12",
719- host = "Win8",
720- toolchain = "MinGW730-64",
721- variant = {"-staticFull"},
722- opensslConf = "o1wx6m7",
723- configureParameter = [[
724- -prefix
725- &INSTALLROOT&
726- -opensource
727- -static
728- -release
729- -confirm-license
730- -platform
731- win32-g++
732- -pch
733- -static-runtime
734- -plugin-manifests
735- -nomake
736- examples
737- -nomake
738- tests
739- -no-compile-examples
740- -qt-doubleconversion
741- -qt-zlib
742- -qt-pcre
743- -no-icu
744- -opengl
745- es2
746- -angle
747- -ssl
748- -openssl-linked
749- -I
750- &OPENSSLDIR&\include
751- -L
752- &OPENSSLDIR&\lib
753- "OPENSSL_LIBS=libssl libcrypto libadvapi32 libcrypt32 libuser32 libgdi32 libwsock32 libws2_32"
754- -sql-sqlite
755- -sql-odbc
756- -make-tool
757- "mingw32-make -j%PARALLELNUM%"
758- ]],
759-}
760-
761581 conf.Q2lx6st = {
762582 name = "Qt5.12.12-Linux-x86_64-gcc&HOSTTOOLVERSION&-static",
763583 qtVersion = "5.12.12",
@@ -1470,6 +1290,48 @@ conf.Q5wx3v5 = {
14701290 ]],
14711291 }
14721292
1293+conf.Q5wx3v5sf = {
1294+ name = "Qt5.15.8-Windows-x86-VS2015-staticFull",
1295+ qtVersion = "5.15.8",
1296+ host = "Win8",
1297+ toolchain = "MSVC2015-32",
1298+ variant = {"-staticFull"},
1299+ configureParameter = [[
1300+ -prefix
1301+ &INSTALLROOT&
1302+ -opensource
1303+ -static
1304+ -feature-relocatable
1305+ -release
1306+ -confirm-license
1307+ -platform
1308+ win32-msvc
1309+ -pch
1310+ -static-runtime
1311+ -plugin-manifests
1312+ -nomake
1313+ examples
1314+ -nomake
1315+ tests
1316+ -no-compile-examples
1317+ -qt-doubleconversion
1318+ -qt-zlib
1319+ -qt-pcre
1320+ -no-icu
1321+ -opengl
1322+ es2
1323+ -angle
1324+ -ssl
1325+ -schannel
1326+ -sql-sqlite
1327+ -sql-odbc
1328+ -make-tool
1329+ jom
1330+ -skip
1331+ qtwebengine
1332+ ]],
1333+}
1334+
14731335 conf.Q5wx6v5 = {
14741336 name = "Qt5.15.8-Windows-x86_64-VS2015",
14751337 qtVersion = "5.15.8",
@@ -1509,6 +1371,48 @@ conf.Q5wx6v5 = {
15091371 ]],
15101372 }
15111373
1374+conf.Q5wx6v5sf = {
1375+ name = "Qt5.15.8-Windows-x86_64-VS2015-staticFull",
1376+ qtVersion = "5.15.8",
1377+ host = "Win8",
1378+ toolchain = "MSVC2015-64",
1379+ variant = {"-staticFull"},
1380+ configureParameter = [[
1381+ -prefix
1382+ &INSTALLROOT&
1383+ -opensource
1384+ -static
1385+ -feature-relocatable
1386+ -release
1387+ -confirm-license
1388+ -platform
1389+ win32-msvc
1390+ -pch
1391+ -static-runtime
1392+ -plugin-manifests
1393+ -nomake
1394+ examples
1395+ -nomake
1396+ tests
1397+ -no-compile-examples
1398+ -qt-doubleconversion
1399+ -qt-zlib
1400+ -qt-pcre
1401+ -no-icu
1402+ -opengl
1403+ es2
1404+ -angle
1405+ -ssl
1406+ -schannel
1407+ -sql-sqlite
1408+ -sql-odbc
1409+ -make-tool
1410+ jom
1411+ -skip
1412+ qtwebengine
1413+ ]],
1414+}
1415+
15121416 conf.Q5wx3v7 = {
15131417 name = "Qt5.15.8-Windows-x86-VS2017-&HOSTTOOLVERSION&",
15141418 qtVersion = "5.15.8-4",
@@ -1550,6 +1454,48 @@ conf.Q5wx3v7 = {
15501454 ]],
15511455 }
15521456
1457+conf.Q5wx3v7sf = {
1458+ name = "Qt5.15.8-Windows-x86-VS2017-&HOSTTOOLVERSION&-staticFull",
1459+ qtVersion = "5.15.8",
1460+ host = "Win10",
1461+ toolchain = "MSVC2017-32",
1462+ variant = {"-staticFull"},
1463+ configureParameter = [[
1464+ -prefix
1465+ &INSTALLROOT&
1466+ -opensource
1467+ -static
1468+ -feature-relocatable
1469+ -release
1470+ -confirm-license
1471+ -platform
1472+ win32-msvc
1473+ -pch
1474+ -static-runtime
1475+ -plugin-manifests
1476+ -nomake
1477+ examples
1478+ -nomake
1479+ tests
1480+ -no-compile-examples
1481+ -qt-doubleconversion
1482+ -qt-zlib
1483+ -qt-pcre
1484+ -no-icu
1485+ -opengl
1486+ es2
1487+ -angle
1488+ -ssl
1489+ -schannel
1490+ -sql-sqlite
1491+ -sql-odbc
1492+ -make-tool
1493+ jom
1494+ -skip
1495+ qtwebengine
1496+ ]],
1497+}
1498+
15531499 conf.Q5wx6v7 = {
15541500 name = "Qt5.15.8-Windows-x86_64-VS2017-&HOSTTOOLVERSION&",
15551501 qtVersion = "5.15.8-4",
@@ -1591,6 +1537,48 @@ conf.Q5wx6v7 = {
15911537 ]],
15921538 }
15931539
1540+conf.Q5wx6v7sf = {
1541+ name = "Qt5.15.8-Windows-x86_64-VS2017-&HOSTTOOLVERSION&-staticFull",
1542+ qtVersion = "5.15.8",
1543+ host = "Win10",
1544+ toolchain = "MSVC2017-64",
1545+ variant = {"-staticFull"},
1546+ configureParameter = [[
1547+ -prefix
1548+ &INSTALLROOT&
1549+ -opensource
1550+ -static
1551+ -feature-relocatable
1552+ -release
1553+ -confirm-license
1554+ -platform
1555+ win32-msvc
1556+ -pch
1557+ -static-runtime
1558+ -plugin-manifests
1559+ -nomake
1560+ examples
1561+ -nomake
1562+ tests
1563+ -no-compile-examples
1564+ -qt-doubleconversion
1565+ -qt-zlib
1566+ -qt-pcre
1567+ -no-icu
1568+ -opengl
1569+ es2
1570+ -angle
1571+ -ssl
1572+ -schannel
1573+ -sql-sqlite
1574+ -sql-odbc
1575+ -make-tool
1576+ jom
1577+ -skip
1578+ qtwebengine
1579+ ]],
1580+}
1581+
15941582 conf.Q5wx3v9 = {
15951583 name = "Qt5.15.8-Windows-x86-VS2019-&HOSTTOOLVERSION&",
15961584 qtVersion = "5.15.8-4",