Bringing 8bit-Hub branch up-to-date

.gitattributes

@@ -1,2 +1,2 @@
-*.vcxproj text eol=crlf
-*.sln text eol=crlf
+*.vcxproj text eol=crlf
+*.sln text eol=crlf

.github/workflows/cmake-sdl1-win64.yml

@@ -0,0 +1,56 @@
+name: Oricutron Release on windows-latest - cmake SDL1
+
+on: workflow_dispatch 
+
+env:
+  # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
+  BUILD_TYPE: Release
+
+jobs:
+  build:
+    # The CMake configure and build commands are platform agnostic and should work equally
+    # well on Windows or Mac.  You can convert this to a matrix build if you need
+    # cross-platform coverage.
+    # See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
+    runs-on: windows-latest
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Install SDL1
+      run: pushd ${{github.workspace}}/msvc && git clone -q --depth 1 --single-branch https://github.com/Microsoft/vcpkg.git && .\vcpkg\bootstrap-vcpkg.bat && .\vcpkg\vcpkg.exe install sdl1:x64-windows && popd
+
+    - name: Create Build Environment
+      # Some projects don't allow in-source building, so create a separate build directory
+      # We'll use this as our working directory for all subsequent commands
+      run: cmake -E make_directory ${{github.workspace}}/build
+
+    - name: Configure CMake
+      # Use a bash shell so we can use the same syntax for environment variable
+      # access regardless of the host operating system
+      shell: bash
+      working-directory: ${{github.workspace}}/build
+      # Note the current convention is to use the -S and -B options here to specify source 
+      # and build directories, but this is only available with CMake 3.13 and higher.  
+      # The CMake binaries on the Github Actions machines are (as of this writing) 3.12
+      run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE
+
+    - name: Build
+      working-directory: ${{github.workspace}}/build
+      shell: bash
+      # Execute the build.  You can specify a specific target with "--target <NAME>"
+      run: cmake --build . --config $BUILD_TYPE
+
+    - name: Upload Build Artifacts
+      uses: actions/upload-artifact@v4
+      with:
+        name: build-artifacts
+        path: ${{github.workspace}}/build
+
+# We have no tests at the moment
+#    - name: Test
+#      working-directory: ${{github.workspace}}/build
+#      shell: bash
+#      # Execute tests defined by the CMake configuration.  
+#      # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
+#      run: ctest -C $BUILD_TYPE

.github/workflows/cmake-sdl1.yml

@@ -0,0 +1,55 @@
+name: Oricutron Release on ubuntu-latest - cmake SDL1 GTK3
+
+on: [push]
+
+env:
+  # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
+  BUILD_TYPE: Release
+
+jobs:
+  build:
+    # The CMake configure and build commands are platform agnostic and should work equally
+    # well on Windows or Mac.  You can convert this to a matrix build if you need
+    # cross-platform coverage.
+    # See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Install SDL1 GTK3
+      run: sudo apt-get update -qq && sudo apt-get install libsdl1.2-dev -y && sudo apt-get install libgtk-3-dev -y
+
+    - name: Create Build Environment
+      # Some projects don't allow in-source building, so create a separate build directory
+      # We'll use this as our working directory for all subsequent commands
+      run: cmake -E make_directory ${{github.workspace}}/build
+
+    - name: Configure CMake
+      # Use a bash shell so we can use the same syntax for environment variable
+      # access regardless of the host operating system
+      shell: bash
+      working-directory: ${{github.workspace}}/build
+      # Note the current convention is to use the -S and -B options here to specify source 
+      # and build directories, but this is only available with CMake 3.13 and higher.  
+      # The CMake binaries on the Github Actions machines are (as of this writing) 3.12
+      run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE
+
+    - name: Build
+      working-directory: ${{github.workspace}}/build
+      shell: bash
+      # Execute the build.  You can specify a specific target with "--target <NAME>"
+      run: cmake --build . --config $BUILD_TYPE
+
+    - name: Upload Build Artifacts
+      uses: actions/upload-artifact@v4
+      with:
+        name: build-artifacts
+        path: ${{github.workspace}}/build
+# We have no tests at the moment
+#    - name: Test
+#      working-directory: ${{github.workspace}}/build
+#      shell: bash
+#      # Execute tests defined by the CMake configuration.  
+#      # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
+#      run: ctest -C $BUILD_TYPE

.github/workflows/cmake-win64.yml

@@ -0,0 +1,55 @@
+name: Oricutron Release on windows-latest - cmake SDL2 GTK3 (x64)
+
+on: [push]
+
+env:
+  # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
+  BUILD_TYPE: Release
+
+jobs:
+  build:
+    # The CMake configure and build commands are platform agnostic and should work equally
+    # well on Windows or Mac.  You can convert this to a matrix build if you need
+    # cross-platform coverage.
+    # See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
+    runs-on: windows-latest
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Install SDL2 and GTK3
+      run: pushd ${{github.workspace}}/msvc && git clone -q --depth 1 --single-branch https://github.com/Microsoft/vcpkg.git && .\vcpkg\bootstrap-vcpkg.bat && .\vcpkg\vcpkg.exe install sdl2:x64-windows && popd
+
+    - name: Create Build Environment
+      # Some projects don't allow in-source building, so create a separate build directory
+      # We'll use this as our working directory for all subsequent commands
+      run: cmake -E make_directory ${{github.workspace}}/build
+
+    - name: Configure CMake
+      # Use a bash shell so we can use the same syntax for environment variable
+      # access regardless of the host operating system
+      shell: bash
+      working-directory: ${{github.workspace}}/build
+      # Note the current convention is to use the -S and -B options here to specify source 
+      # and build directories, but this is only available with CMake 3.13 and higher.  
+      # The CMake binaries on the Github Actions machines are (as of this writing) 3.12
+      run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DUSE_SDL2:BOOL=ON
+
+    - name: Build
+      working-directory: ${{github.workspace}}/build
+      shell: bash
+      # Execute the build.  You can specify a specific target with "--target <NAME>"
+      run: cmake --build . --config $BUILD_TYPE
+
+    - name: Upload Build Artifacts
+      uses: actions/upload-artifact@v4
+      with:
+        name: build-artifacts
+        path: ${{github.workspace}}/build
+# We have no tests at the moment
+#    - name: Test
+#      working-directory: ${{github.workspace}}/build
+#      shell: bash
+#      # Execute tests defined by the CMake configuration.  
+#      # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
+#      run: ctest -C $BUILD_TYPE

.github/workflows/cmake.yml

@@ -0,0 +1,56 @@
+name: Oricutron Release on ubuntu-latest - cmake SDL2 GTK3
+
+on: [push]
+
+env:
+  # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
+  BUILD_TYPE: Release
+
+jobs:
+  build:
+    # The CMake configure and build commands are platform agnostic and should work equally
+    # well on Windows or Mac.  You can convert this to a matrix build if you need
+    # cross-platform coverage.
+    # See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Install SDL2 and GTK3
+      run: sudo apt-get update -qq && sudo apt-get install libsdl2-dev -y --force-yes && sudo apt-get install libgtk-3-dev -y --force-yes
+
+    - name: Create Build Environment
+      # Some projects don't allow in-source building, so create a separate build directory
+      # We'll use this as our working directory for all subsequent commands
+      run: cmake -E make_directory ${{github.workspace}}/build
+
+    - name: Configure CMake
+      # Use a bash shell so we can use the same syntax for environment variable
+      # access regardless of the host operating system
+      shell: bash
+      working-directory: ${{github.workspace}}/build
+      # Note the current convention is to use the -S and -B options here to specify source 
+      # and build directories, but this is only available with CMake 3.13 and higher.  
+      # The CMake binaries on the Github Actions machines are (as of this writing) 3.12
+      run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DUSE_SDL2:BOOL=ON
+
+    - name: Build
+      working-directory: ${{github.workspace}}/build
+      shell: bash
+      # Execute the build.  You can specify a specific target with "--target <NAME>"
+      run: cmake --build . --config $BUILD_TYPE
+
+    - name: Upload Build Artifacts
+      uses: actions/upload-artifact@v4
+      with:
+        name: build-artifacts
+        path: ${{github.workspace}}/build
+
+# We have no tests at the moment
+#    - name: Test
+#      working-directory: ${{github.workspace}}/build
+#      shell: bash
+#      # Execute tests defined by the CMake configuration.  
+#      # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
+#      run: ctest -C $BUILD_TYPE

.gitignore

@@ -4,17 +4,27 @@ Release/
 x64/
 *.d
 *.o
-/msvc/**/Debug clang
-/msvc/**/Release clang
-/msvc/**/images
-/msvc/**/oricutron.cfg
-/msvc/**/roms
-/msvc/**/sdl
-/msvc/**/sdl2
-/roms/*.rom
-!/roms/orix*.rom
-/oricutron.aps
-/msvc/**/Oricutron.psess
-/msvc/**/*.user
-/msvc/**/vcpkg
-build
+msvc/**/Debug clang
+msvc/**/Release clang
+msvc/**/images
+msvc/**/oricutron.cfg
+msvc/**/roms
+msvc/**/sdl
+msvc/**/sdl2
+roms/*.rom
+roms/orix*.rom
+oricutron.aps
+msvc/**/Oricutron.psess
+msvc/**/*.user
+msvc/**/vcpkg
+build/**
+SDL.dll
+SDL2.dll
+disks/*.dsk
+pravdisks/*.dsk
+teledisks/*.dsk
+oricutron
+Oricutron
+Oricutron-sdl2
+Oricutron.exe
+Oricutron-sdl2.exe