From 6801690c2810e96f5501509158fbe69241a97a5c Mon Sep 17 00:00:00 2001 From: Syping Date: Tue, 28 Aug 2018 03:23:30 +0200 Subject: [PATCH] static builds should be fixed --- src/luaengine/luaengine.pro | 3 +-- src/luaengineapp/luaengineapp.pro | 2 ++ src/luaengineapp/main.cpp | 2 +- src/luaenginegui/luaengine/LuaEngineGui_global.h | 2 +- src/luaenginegui/luaenginegui.pro | 5 ++--- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/luaengine/luaengine.pro b/src/luaengine/luaengine.pro index ca1a7d9..be47fe6 100644 --- a/src/luaengine/luaengine.pro +++ b/src/luaengine/luaengine.pro @@ -16,10 +16,9 @@ #*****************************************************************************/ QT -= gui -CONFIG += c++11 - TARGET = luaengine TEMPLATE = lib +CONFIG += c++11 DEFINES += LUAENGINE_LIBRARY DEFINES += LUA_COMPAT_5_2 diff --git a/src/luaengineapp/luaengineapp.pro b/src/luaengineapp/luaengineapp.pro index 8d28529..5313339 100644 --- a/src/luaengineapp/luaengineapp.pro +++ b/src/luaengineapp/luaengineapp.pro @@ -19,6 +19,8 @@ QT += core network gui widgets TARGET = luaengineapp CONFIG += c++11 +static: DEFINES += LUAENGINE_STATIC + CONFIG(debug, debug|release): win32: LIBS += -L$$OUT_PWD/../luaengine/debug -lluaengine -L$$OUT_PWD/../luaenginegui/debug -lluaenginegui CONFIG(release, debug|release): win32: LIBS += -L$$OUT_PWD/../luaengine/release -lluaengine -L$$OUT_PWD/../luaenginegui/release -lluaenginegui unix: LIBS += -L$$OUT_PWD/../luaengine -lluaengine -L$$OUT_PWD/../luaenginegui -lluaenginegui diff --git a/src/luaengineapp/main.cpp b/src/luaengineapp/main.cpp index f0864fe..cd6df76 100644 --- a/src/luaengineapp/main.cpp +++ b/src/luaengineapp/main.cpp @@ -58,7 +58,7 @@ int main(int argc, char *argv[]) luaEngineGui.executeLuaScript(&luaScript); QVariantList arguments; - for (const QString argument : a.arguments()) { + for (const QString &argument : a.arguments()) { arguments << QVariant::fromValue(argument); } diff --git a/src/luaenginegui/luaengine/LuaEngineGui_global.h b/src/luaenginegui/luaengine/LuaEngineGui_global.h index 08dab34..e8d99a1 100644 --- a/src/luaenginegui/luaengine/LuaEngineGui_global.h +++ b/src/luaenginegui/luaengine/LuaEngineGui_global.h @@ -20,7 +20,7 @@ #include -#ifndef LUAENGINEGUI_STATIC +#ifndef LUAENGINE_STATIC #ifdef LUAENGINEGUI_LIBRARY #define LUAENGINEGUISHARED_EXPORT Q_DECL_EXPORT #else diff --git a/src/luaenginegui/luaenginegui.pro b/src/luaenginegui/luaenginegui.pro index a3a8950..cd8b661 100644 --- a/src/luaenginegui/luaenginegui.pro +++ b/src/luaenginegui/luaenginegui.pro @@ -16,13 +16,12 @@ #*****************************************************************************/ QT += core network gui widgets -CONFIG += c++11 - TARGET = luaenginegui TEMPLATE = lib +CONFIG += c++11 DEFINES += LUAENGINEGUI_LIBRARY -static: DEFINES += LUAENGINEGUI_STATIC +static: DEFINES += LUAENGINE_STATIC CONFIG(debug, debug|release): win32: LIBS += -L$$OUT_PWD/../luaengine/debug -lluaengine CONFIG(release, debug|release): win32: LIBS += -L$$OUT_PWD/../luaengine/release -lluaengine