Syping/luaengineapp
1
0
Fork 0
mirror of https://gitlab.com/Syping/luaengineapp.git synced 2024-12-22 20:05:30 +01:00
Code Issues Projects Releases Wiki Activity

static builds should be fixed

Browse source
This commit is contained in:
Syping 2018-08-28 03:23:30 +02:00
parent 74d0e57ce0
commit 6801690c28
5 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/luaengine/luaengine.pro
View file

@ -16,10 +16,9 @@
#*****************************************************************************/ #*****************************************************************************/
QT -= gui QT -= gui
CONFIG += c++11
TARGET = luaengine TARGET = luaengine
TEMPLATE = lib TEMPLATE = lib
CONFIG += c++11
DEFINES += LUAENGINE_LIBRARY DEFINES += LUAENGINE_LIBRARY
DEFINES += LUA_COMPAT_5_2 DEFINES += LUA_COMPAT_5_2

2
src/luaengineapp/luaengineapp.pro
View file

@ -19,6 +19,8 @@ QT += core network gui widgets
TARGET = luaengineapp TARGET = luaengineapp
CONFIG += c++11 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(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 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 unix: LIBS += -L$$OUT_PWD/../luaengine -lluaengine -L$$OUT_PWD/../luaenginegui -lluaenginegui

2
src/luaengineapp/main.cpp
View file

@ -58,7 +58,7 @@ int main(int argc, char *argv[])
luaEngineGui.executeLuaScript(&luaScript); luaEngineGui.executeLuaScript(&luaScript);
QVariantList arguments; QVariantList arguments;
for (const QString argument : a.arguments()) { for (const QString &argument : a.arguments()) {
arguments << QVariant::fromValue(argument); arguments << QVariant::fromValue(argument);
} }

2
src/luaenginegui/luaengine/LuaEngineGui_global.h
View file

@ -20,7 +20,7 @@
#include <QtCore/qglobal.h> #include <QtCore/qglobal.h>
#ifndef LUAENGINEGUI_STATIC #ifndef LUAENGINE_STATIC
#ifdef LUAENGINEGUI_LIBRARY #ifdef LUAENGINEGUI_LIBRARY
#define LUAENGINEGUISHARED_EXPORT Q_DECL_EXPORT #define LUAENGINEGUISHARED_EXPORT Q_DECL_EXPORT
#else #else

5
src/luaenginegui/luaenginegui.pro
View file

@ -16,13 +16,12 @@
#*****************************************************************************/ #*****************************************************************************/
QT += core network gui widgets QT += core network gui widgets
CONFIG += c++11
TARGET = luaenginegui TARGET = luaenginegui
TEMPLATE = lib TEMPLATE = lib
CONFIG += c++11
DEFINES += LUAENGINEGUI_LIBRARY DEFINES += LUAENGINEGUI_LIBRARY
static: DEFINES += LUAENGINEGUI_STATIC static: DEFINES += LUAENGINE_STATIC
CONFIG(debug, debug|release): win32: LIBS += -L$$OUT_PWD/../luaengine/debug -lluaengine CONFIG(debug, debug|release): win32: LIBS += -L$$OUT_PWD/../luaengine/debug -lluaengine
CONFIG(release, debug|release): win32: LIBS += -L$$OUT_PWD/../luaengine/release -lluaengine CONFIG(release, debug|release): win32: LIBS += -L$$OUT_PWD/../luaengine/release -lluaengine