From 275dd217900cdb5cddf606ecf3ec62ec43e34491 Mon Sep 17 00:00:00 2001 From: visualfc Date: Thu, 23 Apr 2020 00:35:24 +0800 Subject: [PATCH] fix build on windows --- liteidex/src/plugins/terminal/terminal.pro | 1 - liteidex/src/utils/vterm/vterm.pri | 5 +---- liteidex/src/utils/vterm/vterm.pro | 2 +- liteidex/src/utils/vterm/vtermwidgetbase.h | 7 ++++--- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/liteidex/src/plugins/terminal/terminal.pro b/liteidex/src/plugins/terminal/terminal.pro index 21d3d86eb..d1d51a826 100644 --- a/liteidex/src/plugins/terminal/terminal.pro +++ b/liteidex/src/plugins/terminal/terminal.pro @@ -6,7 +6,6 @@ include(../../api/terminalapi/terminalapi.pri) include(../../utils/vterm/vterm.pri) include(../../utils/tabwidget/tabwidget.pri) - DEFINES += TERMINAL_LIBRARY win32 { diff --git a/liteidex/src/utils/vterm/vterm.pri b/liteidex/src/utils/vterm/vterm.pri index efa8fdd2f..0b45e8259 100644 --- a/liteidex/src/utils/vterm/vterm.pri +++ b/liteidex/src/utils/vterm/vterm.pri @@ -1,7 +1,4 @@ -LIBS *= -l$$qtLibraryName(vterm) +LIBS *= -l$$qtLibraryName(vtermwidget) LIBS *= -l$$qtLibraryName(libvterm) LIBS *= -l$$qtLibraryName(ptyqt) - - - diff --git a/liteidex/src/utils/vterm/vterm.pro b/liteidex/src/utils/vterm/vterm.pro index ff8471ace..225482d3f 100644 --- a/liteidex/src/utils/vterm/vterm.pro +++ b/liteidex/src/utils/vterm/vterm.pro @@ -1,4 +1,4 @@ -TARGET = vterm +TARGET = vtermwidget TEMPLATE = lib CONFIG += staticlib diff --git a/liteidex/src/utils/vterm/vtermwidgetbase.h b/liteidex/src/utils/vterm/vtermwidgetbase.h index f4745b2ea..eb1ca630c 100755 --- a/liteidex/src/utils/vterm/vtermwidgetbase.h +++ b/liteidex/src/utils/vterm/vtermwidgetbase.h @@ -24,13 +24,14 @@ #ifndef VTERMWIDGETBASE_H #define VTERMWIDGETBASE_H +extern "C" { +#include "libvterm/include/vterm.h" +} + #include #include #include -extern "C" { -#include "libvterm/include/vterm.h" -} typedef struct {