Merge pull request mamedev#257 from libretro/revert-256-libretro/mame…

…-0.235 Revert "libretro/mame 0.235"
NullPopPoLab · Aug 29, 2021 · 2a05aed · 2a05aed
2 parents 4eaa33d + dfb6c38
commit 2a05aed
Show file tree

Hide file tree

Showing 9,580 changed files with 1,129,635 additions and 228,209 deletions.
diff --git a/3rdparty/bgfx/.appveyor.yml b/3rdparty/bgfx/.appveyor.yml
@@ -1,16 +1,11 @@
 shallow_clone: true
 
 os:
-  - Visual Studio 2019
+  - Visual Studio 2017
 
 environment:
   matrix:
   - TOOLSET: vs2017
-#  - TOOLSET: vs2019
-
-platform:
-  - Win32
-  - x64
 
 configuration:
   - Debug

diff --git a/3rdparty/bgfx/.gitignore b/3rdparty/bgfx/.gitignore
@@ -6,4 +6,3 @@
 tags
 .gdb_history
 .vscode
-*.TMP
diff --git a/3rdparty/bgfx/.travis.yml b/3rdparty/bgfx/.travis.yml
@@ -24,7 +24,7 @@ before_script:
 
 script:
   - if [ "$TRAVIS_OS_NAME" == "linux" ]; then make build CXX="g++-8" CC="gcc-8"; fi
-  - if [ "$TRAVIS_OS_NAME" == "osx" ]; then make osx-x64-debug; fi
+  - if [ "$TRAVIS_OS_NAME" == "osx" ]; then make osx-debug64; fi
 
 branches:
   only:
@@ -33,4 +33,4 @@ branches:
 notifications:
   email: false
 
-osx_image: xcode11
+osx_image: xcode10.3
diff --git a/3rdparty/bgfx/3rdparty/cgltf/LICENSE b/3rdparty/bgfx/3rdparty/cgltf/LICENSE