fix compile

This commit is contained in:
Syping 2019-10-01 00:05:37 +02:00
parent 49545db0dc
commit bbfec42976
6 changed files with 48 additions and 7 deletions

View file

@ -1,6 +1,6 @@
#/***************************************************************************** #/*****************************************************************************
#* luaEngine Lua Engine for Qt #* luaEngine Lua Engine for Qt
#* Copyright (C) 2018 Syping #* Copyright (C) 2018-2019 Syping
#* #*
#* Licensed under the Apache License, Version 2.0 (the "License"); #* Licensed under the Apache License, Version 2.0 (the "License");
#* you may not use this file except in compliance with the License. #* you may not use this file except in compliance with the License.
@ -18,7 +18,9 @@
QT -= gui QT -= gui
TARGET = luaengine TARGET = luaengine
TEMPLATE = lib TEMPLATE = lib
CONFIG += c++11 CONFIG += c++11 \
skip_target_version_ext
VERSION = 0.1
DEFINES += LUAENGINE_LIBRARY DEFINES += LUAENGINE_LIBRARY
DEFINES += LUA_COMPAT_5_2 DEFINES += LUA_COMPAT_5_2
@ -96,3 +98,11 @@ HEADERS += \
lua/lundump.h \ lua/lundump.h \
lua/lvm.h \ lua/lvm.h \
lua/lzio.h lua/lzio.h
win32 {
RC_LANG = 0x0
QMAKE_TARGET_COMPANY = "Syping"
QMAKE_TARGET_DESCRIPTION = "LuaEngine Library"
QMAKE_TARGET_COPYRIGHT = "Copyright (c) 2018-2019 Syping"
QMAKE_TARGET_PRODUCT = "luaengine"
}

View file

@ -20,7 +20,8 @@
#include "LuaEngineGui_global.h" #include "LuaEngineGui_global.h"
#include "LuaEngine.h" #include "LuaEngine.h"
#include <QMetaMethod> #include <QWidget>
#include <QString>
#include <QObject> #include <QObject>
class LUAENGINEGUISHARED_EXPORT LuaEngineGui : public LuaEngine class LUAENGINEGUISHARED_EXPORT LuaEngineGui : public LuaEngine

View file

@ -18,7 +18,9 @@
QT += core gui widgets QT += core gui widgets
TARGET = luaenginegui TARGET = luaenginegui
TEMPLATE = lib TEMPLATE = lib
CONFIG += c++11 CONFIG += c++11 \
skip_target_version_ext
VERSION = 0.1
DEFINES += LUAENGINEGUI_LIBRARY DEFINES += LUAENGINEGUI_LIBRARY
static: DEFINES += LUAENGINE_STATIC static: DEFINES += LUAENGINE_STATIC
@ -37,3 +39,11 @@ SOURCES += \
HEADERS += \ HEADERS += \
luaengine/LuaEngineGui.h \ luaengine/LuaEngineGui.h \
luaengine/LuaEngineGui_global.h luaengine/LuaEngineGui_global.h
win32 {
RC_LANG = 0x0
QMAKE_TARGET_COMPANY = "Syping"
QMAKE_TARGET_DESCRIPTION = "LuaEngine Gui Library"
QMAKE_TARGET_COPYRIGHT = "Copyright (c) 2018-2019 Syping"
QMAKE_TARGET_PRODUCT = "luaenginegui"
}

View file

@ -15,12 +15,17 @@
* limitations under the License. * limitations under the License.
*****************************************************************************/ *****************************************************************************/
#include "LuaEngine_macro.h"
#include "LuaEngineOS.h" #include "LuaEngineOS.h"
#include <QTextStream> #include <QTextStream>
#include <QProcess> #include <QProcess>
#include <QObject> #include <QObject>
LuaEngineOS::LuaEngineOS(QObject *parent, bool loadBaseLibraries) : LuaEngine(parent, loadBaseLibraries)
{
L = luaState();
pushClass(L);
}
void LuaEngineOS::pushClass(lua_State *L_p) void LuaEngineOS::pushClass(lua_State *L_p)
{ {
// Process // Process

View file

@ -20,15 +20,20 @@
#include "LuaEngineOS_global.h" #include "LuaEngineOS_global.h"
#include "LuaEngine.h" #include "LuaEngine.h"
#include <QString>
#include <QObject>
class LUAENGINEOSSHARED_EXPORT LuaEngineOS class LUAENGINEOSSHARED_EXPORT LuaEngineOS : public LuaEngine
{ {
Q_OBJECT
public: public:
LuaEngineOS(QObject *parent = nullptr, bool loadBaseLibraries = true);
static void pushClass(lua_State *L_p); static void pushClass(lua_State *L_p);
static void pushClass(LuaEngine *luaEngine); static void pushClass(LuaEngine *luaEngine);
static int executeProcess(lua_State *L_p); static int executeProcess(lua_State *L_p);
private: private:
lua_State *L;
static QString nameForPointer(void *pointer); static QString nameForPointer(void *pointer);
}; };

View file

@ -18,7 +18,9 @@
QT += core QT += core
TARGET = luaengineos TARGET = luaengineos
TEMPLATE = lib TEMPLATE = lib
CONFIG += c++11 CONFIG += c++11 \
skip_target_version_ext
VERSION = 0.1
DEFINES += LUAENGINEOS_LIBRARY DEFINES += LUAENGINEOS_LIBRARY
static: DEFINES += LUAENGINE_STATIC static: DEFINES += LUAENGINE_STATIC
@ -37,3 +39,11 @@ SOURCES += \
HEADERS += \ HEADERS += \
luaengine/LuaEngineOS.h \ luaengine/LuaEngineOS.h \
luaengine/LuaEngineOS_global.h luaengine/LuaEngineOS_global.h
win32 {
RC_LANG = 0x0
QMAKE_TARGET_COMPANY = "Syping"
QMAKE_TARGET_DESCRIPTION = "LuaEngine OS Library"
QMAKE_TARGET_COPYRIGHT = "Copyright (c) 2019 Syping"
QMAKE_TARGET_PRODUCT = "luaengineos"
}