xmake.git, branch v2.9.4Unnamed repository; edit this file 'description' to name the repository.http://cgit.235523.xyz/xmake.git/atom/?h=v2.9.42024-07-29T16:42:39Zupdate version2024-07-29T16:42:39Zrukiwaruqi@gmail.com2024-07-29T16:42:39Zurn:sha1:e85b001f1fb873d4d781d90255f6fdb40625bd16Merge pull request #5407 from xiaobfly/dev2024-07-29T07:24:32Zrukiwaruqi@gmail.com2024-07-29T07:24:32Zurn:sha1:2b3aca5b6055cda60197200754ae0c2ee5fbc901
fix Qt static compilation issueMerge pull request #5408 from shuax/dev2024-07-29T05:51:56Zrukiwaruqi@gmail.com2024-07-29T05:51:56Zurn:sha1:8cd2a3b8318084daeafec233cb7670920dfd3aa3
fix vcpkg android armeabi-v7afix vcpkg android armeabi-v7a2024-07-29T03:59:04Zshuax6940583+shuax@users.noreply.github.com2024-07-29T03:59:04Zurn:sha1:129b3b8569b36b637c1cfb7b92b0ab8b995f5276Merge pull request #5406 from chriku/patch-12024-07-29T03:07:03Zrukiwaruqi@gmail.com2024-07-29T03:07:03Zurn:sha1:58987a44d287590230fc43f74d71036ebaa23454
Fix missing braces ignoring sourcekind in batchcmdsfix static qt link macro.2024-07-29T02:40:24Zxiaobflyxiaobfly@126.com2024-07-29T02:40:24Zurn:sha1:0936bb1cd2d90cbfe936efaaaa0daf712e12728f
for example:
before:
$$[QT_INSTALL_PREFIX]/lib/objects-RelWithDebInfo/PrintSupport_resources_1/.rcc/qrc_qprintdialog.cpp.obj
$$[QT_INSTALL_PREFIX]/lib/objects-RelWithDebInfo/PrintSupport_resources_2/.rcc/qrc_qprintdialog1.cpp.obj
$$[QT_INSTALL_PREFIX]/lib/objects-RelWithDebInfo/Widgets_resources_1/.rcc/qrc_qstyle.cpp.obj
$$[QT_INSTALL_PREFIX]/lib/objects-RelWithDebInfo/Widgets_resources_2/.rcc/qrc_qstyle1.cpp.obj
$$[QT_INSTALL_PREFIX]/lib/objects-RelWithDebInfo/Widgets_resources_3/.rcc/qrc_qmessagebox.cpp.obj
$$[QT_INSTALL_PREFIX]/lib/objects-RelWithDebInfo/Gui_resources_1/.rcc/qrc_qpdf.cpp.obj
$$[QT_INSTALL_PREFIX]/lib/objects-RelWithDebInfo/Gui_resources_2/.rcc/qrc_gui_shaders.cpp.obj
after:
"D:/Qt/Qt6.5.3/lib/objects-Debug/Widgets_resources_1/.rcc/qrc_qstyle.cpp.obj",
"D:/Qt/Qt6.5.3/lib/objects-Debug/Widgets_resources_2/.rcc/qrc_qstyle1.cpp.obj",
"D:/Qt/Qt6.5.3/lib/objects-Debug/Widgets_resources_3/.rcc/qrc_qmessagebox.cpp.obj",
"D:/Qt/Qt6.5.3/lib/objects-Debug/Gui_resources_1/.rcc/qrc_qpdf.cpp.obj",
"D:/Qt/Qt6.5.3/lib/objects-Debug/Gui_resources_2/.rcc/qrc_gui_shaders.cpp.obj",
fix:2024-07-29T02:08:14Zxiaobflyxiaobfly@126.com2024-07-29T02:08:14Zurn:sha1:e7950146e3f157909f1bf74f7ab742f0d445503a
not append .lib when link .obj file.
for example:
static qt will link these files:
$$[QT_INSTALL_PREFIX]/lib/objects-Debug/Widgets_resources_1/.rcc/qrc_qstyle.cpp.obj
$$[QT_INSTALL_PREFIX]/lib/objects-Debug/Widgets_resources_2/.rcc/qrc_qstyle1.cpp.obj
$$[QT_INSTALL_PREFIX]/lib/objects-Debug/Widgets_resources_3/.rcc/qrc_qmessagebox.cpp.obj
$$[QT_INSTALL_PREFIX]/lib/objects-Debug/Gui_resources_1/.rcc/qrc_qpdf.cpp.obj
$$[QT_INSTALL_PREFIX]/lib/objects-Debug/Gui_resources_2/.rcc/qrc_gui_shaders.cpp.obj
have a link error:
error: LINK fatal error LNK1104: can't open file "$$[QT_INSTALLPREFIX]\Lib\objects-Debug\widgets_resources1\.rcc\qrc_qstyle.cpp.obj.lib"
Fix missing braces ignoring sourcekind in batchcmds2024-07-29T00:27:27ZChristian Kurzchriku@users.noreply.github.com2024-07-29T00:27:27Zurn:sha1:5fa1efa6e686c5a24e41eaa915db25f38aed5a31update changelog2024-07-28T15:15:10Zrukiwaruqi@gmail.com2024-07-28T15:15:10Zurn:sha1:a06e2745bed779139111f3fad6cd4fd6d6f01b12Merge pull request #5404 from xmake-io/fetch2024-07-27T15:14:22Zrukiwaruqi@gmail.com2024-07-27T15:14:22Zurn:sha1:69ea60450564fc93c65f111b526c872689656f9c
fix fetch sysincludedirs