Skip to content

Commit

Permalink
Merge pull request mamedev#256 from tcamargo/libretro/mame-0.235
Browse files Browse the repository at this point in the history
libretro/mame 0.235
  • Loading branch information
inactive123 committed Aug 29, 2021
2 parents 1de1f1f + 88407b0 commit 4eaa33d
Show file tree
Hide file tree
Showing 9,580 changed files with 228,258 additions and 1,129,684 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
7 changes: 6 additions & 1 deletion 3rdparty/bgfx/.appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
shallow_clone: true

os:
- Visual Studio 2017
- Visual Studio 2019

environment:
matrix:
- TOOLSET: vs2017
# - TOOLSET: vs2019

platform:
- Win32
- x64

configuration:
- Debug
Expand Down
1 change: 1 addition & 0 deletions 3rdparty/bgfx/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@
tags
.gdb_history
.vscode
*.TMP
4 changes: 2 additions & 2 deletions 3rdparty/bgfx/.travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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-debug64; fi
- if [ "$TRAVIS_OS_NAME" == "osx" ]; then make osx-x64-debug; fi

branches:
only:
Expand All @@ -33,4 +33,4 @@ branches:
notifications:
email: false

osx_image: xcode10.3
osx_image: xcode11
7 changes: 7 additions & 0 deletions 3rdparty/bgfx/3rdparty/cgltf/LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
Copyright (c) 2018 Johannes Kuhlmann

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
Loading

0 comments on commit 4eaa33d

Please sign in to comment.