From dac24ec57d2fa0e2944c2670d01fdeab0523f007 Mon Sep 17 00:00:00 2001 From: Cyano Hao Date: Mon, 10 Jun 2024 09:17:16 +0800 Subject: [PATCH] use standard link flags (#450) --- RedPandaIDE/RedPandaIDE.pro | 20 +++++++------------- Red_Panda_CPP.pro | 2 +- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/RedPandaIDE/RedPandaIDE.pro b/RedPandaIDE/RedPandaIDE.pro index a90ec332..1ac6aedb 100644 --- a/RedPandaIDE/RedPandaIDE.pro +++ b/RedPandaIDE/RedPandaIDE.pro @@ -48,8 +48,10 @@ isEmpty(LIBEXECDIR) { win32: { DEFINES += _WIN32_WINNT=0x0501 + LIBS += -ladvapi32 # registry APIs LIBS += -lpsapi # GetModuleFileNameEx, GetProcessMemoryInfo LIBS += -lshlwapi # SHDeleteKey + LIBS += -luser32 # window message APIs } DEFINES += PREFIX=\\\"$${PREFIX}\\\" @@ -89,26 +91,18 @@ msvc { CONFIG(debug_and_release_target) { CONFIG(debug, debug|release) { - OBJ_OUT_PWD = debug/ + OBJ_OUT_PWD = debug } CONFIG(release, debug|release) { - OBJ_OUT_PWD = release/ + OBJ_OUT_PWD = release } } INCLUDEPATH += ../libs/qsynedit ../libs/redpanda_qt_utils ../libs/lua -gcc | clang { -LIBS += $$OUT_PWD/../libs/qsynedit/$${OBJ_OUT_PWD}libqsynedit.a \ - $$OUT_PWD/../libs/redpanda_qt_utils/$${OBJ_OUT_PWD}libredpanda_qt_utils.a \ - $$OUT_PWD/../libs/lua/$${OBJ_OUT_PWD}liblua.a -} -msvc { -LIBS += $$OUT_PWD/../libs/qsynedit/$${OBJ_OUT_PWD}qsynedit.lib \ - $$OUT_PWD/../libs/redpanda_qt_utils/$${OBJ_OUT_PWD}redpanda_qt_utils.lib \ - $$OUT_PWD/../libs/lua/$${OBJ_OUT_PWD}lua.lib -LIBS += advapi32.lib user32.lib -} +LIBS += -L$$OUT_PWD/../libs/qsynedit/$${OBJ_OUT_PWD} -lqsynedit \ + -L$$OUT_PWD/../libs/redpanda_qt_utils/$${OBJ_OUT_PWD} -lredpanda_qt_utils \ + -L$$OUT_PWD/../libs/lua/$${OBJ_OUT_PWD} -llua SOURCES += \ autolinkmanager.cpp \ diff --git a/Red_Panda_CPP.pro b/Red_Panda_CPP.pro index 4a48c1ce..f1400d3d 100644 --- a/Red_Panda_CPP.pro +++ b/Red_Panda_CPP.pro @@ -14,7 +14,7 @@ lua.subdir = libs/lua # Add the dependencies so that the RedPandaIDE project can add the depended programs # into the main app bundle -RedPandaIDE.depends = consolepauser qsynedit +RedPandaIDE.depends = consolepauser qsynedit lua qsynedit.depends = redpanda_qt_utils APP_NAME = RedPandaCPP