Merge branch 'load-mods-from-folder' into main

Author: logdot

.github/workflows/msbuild.yml

@@ -5,9 +5,6 @@ on:
     branches: [ main ]
 
 env:
-  # Path to the solution file relative to the root of the project.
-  SOLUTION_FILE_PATH: .
-
   # Configuration type to build.
   # You can convert this to a build matrix if you need coverage of multiple configuration types.
   # https://docs.github.com/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
@@ -39,7 +36,9 @@ jobs:
     - name: MoveToTemp
       run: |
         mv build/bin/Release/* temp/
-        mv build/bin/Shipworks.json temp/
+        mkdir temp/Modloader
+        mkdir temp/Modloader/config
+        mkdir temp/Modloader/mods
       
     - name: Upload
       uses: actions/upload-artifact@v3.1.0
@@ -50,8 +49,8 @@ jobs:
     - name: Zip
       uses: vimtor/action-zip@v1
       with:
-        files: build/bin/Release/ build/bin/Shipworks.json
-        recursive: false
+        files: temp/
+        recursive: true
         dest: Artifacts.zip
       if: startsWith(github.ref, 'refs/tags/')
 

CMakeLists.txt

@@ -1,10 +1,12 @@
 cmake_minimum_required(VERSION 3.10)
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 
-project(HighfleetMoadloader VERSION 0.1.1)
+set(SOURCE src/Main.cpp src/Inject.cpp)
 
-add_subdirectory(ShipworksExtended)
-add_subdirectory(HighfleetModloader)
+project(HighfleetModloader VERSION 0.1.1)
+add_executable(${PROJECT_NAME} ${SOURCE})