From df496eae9701954334119e8b76ad8d31894e3089 Mon Sep 17 00:00:00 2001 From: Syping Date: Sat, 12 Oct 2019 05:19:27 +0200 Subject: [PATCH] change structure --- .gitlab-ci.yml | 35 +++--- luaengineapp.pro => luaengine.pro | 0 src/luaengine/luaengine.pro | 103 +++-------------- src/{luaenginerun => luaengine}/main.cpp | 0 src/luaengineapp/luaengineapp.pro | 11 +- src/{luaengine => luaenginecore}/lua/lapi.c | 0 src/{luaengine => luaenginecore}/lua/lapi.h | 0 .../lua/lauxlib.c | 0 .../lua/lauxlib.h | 0 .../lua/lbaselib.c | 0 .../lua/lbitlib.c | 0 src/{luaengine => luaenginecore}/lua/lcode.c | 0 src/{luaengine => luaenginecore}/lua/lcode.h | 0 .../lua/lcorolib.c | 0 src/{luaengine => luaenginecore}/lua/lctype.c | 0 src/{luaengine => luaenginecore}/lua/lctype.h | 0 src/{luaengine => luaenginecore}/lua/ldblib.c | 0 src/{luaengine => luaenginecore}/lua/ldebug.c | 0 src/{luaengine => luaenginecore}/lua/ldebug.h | 0 src/{luaengine => luaenginecore}/lua/ldo.c | 0 src/{luaengine => luaenginecore}/lua/ldo.h | 0 src/{luaengine => luaenginecore}/lua/ldump.c | 0 src/{luaengine => luaenginecore}/lua/lfunc.c | 0 src/{luaengine => luaenginecore}/lua/lfunc.h | 0 src/{luaengine => luaenginecore}/lua/lgc.c | 0 src/{luaengine => luaenginecore}/lua/lgc.h | 0 src/{luaengine => luaenginecore}/lua/linit.c | 0 src/{luaengine => luaenginecore}/lua/liolib.c | 0 src/{luaengine => luaenginecore}/lua/llex.c | 0 src/{luaengine => luaenginecore}/lua/llex.h | 0 .../lua/llimits.h | 0 .../lua/lmathlib.c | 0 src/{luaengine => luaenginecore}/lua/lmem.c | 0 src/{luaengine => luaenginecore}/lua/lmem.h | 0 .../lua/loadlib.c | 0 .../lua/lobject.c | 0 .../lua/lobject.h | 0 .../lua/lopcodes.c | 0 .../lua/lopcodes.h | 0 src/{luaengine => luaenginecore}/lua/loslib.c | 0 .../lua/lparser.c | 0 .../lua/lparser.h | 0 .../lua/lprefix.h | 0 src/{luaengine => luaenginecore}/lua/lstate.c | 0 src/{luaengine => luaenginecore}/lua/lstate.h | 0 .../lua/lstring.c | 0 .../lua/lstring.h | 0 .../lua/lstrlib.c | 0 src/{luaengine => luaenginecore}/lua/ltable.c | 0 src/{luaengine => luaenginecore}/lua/ltable.h | 0 .../lua/ltablib.c | 0 src/{luaengine => luaenginecore}/lua/ltm.c | 0 src/{luaengine => luaenginecore}/lua/ltm.h | 0 src/{luaengine => luaenginecore}/lua/lua.h | 0 .../lua/luaconf.h | 0 src/{luaengine => luaenginecore}/lua/lualib.h | 0 .../lua/lundump.c | 0 .../lua/lundump.h | 0 .../lua/lutf8lib.c | 0 src/{luaengine => luaenginecore}/lua/lvm.c | 0 src/{luaengine => luaenginecore}/lua/lvm.h | 0 src/{luaengine => luaenginecore}/lua/lzio.c | 0 src/{luaengine => luaenginecore}/lua/lzio.h | 0 .../luaengine/LuaEngine.cpp | 0 .../luaengine/LuaEngine.h | 0 .../luaengine/LuaEngine_global.h | 0 .../luaengine/LuaEngine_macro.h | 0 src/luaenginecore/luaenginecore.pro | 108 ++++++++++++++++++ src/luaenginegui/luaenginegui.pro | 14 +-- src/luaengineio/luaengineio.pro | 14 +-- src/luaengineos/luaengineos.pro | 14 +-- src/luaenginerun/luaenginerun.pro | 36 ------ src/src.pro | 4 +- 73 files changed, 170 insertions(+), 169 deletions(-) rename luaengineapp.pro => luaengine.pro (100%) rename src/{luaenginerun => luaengine}/main.cpp (100%) rename src/{luaengine => luaenginecore}/lua/lapi.c (100%) rename src/{luaengine => luaenginecore}/lua/lapi.h (100%) rename src/{luaengine => luaenginecore}/lua/lauxlib.c (100%) rename src/{luaengine => luaenginecore}/lua/lauxlib.h (100%) rename src/{luaengine => luaenginecore}/lua/lbaselib.c (100%) rename src/{luaengine => luaenginecore}/lua/lbitlib.c (100%) rename src/{luaengine => luaenginecore}/lua/lcode.c (100%) rename src/{luaengine => luaenginecore}/lua/lcode.h (100%) rename src/{luaengine => luaenginecore}/lua/lcorolib.c (100%) rename src/{luaengine => luaenginecore}/lua/lctype.c (100%) rename src/{luaengine => luaenginecore}/lua/lctype.h (100%) rename src/{luaengine => luaenginecore}/lua/ldblib.c (100%) rename src/{luaengine => luaenginecore}/lua/ldebug.c (100%) rename src/{luaengine => luaenginecore}/lua/ldebug.h (100%) rename src/{luaengine => luaenginecore}/lua/ldo.c (100%) rename src/{luaengine => luaenginecore}/lua/ldo.h (100%) rename src/{luaengine => luaenginecore}/lua/ldump.c (100%) rename src/{luaengine => luaenginecore}/lua/lfunc.c (100%) rename src/{luaengine => luaenginecore}/lua/lfunc.h (100%) rename src/{luaengine => luaenginecore}/lua/lgc.c (100%) rename src/{luaengine => luaenginecore}/lua/lgc.h (100%) rename src/{luaengine => luaenginecore}/lua/linit.c (100%) rename src/{luaengine => luaenginecore}/lua/liolib.c (100%) rename src/{luaengine => luaenginecore}/lua/llex.c (100%) rename src/{luaengine => luaenginecore}/lua/llex.h (100%) rename src/{luaengine => luaenginecore}/lua/llimits.h (100%) rename src/{luaengine => luaenginecore}/lua/lmathlib.c (100%) rename src/{luaengine => luaenginecore}/lua/lmem.c (100%) rename src/{luaengine => luaenginecore}/lua/lmem.h (100%) rename src/{luaengine => luaenginecore}/lua/loadlib.c (100%) rename src/{luaengine => luaenginecore}/lua/lobject.c (100%) rename src/{luaengine => luaenginecore}/lua/lobject.h (100%) rename src/{luaengine => luaenginecore}/lua/lopcodes.c (100%) rename src/{luaengine => luaenginecore}/lua/lopcodes.h (100%) rename src/{luaengine => luaenginecore}/lua/loslib.c (100%) rename src/{luaengine => luaenginecore}/lua/lparser.c (100%) rename src/{luaengine => luaenginecore}/lua/lparser.h (100%) rename src/{luaengine => luaenginecore}/lua/lprefix.h (100%) rename src/{luaengine => luaenginecore}/lua/lstate.c (100%) rename src/{luaengine => luaenginecore}/lua/lstate.h (100%) rename src/{luaengine => luaenginecore}/lua/lstring.c (100%) rename src/{luaengine => luaenginecore}/lua/lstring.h (100%) rename src/{luaengine => luaenginecore}/lua/lstrlib.c (100%) rename src/{luaengine => luaenginecore}/lua/ltable.c (100%) rename src/{luaengine => luaenginecore}/lua/ltable.h (100%) rename src/{luaengine => luaenginecore}/lua/ltablib.c (100%) rename src/{luaengine => luaenginecore}/lua/ltm.c (100%) rename src/{luaengine => luaenginecore}/lua/ltm.h (100%) rename src/{luaengine => luaenginecore}/lua/lua.h (100%) rename src/{luaengine => luaenginecore}/lua/luaconf.h (100%) rename src/{luaengine => luaenginecore}/lua/lualib.h (100%) rename src/{luaengine => luaenginecore}/lua/lundump.c (100%) rename src/{luaengine => luaenginecore}/lua/lundump.h (100%) rename src/{luaengine => luaenginecore}/lua/lutf8lib.c (100%) rename src/{luaengine => luaenginecore}/lua/lvm.c (100%) rename src/{luaengine => luaenginecore}/lua/lvm.h (100%) rename src/{luaengine => luaenginecore}/lua/lzio.c (100%) rename src/{luaengine => luaenginecore}/lua/lzio.h (100%) rename src/{luaengine => luaenginecore}/luaengine/LuaEngine.cpp (100%) rename src/{luaengine => luaenginecore}/luaengine/LuaEngine.h (100%) rename src/{luaengine => luaenginecore}/luaengine/LuaEngine_global.h (100%) rename src/{luaengine => luaenginecore}/luaengine/LuaEngine_macro.h (100%) create mode 100644 src/luaenginecore/luaenginecore.pro delete mode 100644 src/luaenginerun/luaenginerun.pro diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 50bc7ab..afc27de 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,7 +2,7 @@ stages: - build - deploy -luaengine: +LuaEngine Windows: stage: build image: syping/qt5-shared-mingw-openssl:5.12.5 variables: @@ -10,23 +10,23 @@ luaengine: script: - mkdir -p build - cd build - - qmake CONFIG+=WITH_LUAENGINERUN ../luaengineapp.pro + - qmake CONFIG+=WITH_LUAENGINERUN ../luaengine.pro - make -j4 - - cp -Rf src/luaengine/release/luaengine.dll ../ - - cp -Rf src/luaenginerun/release/luaengine.exe ../ - - cp -Rf src/luaenginegui/release/luaenginegui.dll ../ - - cp -Rf src/luaengineio/release/luaengineio.dll ../ - - cp -Rf src/luaengineos/release/luaengineos.dll ../ + - cp -Rf src/luaenginecore/release/LuaEngine.dll ../ + - cp -Rf src/luaenginegui/release/LuaEngineGui.dll ../ + - cp -Rf src/luaengineio/release/LuaEngineIO.dll ../ + - cp -Rf src/luaengineos/release/LuaEngineOS.dll ../ + - cp -Rf src/luaengine/release/LuaEngine.exe ../ - cd .. artifacts: paths: - - "luaengine.dll" - - "luaengine.exe" - - "luaenginegui.dll" - - "luaengineio.dll" - - "luaengineos.dll" + - "LuaEngine.dll" + - "LuaEngine.exe" + - "LuaEngineGui.dll" + - "LuaEngineIO.dll" + - "LuaEngineOS.dll" -luaengineapp: +LuaEngineApp: stage: build image: syping/qt5-static-mingw-openssl:5.12.5 variables: @@ -36,11 +36,11 @@ luaengineapp: - cd build - qmake-static CONFIG+=WITH_LUAENGINEAPP ../luaengineapp.pro - make -j4 - - cp -Rf src/luaengineapp/release/luaengineapp.exe ../ + - cp -Rf src/luaengineapp/release/LuaEngineApp.exe ../ - cd .. artifacts: paths: - - "luaengineapp.exe" + - "LuaEngineApp.exe" LuaEngine Setup: stage: deploy @@ -48,11 +48,10 @@ LuaEngine Setup: script: - apt-get update -qq - apt-get install nsis -qq - - nsis artifacts: name: "luaengine-$CI_COMMIT_REF_NAME-${CI_COMMIT_SHA:0:8}" paths: - "luaengine_setup.exe" dependencies: - - luaengine - - luaengineapp + - LuaEngine Windows + - LuaEngineApp diff --git a/luaengineapp.pro b/luaengine.pro similarity index 100% rename from luaengineapp.pro rename to luaengine.pro diff --git a/src/luaengine/luaengine.pro b/src/luaengine/luaengine.pro index 5dceb76..70df17c 100644 --- a/src/luaengine/luaengine.pro +++ b/src/luaengine/luaengine.pro @@ -1,6 +1,6 @@ #/***************************************************************************** #* luaEngine Lua Engine for Qt -#* Copyright (C) 2018-2019 Syping +#* Copyright (C) 2019 Syping #* #* Licensed under the Apache License, Version 2.0 (the "License"); #* you may not use this file except in compliance with the License. @@ -15,94 +15,23 @@ #* limitations under the License. #*****************************************************************************/ -QT -= gui +QT += core gui widgets TARGET = luaengine -TEMPLATE = lib -CONFIG += c++11 \ - skip_target_version_ext -VERSION = 0.1 +win32: TARGET = LuaEngine +CONFIG += c++11 -DEFINES += LUAENGINE_LIBRARY -DEFINES += LUA_COMPAT_5_2 -shared: win32: DEFINES += LUA_BUILD_AS_DLL static: DEFINES += LUAENGINE_STATIC -linux: DEFINES += LUA_USE_LINUX -gcc: QMAKE_CFLAGS += -Wno-cast-function-type + +CONFIG(debug, debug|release): win32: LIBS += -L$$OUT_PWD/../luaengineos/debug -lLuaEngineOS -L$$OUT_PWD/../luaengineio/debug -lLuaEngineIO -L$$OUT_PWD/../luaenginegui/debug -lLuaEngineGui -L$$OUT_PWD/../luaenginecore/debug -lLuaEngine +CONFIG(release, debug|release): win32: LIBS += -L$$OUT_PWD/../luaengineos/release -lLuaEngineOS -L$$OUT_PWD/../luaengineio/release -lLuaEngineIO -L$$OUT_PWD/../luaenginegui/release -lLuaEngineGui -L$$OUT_PWD/../luaenginecore/release -lLuaEngine +unix: LIBS += -L$$OUT_PWD/../luaengineos -lLuaEngineOS -L$$OUT_PWD/../luaengineio -lLuaEngineIO -L$$OUT_PWD/../luaenginegui -lLuaEngineGui -L$$OUT_PWD/../luaenginecore -lLuaEngine + +INCLUDEPATH += \ + ../luaenginecore/lua \ + ../luaenginecore/luaengine \ + ../luaenginegui/luaengine \ + ../luaengineio/luaengine \ + ../luaengineos/luaengine SOURCES += \ - luaengine/LuaEngine.cpp - -HEADERS += \ - luaengine/LuaEngine.h \ - luaengine/LuaEngine_global.h \ - luaengine/LuaEngine_macro.h - -SOURCES += \ - lua/lapi.c \ - lua/lauxlib.c \ - lua/lbaselib.c \ - lua/lbitlib.c \ - lua/lcode.c \ - lua/lcorolib.c \ - lua/lctype.c \ - lua/ldblib.c \ - lua/ldebug.c \ - lua/ldo.c \ - lua/ldump.c \ - lua/lfunc.c \ - lua/lgc.c \ - lua/linit.c \ - lua/liolib.c \ - lua/llex.c \ - lua/lmathlib.c \ - lua/lmem.c \ - lua/loadlib.c \ - lua/lobject.c \ - lua/lopcodes.c \ - lua/loslib.c \ - lua/lparser.c \ - lua/lstate.c \ - lua/lstring.c \ - lua/lstrlib.c \ - lua/ltable.c \ - lua/ltablib.c \ - lua/ltm.c \ - lua/lundump.c \ - lua/lutf8lib.c \ - lua/lvm.c \ - lua/lzio.c - -HEADERS += \ - lua/lapi.h \ - lua/lauxlib.h \ - lua/lcode.h \ - lua/lctype.h \ - lua/ldebug.h \ - lua/ldo.h \ - lua/lfunc.h \ - lua/lgc.h \ - lua/llex.h \ - lua/llimits.h \ - lua/lmem.h \ - lua/lobject.h \ - lua/lopcodes.h \ - lua/lparser.h \ - lua/lprefix.h \ - lua/lstate.h \ - lua/lstring.h \ - lua/ltable.h \ - lua/ltm.h \ - lua/lua.h \ - lua/luaconf.h \ - lua/lualib.h \ - lua/lundump.h \ - lua/lvm.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" -} + main.cpp diff --git a/src/luaenginerun/main.cpp b/src/luaengine/main.cpp similarity index 100% rename from src/luaenginerun/main.cpp rename to src/luaengine/main.cpp diff --git a/src/luaengineapp/luaengineapp.pro b/src/luaengineapp/luaengineapp.pro index 7512de1..ebdf88e 100644 --- a/src/luaengineapp/luaengineapp.pro +++ b/src/luaengineapp/luaengineapp.pro @@ -17,17 +17,18 @@ QT += core gui widgets TARGET = luaengineapp +win32: TARGET = LuaEngineApp CONFIG += c++11 static: DEFINES += LUAENGINE_STATIC -CONFIG(debug, debug|release): win32: LIBS += -L$$OUT_PWD/../luaengineos/debug -lluaengineos -L$$OUT_PWD/../luaengineio/debug -lluaengineio -L$$OUT_PWD/../luaenginegui/debug -lluaenginegui -L$$OUT_PWD/../luaengine/debug -lluaengine -CONFIG(release, debug|release): win32: LIBS += -L$$OUT_PWD/../luaengineos/release -lluaengineos -L$$OUT_PWD/../luaengineio/release -lluaengineio -L$$OUT_PWD/../luaenginegui/release -lluaenginegui -L$$OUT_PWD/../luaengine/release -lluaengine -unix: LIBS += -L$$OUT_PWD/../luaengineos -lluaengineos -L$$OUT_PWD/../luaengineio -lluaengineio -L$$OUT_PWD/../luaenginegui -lluaenginegui -L$$OUT_PWD/../luaengine -lluaengine +CONFIG(debug, debug|release): win32: LIBS += -L$$OUT_PWD/../luaengineos/debug -lLuaEngineOS -L$$OUT_PWD/../luaengineio/debug -lLuaEngineIO -L$$OUT_PWD/../luaenginegui/debug -lLuaEngineGui -L$$OUT_PWD/../luaenginecore/debug -lLuaEngine +CONFIG(release, debug|release): win32: LIBS += -L$$OUT_PWD/../luaengineos/release -lLuaEngineOS -L$$OUT_PWD/../luaengineio/release -lLuaEngineIO -L$$OUT_PWD/../luaenginegui/release -lLuaEngineGui -L$$OUT_PWD/../luaenginecore/release -lLuaEngine +unix: LIBS += -L$$OUT_PWD/../luaengineos -lLuaEngineOS -L$$OUT_PWD/../luaengineio -lLuaEngineIO -L$$OUT_PWD/../luaenginegui -lLuaEngineGui -L$$OUT_PWD/../luaenginecore -lLuaEngine INCLUDEPATH += \ - ../luaengine/lua \ - ../luaengine/luaengine \ + ../luaenginecore/lua \ + ../luaenginecore/luaengine \ ../luaenginegui/luaengine \ ../luaengineio/luaengine \ ../luaengineos/luaengine diff --git a/src/luaengine/lua/lapi.c b/src/luaenginecore/lua/lapi.c similarity index 100% rename from src/luaengine/lua/lapi.c rename to src/luaenginecore/lua/lapi.c diff --git a/src/luaengine/lua/lapi.h b/src/luaenginecore/lua/lapi.h similarity index 100% rename from src/luaengine/lua/lapi.h rename to src/luaenginecore/lua/lapi.h diff --git a/src/luaengine/lua/lauxlib.c b/src/luaenginecore/lua/lauxlib.c similarity index 100% rename from src/luaengine/lua/lauxlib.c rename to src/luaenginecore/lua/lauxlib.c diff --git a/src/luaengine/lua/lauxlib.h b/src/luaenginecore/lua/lauxlib.h similarity index 100% rename from src/luaengine/lua/lauxlib.h rename to src/luaenginecore/lua/lauxlib.h diff --git a/src/luaengine/lua/lbaselib.c b/src/luaenginecore/lua/lbaselib.c similarity index 100% rename from src/luaengine/lua/lbaselib.c rename to src/luaenginecore/lua/lbaselib.c diff --git a/src/luaengine/lua/lbitlib.c b/src/luaenginecore/lua/lbitlib.c similarity index 100% rename from src/luaengine/lua/lbitlib.c rename to src/luaenginecore/lua/lbitlib.c diff --git a/src/luaengine/lua/lcode.c b/src/luaenginecore/lua/lcode.c similarity index 100% rename from src/luaengine/lua/lcode.c rename to src/luaenginecore/lua/lcode.c diff --git a/src/luaengine/lua/lcode.h b/src/luaenginecore/lua/lcode.h similarity index 100% rename from src/luaengine/lua/lcode.h rename to src/luaenginecore/lua/lcode.h diff --git a/src/luaengine/lua/lcorolib.c b/src/luaenginecore/lua/lcorolib.c similarity index 100% rename from src/luaengine/lua/lcorolib.c rename to src/luaenginecore/lua/lcorolib.c diff --git a/src/luaengine/lua/lctype.c b/src/luaenginecore/lua/lctype.c similarity index 100% rename from src/luaengine/lua/lctype.c rename to src/luaenginecore/lua/lctype.c diff --git a/src/luaengine/lua/lctype.h b/src/luaenginecore/lua/lctype.h similarity index 100% rename from src/luaengine/lua/lctype.h rename to src/luaenginecore/lua/lctype.h diff --git a/src/luaengine/lua/ldblib.c b/src/luaenginecore/lua/ldblib.c similarity index 100% rename from src/luaengine/lua/ldblib.c rename to src/luaenginecore/lua/ldblib.c diff --git a/src/luaengine/lua/ldebug.c b/src/luaenginecore/lua/ldebug.c similarity index 100% rename from src/luaengine/lua/ldebug.c rename to src/luaenginecore/lua/ldebug.c diff --git a/src/luaengine/lua/ldebug.h b/src/luaenginecore/lua/ldebug.h similarity index 100% rename from src/luaengine/lua/ldebug.h rename to src/luaenginecore/lua/ldebug.h diff --git a/src/luaengine/lua/ldo.c b/src/luaenginecore/lua/ldo.c similarity index 100% rename from src/luaengine/lua/ldo.c rename to src/luaenginecore/lua/ldo.c diff --git a/src/luaengine/lua/ldo.h b/src/luaenginecore/lua/ldo.h similarity index 100% rename from src/luaengine/lua/ldo.h rename to src/luaenginecore/lua/ldo.h diff --git a/src/luaengine/lua/ldump.c b/src/luaenginecore/lua/ldump.c similarity index 100% rename from src/luaengine/lua/ldump.c rename to src/luaenginecore/lua/ldump.c diff --git a/src/luaengine/lua/lfunc.c b/src/luaenginecore/lua/lfunc.c similarity index 100% rename from src/luaengine/lua/lfunc.c rename to src/luaenginecore/lua/lfunc.c diff --git a/src/luaengine/lua/lfunc.h b/src/luaenginecore/lua/lfunc.h similarity index 100% rename from src/luaengine/lua/lfunc.h rename to src/luaenginecore/lua/lfunc.h diff --git a/src/luaengine/lua/lgc.c b/src/luaenginecore/lua/lgc.c similarity index 100% rename from src/luaengine/lua/lgc.c rename to src/luaenginecore/lua/lgc.c diff --git a/src/luaengine/lua/lgc.h b/src/luaenginecore/lua/lgc.h similarity index 100% rename from src/luaengine/lua/lgc.h rename to src/luaenginecore/lua/lgc.h diff --git a/src/luaengine/lua/linit.c b/src/luaenginecore/lua/linit.c similarity index 100% rename from src/luaengine/lua/linit.c rename to src/luaenginecore/lua/linit.c diff --git a/src/luaengine/lua/liolib.c b/src/luaenginecore/lua/liolib.c similarity index 100% rename from src/luaengine/lua/liolib.c rename to src/luaenginecore/lua/liolib.c diff --git a/src/luaengine/lua/llex.c b/src/luaenginecore/lua/llex.c similarity index 100% rename from src/luaengine/lua/llex.c rename to src/luaenginecore/lua/llex.c diff --git a/src/luaengine/lua/llex.h b/src/luaenginecore/lua/llex.h similarity index 100% rename from src/luaengine/lua/llex.h rename to src/luaenginecore/lua/llex.h diff --git a/src/luaengine/lua/llimits.h b/src/luaenginecore/lua/llimits.h similarity index 100% rename from src/luaengine/lua/llimits.h rename to src/luaenginecore/lua/llimits.h diff --git a/src/luaengine/lua/lmathlib.c b/src/luaenginecore/lua/lmathlib.c similarity index 100% rename from src/luaengine/lua/lmathlib.c rename to src/luaenginecore/lua/lmathlib.c diff --git a/src/luaengine/lua/lmem.c b/src/luaenginecore/lua/lmem.c similarity index 100% rename from src/luaengine/lua/lmem.c rename to src/luaenginecore/lua/lmem.c diff --git a/src/luaengine/lua/lmem.h b/src/luaenginecore/lua/lmem.h similarity index 100% rename from src/luaengine/lua/lmem.h rename to src/luaenginecore/lua/lmem.h diff --git a/src/luaengine/lua/loadlib.c b/src/luaenginecore/lua/loadlib.c similarity index 100% rename from src/luaengine/lua/loadlib.c rename to src/luaenginecore/lua/loadlib.c diff --git a/src/luaengine/lua/lobject.c b/src/luaenginecore/lua/lobject.c similarity index 100% rename from src/luaengine/lua/lobject.c rename to src/luaenginecore/lua/lobject.c diff --git a/src/luaengine/lua/lobject.h b/src/luaenginecore/lua/lobject.h similarity index 100% rename from src/luaengine/lua/lobject.h rename to src/luaenginecore/lua/lobject.h diff --git a/src/luaengine/lua/lopcodes.c b/src/luaenginecore/lua/lopcodes.c similarity index 100% rename from src/luaengine/lua/lopcodes.c rename to src/luaenginecore/lua/lopcodes.c diff --git a/src/luaengine/lua/lopcodes.h b/src/luaenginecore/lua/lopcodes.h similarity index 100% rename from src/luaengine/lua/lopcodes.h rename to src/luaenginecore/lua/lopcodes.h diff --git a/src/luaengine/lua/loslib.c b/src/luaenginecore/lua/loslib.c similarity index 100% rename from src/luaengine/lua/loslib.c rename to src/luaenginecore/lua/loslib.c diff --git a/src/luaengine/lua/lparser.c b/src/luaenginecore/lua/lparser.c similarity index 100% rename from src/luaengine/lua/lparser.c rename to src/luaenginecore/lua/lparser.c diff --git a/src/luaengine/lua/lparser.h b/src/luaenginecore/lua/lparser.h similarity index 100% rename from src/luaengine/lua/lparser.h rename to src/luaenginecore/lua/lparser.h diff --git a/src/luaengine/lua/lprefix.h b/src/luaenginecore/lua/lprefix.h similarity index 100% rename from src/luaengine/lua/lprefix.h rename to src/luaenginecore/lua/lprefix.h diff --git a/src/luaengine/lua/lstate.c b/src/luaenginecore/lua/lstate.c similarity index 100% rename from src/luaengine/lua/lstate.c rename to src/luaenginecore/lua/lstate.c diff --git a/src/luaengine/lua/lstate.h b/src/luaenginecore/lua/lstate.h similarity index 100% rename from src/luaengine/lua/lstate.h rename to src/luaenginecore/lua/lstate.h diff --git a/src/luaengine/lua/lstring.c b/src/luaenginecore/lua/lstring.c similarity index 100% rename from src/luaengine/lua/lstring.c rename to src/luaenginecore/lua/lstring.c diff --git a/src/luaengine/lua/lstring.h b/src/luaenginecore/lua/lstring.h similarity index 100% rename from src/luaengine/lua/lstring.h rename to src/luaenginecore/lua/lstring.h diff --git a/src/luaengine/lua/lstrlib.c b/src/luaenginecore/lua/lstrlib.c similarity index 100% rename from src/luaengine/lua/lstrlib.c rename to src/luaenginecore/lua/lstrlib.c diff --git a/src/luaengine/lua/ltable.c b/src/luaenginecore/lua/ltable.c similarity index 100% rename from src/luaengine/lua/ltable.c rename to src/luaenginecore/lua/ltable.c diff --git a/src/luaengine/lua/ltable.h b/src/luaenginecore/lua/ltable.h similarity index 100% rename from src/luaengine/lua/ltable.h rename to src/luaenginecore/lua/ltable.h diff --git a/src/luaengine/lua/ltablib.c b/src/luaenginecore/lua/ltablib.c similarity index 100% rename from src/luaengine/lua/ltablib.c rename to src/luaenginecore/lua/ltablib.c diff --git a/src/luaengine/lua/ltm.c b/src/luaenginecore/lua/ltm.c similarity index 100% rename from src/luaengine/lua/ltm.c rename to src/luaenginecore/lua/ltm.c diff --git a/src/luaengine/lua/ltm.h b/src/luaenginecore/lua/ltm.h similarity index 100% rename from src/luaengine/lua/ltm.h rename to src/luaenginecore/lua/ltm.h diff --git a/src/luaengine/lua/lua.h b/src/luaenginecore/lua/lua.h similarity index 100% rename from src/luaengine/lua/lua.h rename to src/luaenginecore/lua/lua.h diff --git a/src/luaengine/lua/luaconf.h b/src/luaenginecore/lua/luaconf.h similarity index 100% rename from src/luaengine/lua/luaconf.h rename to src/luaenginecore/lua/luaconf.h diff --git a/src/luaengine/lua/lualib.h b/src/luaenginecore/lua/lualib.h similarity index 100% rename from src/luaengine/lua/lualib.h rename to src/luaenginecore/lua/lualib.h diff --git a/src/luaengine/lua/lundump.c b/src/luaenginecore/lua/lundump.c similarity index 100% rename from src/luaengine/lua/lundump.c rename to src/luaenginecore/lua/lundump.c diff --git a/src/luaengine/lua/lundump.h b/src/luaenginecore/lua/lundump.h similarity index 100% rename from src/luaengine/lua/lundump.h rename to src/luaenginecore/lua/lundump.h diff --git a/src/luaengine/lua/lutf8lib.c b/src/luaenginecore/lua/lutf8lib.c similarity index 100% rename from src/luaengine/lua/lutf8lib.c rename to src/luaenginecore/lua/lutf8lib.c diff --git a/src/luaengine/lua/lvm.c b/src/luaenginecore/lua/lvm.c similarity index 100% rename from src/luaengine/lua/lvm.c rename to src/luaenginecore/lua/lvm.c diff --git a/src/luaengine/lua/lvm.h b/src/luaenginecore/lua/lvm.h similarity index 100% rename from src/luaengine/lua/lvm.h rename to src/luaenginecore/lua/lvm.h diff --git a/src/luaengine/lua/lzio.c b/src/luaenginecore/lua/lzio.c similarity index 100% rename from src/luaengine/lua/lzio.c rename to src/luaenginecore/lua/lzio.c diff --git a/src/luaengine/lua/lzio.h b/src/luaenginecore/lua/lzio.h similarity index 100% rename from src/luaengine/lua/lzio.h rename to src/luaenginecore/lua/lzio.h diff --git a/src/luaengine/luaengine/LuaEngine.cpp b/src/luaenginecore/luaengine/LuaEngine.cpp similarity index 100% rename from src/luaengine/luaengine/LuaEngine.cpp rename to src/luaenginecore/luaengine/LuaEngine.cpp diff --git a/src/luaengine/luaengine/LuaEngine.h b/src/luaenginecore/luaengine/LuaEngine.h similarity index 100% rename from src/luaengine/luaengine/LuaEngine.h rename to src/luaenginecore/luaengine/LuaEngine.h diff --git a/src/luaengine/luaengine/LuaEngine_global.h b/src/luaenginecore/luaengine/LuaEngine_global.h similarity index 100% rename from src/luaengine/luaengine/LuaEngine_global.h rename to src/luaenginecore/luaengine/LuaEngine_global.h diff --git a/src/luaengine/luaengine/LuaEngine_macro.h b/src/luaenginecore/luaengine/LuaEngine_macro.h similarity index 100% rename from src/luaengine/luaengine/LuaEngine_macro.h rename to src/luaenginecore/luaengine/LuaEngine_macro.h diff --git a/src/luaenginecore/luaenginecore.pro b/src/luaenginecore/luaenginecore.pro new file mode 100644 index 0000000..87e4b81 --- /dev/null +++ b/src/luaenginecore/luaenginecore.pro @@ -0,0 +1,108 @@ +#/***************************************************************************** +#* luaEngine Lua Engine for Qt +#* Copyright (C) 2018-2019 Syping +#* +#* Licensed under the Apache License, Version 2.0 (the "License"); +#* you may not use this file except in compliance with the License. +#* You may obtain a copy of the License at +#* +#* http://www.apache.org/licenses/LICENSE-2.0 +#* +#* Unless required by applicable law or agreed to in writing, software +#* distributed under the License is distributed on an "AS IS" BASIS, +#* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +#* See the License for the specific language governing permissions and +#* limitations under the License. +#*****************************************************************************/ + +QT -= gui +TARGET = LuaEngine +TEMPLATE = lib +CONFIG += c++11 \ + skip_target_version_ext +VERSION = 0.1 + +DEFINES += LUAENGINE_LIBRARY +DEFINES += LUA_COMPAT_5_2 +shared: win32: DEFINES += LUA_BUILD_AS_DLL +static: DEFINES += LUAENGINE_STATIC +linux: DEFINES += LUA_USE_LINUX +gcc: QMAKE_CFLAGS += -Wno-cast-function-type + +SOURCES += \ + luaengine/LuaEngine.cpp + +HEADERS += \ + luaengine/LuaEngine.h \ + luaengine/LuaEngine_global.h \ + luaengine/LuaEngine_macro.h + +SOURCES += \ + lua/lapi.c \ + lua/lauxlib.c \ + lua/lbaselib.c \ + lua/lbitlib.c \ + lua/lcode.c \ + lua/lcorolib.c \ + lua/lctype.c \ + lua/ldblib.c \ + lua/ldebug.c \ + lua/ldo.c \ + lua/ldump.c \ + lua/lfunc.c \ + lua/lgc.c \ + lua/linit.c \ + lua/liolib.c \ + lua/llex.c \ + lua/lmathlib.c \ + lua/lmem.c \ + lua/loadlib.c \ + lua/lobject.c \ + lua/lopcodes.c \ + lua/loslib.c \ + lua/lparser.c \ + lua/lstate.c \ + lua/lstring.c \ + lua/lstrlib.c \ + lua/ltable.c \ + lua/ltablib.c \ + lua/ltm.c \ + lua/lundump.c \ + lua/lutf8lib.c \ + lua/lvm.c \ + lua/lzio.c + +HEADERS += \ + lua/lapi.h \ + lua/lauxlib.h \ + lua/lcode.h \ + lua/lctype.h \ + lua/ldebug.h \ + lua/ldo.h \ + lua/lfunc.h \ + lua/lgc.h \ + lua/llex.h \ + lua/llimits.h \ + lua/lmem.h \ + lua/lobject.h \ + lua/lopcodes.h \ + lua/lparser.h \ + lua/lprefix.h \ + lua/lstate.h \ + lua/lstring.h \ + lua/ltable.h \ + lua/ltm.h \ + lua/lua.h \ + lua/luaconf.h \ + lua/lualib.h \ + lua/lundump.h \ + lua/lvm.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" +} diff --git a/src/luaenginegui/luaenginegui.pro b/src/luaenginegui/luaenginegui.pro index d7f7979..805e9f0 100644 --- a/src/luaenginegui/luaenginegui.pro +++ b/src/luaenginegui/luaenginegui.pro @@ -16,7 +16,7 @@ #*****************************************************************************/ QT += core gui widgets -TARGET = luaenginegui +TARGET = LuaEngineGui TEMPLATE = lib CONFIG += c++11 \ skip_target_version_ext @@ -25,13 +25,13 @@ VERSION = 0.1 DEFINES += LUAENGINEGUI_LIBRARY 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 -unix: LIBS += -L$$OUT_PWD/../luaengine -lluaengine +CONFIG(debug, debug|release): win32: LIBS += -L$$OUT_PWD/../luaenginecore/debug -lLuaEngine +CONFIG(release, debug|release): win32: LIBS += -L$$OUT_PWD/../luaenginecore/release -lLuaEngine +unix: LIBS += -L$$OUT_PWD/../luaenginecore -lLuaEngine INCLUDEPATH += \ - ../luaengine/lua \ - ../luaengine/luaengine + ../luaenginecore/lua \ + ../luaenginecore/luaengine SOURCES += \ luaengine/LuaEngineGui.cpp @@ -45,5 +45,5 @@ win32 { QMAKE_TARGET_COMPANY = "Syping" QMAKE_TARGET_DESCRIPTION = "LuaEngine Gui Library" QMAKE_TARGET_COPYRIGHT = "Copyright (c) 2018-2019 Syping" - QMAKE_TARGET_PRODUCT = "luaenginegui" + QMAKE_TARGET_PRODUCT = "LuaEngineGui" } diff --git a/src/luaengineio/luaengineio.pro b/src/luaengineio/luaengineio.pro index 1edd56a..4909f83 100644 --- a/src/luaengineio/luaengineio.pro +++ b/src/luaengineio/luaengineio.pro @@ -16,7 +16,7 @@ #*****************************************************************************/ QT += core -TARGET = luaengineio +TARGET = LuaEngineIO TEMPLATE = lib CONFIG += c++11 \ skip_target_version_ext @@ -25,13 +25,13 @@ VERSION = 0.1 DEFINES += LUAENGINEIO_LIBRARY 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 -unix: LIBS += -L$$OUT_PWD/../luaengine -lluaengine +CONFIG(debug, debug|release): win32: LIBS += -L$$OUT_PWD/../luaenginecore/debug -lLuaEngine +CONFIG(release, debug|release): win32: LIBS += -L$$OUT_PWD/../luaenginecore/release -lLuaEngine +unix: LIBS += -L$$OUT_PWD/../luaenginecore -lLuaEngine INCLUDEPATH += \ - ../luaengine/lua \ - ../luaengine/luaengine + ../luaenginecore/lua \ + ../luaenginecore/luaengine SOURCES += \ luaengine/LuaEngineIO.cpp @@ -45,5 +45,5 @@ win32 { QMAKE_TARGET_COMPANY = "Syping" QMAKE_TARGET_DESCRIPTION = "LuaEngine I/O Library" QMAKE_TARGET_COPYRIGHT = "Copyright (c) 2019 Syping" - QMAKE_TARGET_PRODUCT = "luaengineio" + QMAKE_TARGET_PRODUCT = "LuaEngineIO" } diff --git a/src/luaengineos/luaengineos.pro b/src/luaengineos/luaengineos.pro index 1cb6a8f..4edacf9 100644 --- a/src/luaengineos/luaengineos.pro +++ b/src/luaengineos/luaengineos.pro @@ -16,7 +16,7 @@ #*****************************************************************************/ QT += core -TARGET = luaengineos +TARGET = LuaEngineOS TEMPLATE = lib CONFIG += c++11 \ skip_target_version_ext @@ -25,13 +25,13 @@ VERSION = 0.1 DEFINES += LUAENGINEOS_LIBRARY 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 -unix: LIBS += -L$$OUT_PWD/../luaengine -lluaengine +CONFIG(debug, debug|release): win32: LIBS += -L$$OUT_PWD/../luaenginecore/debug -lLuaEngine +CONFIG(release, debug|release): win32: LIBS += -L$$OUT_PWD/../luaenginecore/release -lLuaEngine +unix: LIBS += -L$$OUT_PWD/../luaenginecore -lLuaEngine INCLUDEPATH += \ - ../luaengine/lua \ - ../luaengine/luaengine + ../luaenginecore/lua \ + ../luaenginecore/luaengine SOURCES += \ luaengine/LuaEngineOS.cpp @@ -45,5 +45,5 @@ win32 { QMAKE_TARGET_COMPANY = "Syping" QMAKE_TARGET_DESCRIPTION = "LuaEngine OS Library" QMAKE_TARGET_COPYRIGHT = "Copyright (c) 2019 Syping" - QMAKE_TARGET_PRODUCT = "luaengineos" + QMAKE_TARGET_PRODUCT = "LuaEngineOS" } diff --git a/src/luaenginerun/luaenginerun.pro b/src/luaenginerun/luaenginerun.pro deleted file mode 100644 index 25e77e5..0000000 --- a/src/luaenginerun/luaenginerun.pro +++ /dev/null @@ -1,36 +0,0 @@ -#/***************************************************************************** -#* luaEngine Lua Engine for Qt -#* Copyright (C) 2019 Syping -#* -#* Licensed under the Apache License, Version 2.0 (the "License"); -#* you may not use this file except in compliance with the License. -#* You may obtain a copy of the License at -#* -#* http://www.apache.org/licenses/LICENSE-2.0 -#* -#* Unless required by applicable law or agreed to in writing, software -#* distributed under the License is distributed on an "AS IS" BASIS, -#* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -#* See the License for the specific language governing permissions and -#* limitations under the License. -#*****************************************************************************/ - -QT += core gui widgets -TARGET = luaengine -CONFIG += c++11 - -static: DEFINES += LUAENGINE_STATIC - -CONFIG(debug, debug|release): win32: LIBS += -L$$OUT_PWD/../luaengineos/debug -lluaengineos -L$$OUT_PWD/../luaengineio/debug -lluaengineio -L$$OUT_PWD/../luaenginegui/debug -lluaenginegui -L$$OUT_PWD/../luaengine/debug -lluaengine -CONFIG(release, debug|release): win32: LIBS += -L$$OUT_PWD/../luaengineos/release -lluaengineos -L$$OUT_PWD/../luaengineio/release -lluaengineio -L$$OUT_PWD/../luaenginegui/release -lluaenginegui -L$$OUT_PWD/../luaengine/release -lluaengine -unix: LIBS += -L$$OUT_PWD/../luaengineos -lluaengineos -L$$OUT_PWD/../luaengineio -lluaengineio -L$$OUT_PWD/../luaenginegui -lluaenginegui -L$$OUT_PWD/../luaengine -lluaengine - -INCLUDEPATH += \ - ../luaengine/lua \ - ../luaengine/luaengine \ - ../luaenginegui/luaengine \ - ../luaengineio/luaengine \ - ../luaengineos/luaengine - -SOURCES += \ - main.cpp diff --git a/src/src.pro b/src/src.pro index 26101ef..29d94f9 100644 --- a/src/src.pro +++ b/src/src.pro @@ -18,10 +18,10 @@ TEMPLATE = subdirs CONFIG += ordered -SUBDIRS += luaengine \ +SUBDIRS += luaenginecore \ luaenginegui \ luaengineio \ luaengineos CONFIG(WITH_LUAENGINEAPP): SUBDIRS += luaengineapp -CONFIG(WITH_LUAENGINERUN): SUBDIRS += luaenginerun +CONFIG(WITH_LUAENGINERUN): SUBDIRS += luaengine