improve LuaEngineApp build

.gitlab-ci.yml

@@ -36,7 +36,7 @@ LuaEngineApp:
   script:
     - mkdir -p build
     - cd build
-    - qmake-static CONFIG+=WITH_LUAENGINEAPP DEFINES+=LUAENGINE_FOOTER_SCRIPT ../luaengine.pro
+    - qmake-static CONFIG+=WITH_LUAENGINEAPP ../luaengine.pro
     - make -j4
     - cp -Rf src/luaengineapp/release/LuaEngineApp.exe ../windows.le
     - cd ..

src/luaengineapp/luaengineapp.pro

@@ -40,8 +40,8 @@ OTHER_FILES += \
     app.lua \
     app.rc
 
-
+win32: CONFIG(LUAENGINE_RESOURCE_SCRIPT) {
-!defined(LUAENGINE_FOOTER_SCRIPT) {
+    DEFINES += LUAENGINE_RESOURCE_SCRIPT
-    win32: HEADERS += resource.h
+    HEADERS += resource.h
-    win32: RC_FILE = app.rc
+    RC_FILE = app.rc
 }

src/luaengineapp/main.cpp

@@ -42,7 +42,17 @@ int main(int argc, char *argv[])
 
     QByteArray luaScript;
 #ifdef Q_OS_WIN
-#ifdef LUAENGINE_FOOTER_SCRIPT
+#ifdef LUAENGINE_RESOURCE_SCRIPT
+    {
+        HMODULE handle = GetModuleHandleW(NULL);
+        HRSRC resource = FindResourceW(handle, MAKEINTRESOURCE(IDR_SCRIPT1), L"SCRIPT");
+        HGLOBAL resourceData = LoadResource(handle, resource);
+        DWORD size = SizeofResource(handle, resource);
+        const char *data = static_cast<const char*>(LockResource(resourceData));
+        luaScript = QByteArray(data, size);
+    }
+}
+#else
     {
         QFile executable(a.arguments().at(0));
         if (executable.open(QIODevice::ReadOnly)) {
@@ -62,16 +72,6 @@ int main(int argc, char *argv[])
             }
         }
     }
-#else
-        {
-            HMODULE handle = GetModuleHandleW(NULL);
-            HRSRC resource = FindResourceW(handle, MAKEINTRESOURCE(IDR_SCRIPT1), L"SCRIPT");
-            HGLOBAL resourceData = LoadResource(handle, resource);
-            DWORD size = SizeofResource(handle, resource);
-            const char *data = static_cast<const char*>(LockResource(resourceData));
-            luaScript = QByteArray(data, size);
-        }
-    }
 #endif
 #endif
 

src/luaenginec/luaenginec.pro

@@ -32,3 +32,11 @@ INCLUDEPATH += \
 
 SOURCES += \
     main.cpp
+
+win32 {
+    RC_LANG = 0x0
+    QMAKE_TARGET_COMPANY = "Syping"
+    QMAKE_TARGET_DESCRIPTION = "LuaEngine Compiler"
+    QMAKE_TARGET_COPYRIGHT = "Copyright (c) 2019 Syping"
+    QMAKE_TARGET_PRODUCT = "luaenginec"
+}