Merge pull request #5 from Jamiras/vendor_2022

Update to 22 Dec 2021 upstream

.appveyor.yml

@@ -0,0 +1,47 @@
+version: '{build}'
+
+image:
+  - Visual Studio 2017
+
+build:
+  verbosity: detailed
+
+configuration:
+  - Debug
+  - Release
+
+platform:
+  - x64
+  - x86
+
+environment:
+  matrix:
+    - STATIC: " "
+    - STATIC: "-static"
+
+matrix:
+  fast_finish: true
+
+install:
+  - set NINJA_URL="https://github.com/ninja-build/ninja/releases/download/v1.9.0/ninja-win.zip"
+  - appveyor DownloadFile %NINJA_URL% -FileName ninja.zip
+  - 7z x ninja.zip -oc:\projects\ninja > nul
+  - set PATH=c:\projects\ninja;%PATH%
+  - ninja --version
+
+before_build:
+  - call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" %PLATFORM%
+
+build_script:
+  - mkdir build
+  - cd build
+  - cmake .. -DVCPKG_TARGET_TRIPLET=%PLATFORM%-windows%STATIC% -DCMAKE_BUILD_TYPE=%CONFIGURATION% -DENABLE_SDL=TRUE -G Ninja
+  - ninja
+
+# only debug builds are console mode apps, in them test --help
+test_script:
+  - if not %CONFIGURATION%==Release .\visualboyadvance-m.exe --help
+  - ctest -V
+
+cache:
+  - c:\vcpkg\installed

.github/ISSUE_TEMPLATE.md

@@ -1,18 +1,31 @@
-### Please fill out this form:
+<!---
+
+BEFORE REPORTING AN ISSUE PLEASE TRY THE NIGHTLY FROM:
+
+http://win.vba-m.com/nightly
+
+AND DO A FACTORY RESET!
+
+On Linux build master from source or use the edge snap.
+
+-->
+
+<!--- Please fill out this form and delete any sections you are not using. -->
 
 ### Expected behavior
 
 ### Actual behavior
 
 ### Steps to reproduce the behavior
 
-### Crash bugs
+<!--- Crash bugs
 
 If this is a crash bug, and you have the time and inclination, please provide a
 symblic backtrace.
 
 Instructions for doing so are
 [here](https://github.com/visualboyadvance-m/visualboyadvance-m/blob/master/README.md#reporting-crash-bugs).
+-->
 
 ### ROM details
 
@@ -38,7 +51,7 @@ If using Linux, specify if using xorg or Wayland:
 
 Version of code (pre-built binary version, or commit ref, or just "master"):
 
-### Hardware details:
+<!--- Hardware details:
 
 If your joystick or gamepad isn't working in Linux, please try to troubleshoot
 using the information on this page:
@@ -47,3 +60,4 @@ SDL for joystick support, any problems will generally be an issue with SDL and
 **NOT** the emulator.
 
 If relevant, the joystick you are using and the drivers you are using for it:
+-->

.github/workflows/msys2-build.yml

@@ -0,0 +1,39 @@
+name: MSYS2 Build
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: windows-latest
+    env:
+      MSYSTEM: CLANG64
+    defaults:
+      run:
+        shell: msys2 {0}
+
+    steps:
+      - uses: actions/checkout@v2
+        with: 
+          submodules: true
+
+      - uses: msys2/setup-msys2@v2
+        with:
+          msystem: CLANG64
+          install: >-
+            mingw-w64-clang-x86_64-toolchain
+            mingw-w64-clang-x86_64-pkg-config
+            mingw-w64-clang-x86_64-ffmpeg
+            mingw-w64-clang-x86_64-FAudio
+            mingw-w64-clang-x86_64-cmake
+            mingw-w64-clang-x86_64-ninja
+            mingw-w64-clang-x86_64-wxmsw3.1
+            mingw-w64-clang-x86_64-sfml
+            mingw-w64-clang-x86_64-SDL2
+            zip
+      - name: Configure
+        run: >-
+          cmake -B build -G Ninja -DCMAKE_BUILD_TYPE=Debug -DENABLE_SDL=ON -DSDL2_STATIC=ON -DSFML_STATIC_LIBRARIES=ON -DFFMPEG_STATIC=ON -DOPENAL_STATIC=ON -DSSP_STATIC=ON -DVBAM_STATIC=ON -DENABLE_SSP=ON -DENABLE_ONLINEUPDATES=OFF
+      - name: Build
+        run: ninja -C build
+
+      - name: Install
+        run: ninja -C build install

.gitignore

@@ -1,22 +1,13 @@
-src/wx/builtin-over.h
-src/wx/builtin-xrc.h
-src/wx/cmd-evtable.h
-src/wx/cmdhandlers.h
-src/wx/cmdtab.cpp
-src/wx/wxvbam.xrs
-src/wx/RA_BuildVer.h
-build/*
-build32/*
-vsbuild/*
-cmake-build*
-dependencies/*
-vcpkg/*
 .vs/*
 .idea
 *.o
 *.so
 *.dll
 *.exe
+.vscode
+vsbuild
+
+RA_BuildVer.h
 
 # vim swap files
 *.sw?

.gitlab-ci.yml

@@ -0,0 +1,171 @@
+# DESCRIPTION: GitLab CI/CD for libRetro (NOT FOR GitLab-proper)
+
+##############################################################################
+################################# BOILERPLATE ################################
+##############################################################################
+
+# Core definitions
+.core-defs:
+  variables:
+    GIT_SUBMODULE_STRATEGY: recursive
+    JNI_PATH: src/libretro
+    MAKEFILE_PATH: src/libretro
+    CORENAME: vbam
+
+# Inclusion templates, required for the build to work
+include:
+  ################################## DESKTOPS ################################
+  # Windows 64-bit
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/windows-x64-mingw.yml'
+
+  # Windows 32-bit
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/windows-i686-mingw.yml'
+
+  # Linux 64-bit
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/linux-x64.yml'
+
+  # Linux 32-bit
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/linux-i686.yml'
+
+  # MacOS 64-bit
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/osx-x64.yml'
+
+  # MacOS ARM 64-bit
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/osx-arm64.yml'
+
+  ################################## CELLULAR ################################
+  # Android
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/android-jni.yml'
+
+  # iOS
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/ios-arm64.yml'
+
+  # iOS (armv7)
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/ios9.yml'
+
+  ################################## CONSOLES ################################
+  # PlayStation Vita
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/vita-static.yml'
+
+  # Nintendo Switch
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/libnx-static.yml'
+
+  # tvOS (AppleTV)
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/tvos-arm64.yml'
+
+  #################################### MISC ##################################
+
+# Stages for building
+stages:
+  - build-prepare
+  - build-shared
+  - build-static
+
+##############################################################################
+#################################### STAGES ##################################
+##############################################################################
+#
+################################### DESKTOPS #################################
+# Windows 64-bit
+libretro-build-windows-x64:
+  extends:
+    - .libretro-windows-x64-mingw-make-default
+    - .core-defs
+
+# Windows 32-bit
+libretro-build-windows-i686:
+  extends:
+    - .libretro-windows-i686-mingw-make-default
+    - .core-defs
+
+# Linux 64-bit
+libretro-build-linux-x64:
+  extends:
+    - .libretro-linux-x64-make-default
+    - .core-defs
+
+# Linux 32-bit
+libretro-build-linux-i686:
+  extends:
+    - .libretro-linux-i686-make-default
+    - .core-defs
+
+# MacOS 64-bit
+libretro-build-osx-x64:
+  extends:
+    - .libretro-osx-x64-make-default
+    - .core-defs
+
+# MacOS ARM 64-bit
+libretro-build-osx-arm64:
+  extends:
+    - .libretro-osx-arm64-make-default
+    - .core-defs
+
+################################### CELLULAR #################################
+# Android ARMv7a
+android-armeabi-v7a:
+  extends:
+    - .libretro-android-jni-armeabi-v7a
+    - .core-defs
+
+# Android ARMv8a
+android-arm64-v8a:
+  extends:
+    - .libretro-android-jni-arm64-v8a
+    - .core-defs
+
+# Android 64-bit x86
+android-x86_64:
+  extends:
+    - .libretro-android-jni-x86_64
+    - .core-defs
+
+# Android 32-bit x86
+android-x86:
+  extends:
+    - .libretro-android-jni-x86
+    - .core-defs
+
+# iOS
+libretro-build-ios-arm64:
+  extends:
+    - .libretro-ios-arm64-make-default
+    - .core-defs
+
+# iOS (armv7) [iOS 9 and up]
+libretro-build-ios9:
+  extends:
+    - .libretro-ios9-make-default
+    - .core-defs
+
+# tvOS
+libretro-build-tvos-arm64:
+  extends:
+    - .libretro-tvos-arm64-make-default
+    - .core-defs
+
+################################### CONSOLES #################################
+# PlayStation Vita
+libretro-build-vita:
+  extends:
+    - .libretro-vita-static-retroarch-master
+    - .core-defs
+
+# Nintendo Switch
+libretro-build-libnx-aarch64:
+  extends:
+    - .libretro-libnx-static-retroarch-master
+    - .core-defs

.gitmodules

@@ -1,6 +1,8 @@
 [submodule "dependencies"]
 	path = dependencies
 	url = https://github.com/visualboyadvance-m/dependencies.git
+	branch = master
 [submodule "RAInterface"]
 	path = RAInterface
 	url = https://github.com/RetroAchievements/RAInterface.git
+	branch = master