Merge pulled develop

.github/workflows/main.yml

@@ -6,20 +6,28 @@ on:
       - '**.js'
       - '**.dfn'
       - '**.scp'
+      - '**.txt'
+      - '**.html'
+      - '**.sln'
+      - '**.vcxproj'
   pull_request:
     paths-ignore:
       - '**.js'
       - '**.dfn'
       - '**.scp'
+      - '**.txt'
+      - '**.html'
+      - '**.sln'
+      - '**.vcxproj'
 
 jobs:
   build:
 
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
-    - name: prepare automake
-      run: chmod +x automake.sh
-    - name: automake
-      run: ./automake.sh
+    - uses: actions/checkout@v3
+    - name: Generate Makefiles
+      run: cmake make/cmake -DCMAKE_BUILD_TYPE=Release
+    - name: Building
+      run: cmake --build .

.github/workflows/windows_x64_build.yml

@@ -5,22 +5,31 @@ on:
       - '**.js'
       - '**.dfn'
       - '**.scp'
+      - '**.txt'
+      - '**.html'
+      - '**.sln'
+      - '**.vcxproj'
   pull_request:
     paths-ignore:
       - '**.js'
       - '**.dfn'
       - '**.scp'
+      - '**.txt'
+      - '**.html'
+      - '**.sln'
+      - '**.vcxproj'
+
 jobs:
   build:
     runs-on: windows-latest
     steps:
       - name: checkout
-        uses: actions/checkout@v2
-      - name: setupt msvc console
+        uses: actions/checkout@v3
+      - name: setup msvc console
         uses: ilammy/msvc-dev-cmd@v1
         with:
           arch: x64
       - name: cmake and build
         run: |
-          cmake -G "NMake Makefiles" .
-          nmake
+          cmake make/cmake -DCMAKE_BUILD_TYPE=Release -G"NMake Makefiles" 
+          cmake --build . --config Release

.gitignore

@@ -1,3 +1,14 @@
+# Project unique Items
+
+[Bb]uild/
+
+
+
+
+# Created by https://www.toptal.com/developers/gitignore/api/c++
+# Edit at https://www.toptal.com/developers/gitignore?templates=c++
+
+### C++ ###
 # Prerequisites
 *.d
 
@@ -31,6 +42,27 @@
 *.out
 *.app
 
+# End of https://www.toptal.com/developers/gitignore/api/c++
+
+
+# Created by https://www.toptal.com/developers/gitignore/api/macos,windows,linux
+# Edit at https://www.toptal.com/developers/gitignore?templates=macos,windows,linux
+
+### Linux ###
+*~
+
+# temporary files which can be created if a process still has a handle open of a deleted file
+.fuse_hidden*
+
+# KDE directory preferences
+.directory
+
+# Linux trash folder which might appear on any partition or disk
+.Trash-*
+
+# .nfs files are created when an open file is removed but is still being accessed
+.nfs*
+
 ### macOS ###
 # General
 .DS_Store
@@ -60,59 +92,9 @@ Network Trash Folder
 Temporary Items
 .apdisk
 
-### Xcode ###
-# Xcode
-#
-# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
-
-## User settings
-xcuserdata/
-
-## compatibility with Xcode 8 and earlier (ignoring not required starting Xcode 9)
-*.xcscmblueprint
-*.xccheckout
-
-## compatibility with Xcode 3 and earlier (ignoring not required starting Xcode 4)
-build/
-DerivedData/
-*.moved-aside
-*.pbxuser
-!default.pbxuser
-*.mode1v3
-!default.mode1v3
-*.mode2v3
-!default.mode2v3
-*.perspectivev3
-!default.perspectivev3
-
-## Gcc Patch
-/*.gcno
-
-### Xcode Patch ###
-*.xcodeproj/*
-!*.xcodeproj/project.pbxproj
-!*.xcodeproj/xcshareddata/
-!*.xcworkspace/contents.xcworkspacedata
-**/xcshareddata/WorkspaceSettings.xcsettings
-
-### VisualStudioCode ###
-.vscode/*
-!.vscode/settings.json
-!.vscode/tasks.json
-!.vscode/launch.json
-!.vscode/extensions.json
-*.code-workspace
-
-# Local History for Visual Studio Code
-.history/
-
-### VisualStudioCode Patch ###
-# Ignore all local history of files
-.history
-.ionide
-
-# Support for Project snippet scope
-!.vscode/*.code-snippets
+### macOS Patch ###
+# iCloud generated files
+*.icloud
 
 ### Windows ###
 # Windows thumbnail cache files
@@ -140,11 +122,73 @@ $RECYCLE.BIN/
 # Windows shortcuts
 *.lnk
 
+# End of https://www.toptal.com/developers/gitignore/api/macos,windows,linux
+
+
+
+
+
+# Created by https://www.toptal.com/developers/gitignore/api/cmake,xcode,visualstudio,visualstudiocode
+# Edit at https://www.toptal.com/developers/gitignore?templates=cmake,xcode,visualstudio,visualstudiocode
+
+### CMake ###
+CMakeLists.txt.user
+CMakeCache.txt
+CMakeFiles
+CMakeScripts
+Testing
+Makefile
+cmake_install.cmake
+install_manifest.txt
+compile_commands.json
+CTestTestfile.cmake
+_deps
+
+### CMake Patch ###
+# External projects
+*-prefix/
+
+### VisualStudioCode ###
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+!.vscode/*.code-snippets
+
+# Local History for Visual Studio Code
+.history/
+
+# Built Visual Studio Code Extensions
+*.vsix
+
+### VisualStudioCode Patch ###
+# Ignore all local history of files
+.history
+.ionide
+
+### Xcode ###
+## User settings
+xcuserdata/
+
+## Xcode 8 and earlier
+*.xcscmblueprint
+*.xccheckout
+
+### Xcode Patch ###
+*.xcodeproj/*
+!*.xcodeproj/project.pbxproj
+!*.xcodeproj/xcshareddata/
+!*.xcodeproj/project.xcworkspace/
+!*.xcworkspace/contents.xcworkspacedata
+/*.gcno
+**/xcshareddata/WorkspaceSettings.xcsettings
+
 ### VisualStudio ###
 ## Ignore Visual Studio temporary files, build results, and
 ## files generated by popular Visual Studio add-ons.
 ##
-## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
+## Get latest from https://github.com/github/gitignore/blob/main/VisualStudio.gitignore
 
 # User-specific files
 *.rsuser
@@ -349,9 +393,6 @@ PublishScripts/
 *.nuget.props
 *.nuget.targets
 
-# Nuget personal access tokens and Credentials
-# nuget.config
-
 # Microsoft Azure Build Output
 csx/
 *.build.csdef
@@ -440,6 +481,15 @@ node_modules/
 # Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
 *.vbw
 
+# Visual Studio 6 auto-generated project file (contains which files were open etc.)
+*.vbp
+
+# Visual Studio 6 workspace and project file (working project files containing files to include in project)
+*.dsw
+*.dsp
+
+# Visual Studio 6 technical files
+
 # Visual Studio LightSwitch build output
 **/*.HTMLClient/GeneratedArtifacts
 **/*.DesktopClient/GeneratedArtifacts
@@ -496,6 +546,9 @@ ASALocalRun/
 # Local History for Visual Studio
 .localhistory/
 
+# Visual Studio History (VSHistory) files
+.vshistory/
+
 # BeatPulse healthcheck temp database
 healthchecksdb
 
@@ -509,14 +562,23 @@ MigrationBackup/
 FodyWeavers.xsd
 
 # VS Code files for those working on multiple tools
+*.code-workspace
 
 # Local History for Visual Studio Code
 
 # Windows Installer files from build outputs
+*.cab
+*.msi
+*.msix
+*.msm
+*.msp
 
 # JetBrains Rider
-.idea/
 *.sln.iml
 
 ### VisualStudio Patch ###
 # Additional files built by Visual Studio
+
+# End of https://www.toptal.com/developers/gitignore/api/cmake,xcode,visualstudio,visualstudiocode
+
+