Revert "Rethinking executable dependecies"

This reverts commit 0272c68.

Author: MahBoiDeveloper

CmakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.15 FATAL_ERROR)
 
 if (NOT WIN32)
-    message(FATAL_ERROR "This program has been specified to compile on Microsoft Windows only.")
+    message(FATAL_ERROR "This program has been specified to compile on Microsoft Windows OS only.")
 endif()
 
 set(CMAKE_CXX_STANDARD 20)
@@ -23,7 +23,7 @@ file(MAKE_DIRECTORY ${PROJECT_DESTINATION_RESOURCES_FOLDER})
 file(MAKE_DIRECTORY ${PROJECT_DESTINATION_BIN_FOLDER})
 file(MAKE_DIRECTORY ${PROJECT_DESTINATION_LOGS_FOLDER})
 
-# Do not remove this prefix path
+# TODO: temporary
 set(CMAKE_PREFIX_PATH "C:/Qt/5.15.2/mingw81_64" "C:/Qt/Tools/mingw_64")
 
 set(CMAKE_BUILD_PARALLEL_LEVEL 10)

src/CmakeLists.txt

@@ -20,7 +20,7 @@
 
     # Editor target name
     set(MAIN_TARGET_NAME "HotkeyEditor")
-    set(ACTUAL_EXE_NAME "GenHotkeys")
+    set(ACTUAL_EXE_NAME "LoadEditor")
 
     # Define editor executable
     add_executable(${MAIN_TARGET_NAME})
@@ -39,6 +39,9 @@
 
     # Remove all GUI sources from main sources list
     list(REMOVE_ITEM SOURCES ${EXCLUDED_GRAPHIC_SOURCES})
+    
+    # Remove launch target source file from main sources list
+    list(REMOVE_ITEM SOURCES "MainStarter.cpp")
 
     # Assign source files to the main target
     target_sources(
@@ -52,7 +55,7 @@
     set_target_properties(
         ${MAIN_TARGET_NAME}
         PROPERTIES
-        RUNTIME_OUTPUT_DIRECTORY ${PROJECT_DESTINATION_FOLDER}
+        RUNTIME_OUTPUT_DIRECTORY ${PROJECT_DESTINATION_BIN_FOLDER}
         OUTPUT_NAME ${ACTUAL_EXE_NAME}
     )
 
@@ -64,6 +67,31 @@
 
     # Add graphic dependency to the main target
     target_link_libraries(${MAIN_TARGET_NAME} PRIVATE GUI)
+    
+# Starter target configuration
+
+    # Starter target name
+    set(STARTER_TARGET_NAME "HotkeyEditorStarter")
+
+    # Define starter executable with source files
+    add_executable(
+        ${STARTER_TARGET_NAME}
+        "MainStarter.cpp"
+        "GUI/QtSources/StarterDescription.rc"
+    )
+
+    # Define output directory and file name
+    set_target_properties(
+        ${STARTER_TARGET_NAME}
+        PROPERTIES
+        RUNTIME_OUTPUT_DIRECTORY ${PROJECT_DESTINATION_FOLDER}
+        OUTPUT_NAME ${MAIN_TARGET_NAME}
+    )
+
+    # Create a preprocessor variable with the path to the main program relative to the starter
+    target_compile_definitions(${STARTER_TARGET_NAME} PRIVATE
+        -DPROJECT_EXE_RELATIVE_PATH="$<PATH:RELATIVE_PATH,$<TARGET_FILE:${MAIN_TARGET_NAME}>,${PROJECT_DESTINATION_FOLDER}>"
+    )
 
 # Managing additional source files
 
@@ -110,6 +138,7 @@
     find_program(QTENV_BAT qtenv2.bat)
 
     if(CMAKE_BUILD_TYPE STREQUAL "Release")
+
         # Deploy Qt and other dlls to the Editor/Resource folder
         add_custom_command(
             TARGET ${MAIN_TARGET_NAME}
@@ -120,7 +149,8 @@
             COMMAND ${WINDEPLOYQT_PROGRAM}
                 --compiler-runtime
                 --force
-                --dir ${PROJECT_DESTINATION_BIN_FOLDER} # Actually redirects qt's libraries to the different folder
+                --dir $<TARGET_PROPERTY:${MAIN_TARGET_NAME},RUNTIME_OUTPUT_DIRECTORY>
                 $<TARGET_FILE:${MAIN_TARGET_NAME}>
         )
-    endif()
+
+    endif()

src/GUI/QtSources/StarterDescription.rc

@@ -0,0 +1,29 @@
+IDI_ICON1	ICON	DISCARDABLE	"EditorIcon.ico"
+
+1 VERSIONINFO
+FILEVERSION     0,3,0,0
+PRODUCTVERSION  0,3,0,0
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904E4"
+        BEGIN
+            VALUE "FileDescription",  "Hotkeys Editor For C&C: Generals"
+            VALUE "ProductVersion",   "0.3.0.0"
+            VALUE "FileVersion",      "0.3.0.0"
+            VALUE "ProductName",      "GenHotkeys"
+            VALUE "InternalName",     "GenHotkeys"
+            VALUE "OriginalFilename", "LoadEditor.exe"
+            VALUE "CompanyName",      "GenHotkeys Developers. All rights reserved."
+            VALUE "LegalCopyright",   "Copyright (C) GenHotkeys Devs 2023-2025"
+            VALUE "Licence",          "GNU GPL v3"
+            VALUE "Info",             "https://github.com/MahBoiDeveloper/GZHHotkeysEditor"
+            VALUE "Comment",          "GenHotkeys"
+        END
+    END
+
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1252
+    END
+END

src/Logger.cpp

@@ -17,8 +17,10 @@ using namespace std;
         // Disable console if it is really opened.
         ShowWindow(GetConsoleWindow(), SW_HIDE);
 
+        int i = 0;
+
         vector<filesystem::directory_entry> files;
-        for (const auto& entry : filesystem::directory_iterator("Logs"))
+        for (const auto& entry : filesystem::directory_iterator("..\\..\\Logs"))
             if (entry.is_regular_file())
                 files.push_back(entry);
 
@@ -46,8 +48,8 @@ using namespace std;
         // Due to Logger is a singleton, we must create check if folder Logs exists.
         if (!LogFile.is_open())
         {
-            filesystem::create_directory("Logs");
-            LogFile.open(string("Logs") + GetLogFileName());
+            filesystem::create_directory("..\\..\\Logs");
+            LogFile.open(string("..\\..\\") + GetLogFileName());
         }
 
         if (!LogFile.is_open()) 

src/MainStarter.cpp

@@ -0,0 +1,76 @@
+#ifdef PROJECT_EXE_RELATIVE_PATH
+
+#define EXCEPTION_HEADER "I'VE GOT A PRESENT FOR YA"
+#define RESOURCES "Resources"
+#define BINARIES "Resources/Binaries"
+#define ERROR_HEADER "Error"
+
+#include <vector>
+#include <string>
+#include <filesystem>
+#include <iostream>
+#include <windows.h>
+
+// Links local executable to the main application of the project
+int main(int argc, const char** argv)
+{
+    // Disable console from the start
+    ShowWindow(GetConsoleWindow(), SW_HIDE);
+
+    // Create /Logs if they doesn't exists
+    std::filesystem::create_directory("Logs");
+
+    if (!std::filesystem::exists(RESOURCES))
+    {
+        std::string msg = std::string() + RESOURCES + " folder doesn't exist!" + '\n' +
+                          "You cannot use Hotkey Editor without configs and Qt binary files." + '\n' +
+                          "Please, check your installation instruction." + '\n';
+        std::cout << msg.c_str() << std::endl;
+        MessageBox(HWND_DESKTOP, msg.c_str(), ERROR_HEADER, MB_OK);
+        return -1;
+    }
+
+    if (!std::filesystem::exists(BINARIES))
+    {
+        std::string msg = std::string() + BINARIES + " folder doesn't exist!" + '\n' +
+                          "You cannot use Hotkey Editor without configs and Qt binary files." + '\n' +
+                          "Please, check your installation instruction." + '\n';
+        std::cout << msg.c_str() << std::endl;
+        MessageBox(HWND_DESKTOP, msg.c_str(), ERROR_HEADER, MB_OK);
+        return -1;
+    }
+
+    std::stringstream ss(PROJECT_EXE_RELATIVE_PATH);
+    std::string tmp = "";
+    const char del = '/';
+    std::vector<std::string> vec;
+    vec.reserve(3);
+
+    // Split Cmake's path by / in PROJECT_EXE_RELATIVE_PATH string
+    while (getline(ss, tmp, del))
+        vec.push_back(tmp);
+
+    // Combine all dirs into single string
+    std::string dir = vec.at(0);
+    for (int i = 1; i < vec.size() - 1; i++)
+        dir += '\\' + vec.at(i);
+
+    // Refactor later to work with UTF-8 and provide args to the real executable.
+    HINSTANCE hRet = ShellExecuteA(
+        HWND_DESKTOP,                   // Parent window
+        "open",                         // Operation to perform
+        vec.at(vec.size() - 1).c_str(), // Path to program
+        NULL,                           // Parameters
+        dir.c_str(),                    // Default directory
+        SW_HIDE);                       // How to open
+
+    if (reinterpret_cast<size_t>(hRet) <= 32)
+    {
+        std::string msg = std::string() + "Unable to start editor, error code: " + std::to_string(reinterpret_cast<size_t>(hRet));
+        MessageBox(HWND_DESKTOP, msg.c_str(), ERROR_HEADER, MB_OK);
+        return -1;
+    }
+
+    return 0;
+}
+#endif