From b01f4f6c24ed6ff80f822d6ed546c188655bda27 Mon Sep 17 00:00:00 2001 From: Pavel Pisa Date: Tue, 19 Feb 2019 12:27:52 +0100 Subject: Update project files to adapt for release and debug libraries location for Windows builds. Signed-off-by: Pavel Pisa --- qtmips_cli/qtmips_cli.pro | 6 +++++- qtmips_gui/qtmips_gui.pro | 8 ++++++-- qtmips_machine/tests/tests.pro | 6 +++++- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/qtmips_cli/qtmips_cli.pro b/qtmips_cli/qtmips_cli.pro index 9b763b9..c3394c9 100644 --- a/qtmips_cli/qtmips_cli.pro +++ b/qtmips_cli/qtmips_cli.pro @@ -7,7 +7,11 @@ CONFIG += c++11 TEMPLATE = app -LIBS += -L$$OUT_PWD/../qtmips_machine/ -lqtmips_machine -lelf +win32:CONFIG(release, debug|release): LIBS_SUBDIR = release +else:win32:CONFIG(debug, debug|release): LIBS_SUBDIR = debug +else:unix: LIBS_SUBDIR = . + +LIBS += -L$$OUT_PWD/../qtmips_machine/$${LIBS_SUBDIR} -lqtmips_machine -lelf DOLAR=$ diff --git a/qtmips_gui/qtmips_gui.pro b/qtmips_gui/qtmips_gui.pro index 4f4b863..541798a 100644 --- a/qtmips_gui/qtmips_gui.pro +++ b/qtmips_gui/qtmips_gui.pro @@ -5,8 +5,12 @@ CONFIG += c++11 TEMPLATE = app -LIBS += -L$$OUT_PWD/../qtmips_osemu/ -lqtmips_osemu -LIBS += -L$$OUT_PWD/../qtmips_machine/ -lqtmips_machine -lelf +win32:CONFIG(release, debug|release): LIBS_SUBDIR = release +else:win32:CONFIG(debug, debug|release): LIBS_SUBDIR = debug +else:unix: LIBS_SUBDIR = . + +LIBS += -L$$OUT_PWD/../qtmips_osemu/$${LIBS_SUBDIR} -lqtmips_osemu +LIBS += -L$$OUT_PWD/../qtmips_machine/$${LIBS_SUBDIR} -lqtmips_machine -lelf DOLAR=$ diff --git a/qtmips_machine/tests/tests.pro b/qtmips_machine/tests/tests.pro index 007d8c5..9486a2c 100644 --- a/qtmips_machine/tests/tests.pro +++ b/qtmips_machine/tests/tests.pro @@ -8,7 +8,11 @@ CONFIG += c++11 TEMPLATE = app -LIBS += -L$$OUT_PWD/../ -lqtmips_machine -lelf +win32:CONFIG(release, debug|release): LIBS_SUBDIR = release +else:win32:CONFIG(debug, debug|release): LIBS_SUBDIR = debug +else:unix: LIBS_SUBDIR = . + +LIBS += -L$$OUT_PWD/../$${LIBS_SUBDIR} -lqtmips_machine -lelf DOLAR=$ -- cgit v1.2.3