Skip to content

Commit

Permalink
Merge pull request #150 from RobLoach/update-2.1.0
Browse files Browse the repository at this point in the history
LIBRETRO: Update to ScummVM 2.1.0
  • Loading branch information
inactive123 authored Nov 10, 2019
2 parents 0f5123c + 3766786 commit a063a1b
Show file tree
Hide file tree
Showing 4,570 changed files with 833,833 additions and 237,579 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
8 changes: 8 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
/po/cs_CZ.po encoding=iso-8859-2
/po/hu_HU.po encoding=iso-8859-2
/po/pl_PL.po encoding=iso-8859-2
/po/be_BY.po encoding=iso-8859-5
/po/ru_RU.po encoding=iso-8859-5
/po/uk_UA.po encoding=iso-8859-5
/po/el.po encoding=iso-8859-7
/po/he.po encoding=iso-8859-8
30 changes: 30 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@

Thank you for contributing to ScummVM. Please read the following carefully before submitting your Pull Request.

Make sure your individual commits follow the guidelines found in the ScummVM Wiki: https://wiki.scummvm.org/index.php?title=Commit_Guidelines. If they're not please edit them before submitting the Pull Request.

Commits and Pull Requests should use the following template:

```
SUBSYSTEM: Short (50 chars or less) summary of changes
More detailed explanatory text, if necessary. Wrap it to about 72
characters or so. In some contexts, the first line is treated as the
subject of an email and the rest of the text as the body. The blank
line separating the summary from the body is critical (unless you omit
the body entirely); tools like rebase can get confused if you run the
two together.
Write your commit message in the present tense: "Fix bug" and not "Fixed
bug." This convention matches up with commit messages generated by
commands like git merge and git revert.
Further paragraphs come after blank lines.
- Bullet points are okay, too
- Typically a hyphen or asterisk is used for the bullet, preceded by a
single space, with blank lines in between, but conventions vary here
- Use a hanging indent
```
65 changes: 54 additions & 11 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
.*.swp
.*.swo
*.o
*.dwo
scummvm.dwp
lib*.a
.deps
*.d
Expand All @@ -26,11 +28,23 @@ lib*.a
/*,e1f
/scummvm-ps3.pkg
/*.ipk
/map.txt
*.elf
/*.nds
/.project
/.cproject
/.settings
/.autotools
/Icon.*
/scummvm-conf.cpp
/tmp_*.cpp

/README
/README.html
/NEWS
/NEWS.html
/doc/de/NEUES
/doc/de/NEUES.html

/build
/staging
Expand All @@ -54,10 +68,16 @@ lib*.a
/backends/platform/ds/arm7/build
/backends/platform/ds/arm7/source/libcartreset/*.bak
/backends/platform/ds/arm7/source/libcartreset/*.d
/backends/platform/ds/arm9/data/*.h
/backends/platform/ds/arm9/scummvm-?

/backends/platform/maemo/scummvm

/backends/platform/symbian/mmp/*.mmp
/backends/platform/symbian/*/ScummVM_*.mmp
!/backends/platform/symbian/*/ScummVM_*_App.mmp
/backends/platform/symbian/*/BLD.INF

/backends/platform/wince/scummvm.exe*
/backends/platform/wince/sound
/backends/platform/wince/tools
Expand Down Expand Up @@ -101,14 +121,14 @@ project.xcworkspace
/dists/macosx/scummvm.xcodeproj
/dists/macosx/create_project

/dists/msvc*/[Dd]ebug*/
/dists/msvc*/[Rr]elease*/
/dists/msvc*/[Aa]nalysis*/
/dists/msvc*/*.lib
/dists/msvc*/*.SAV
/dists/msvc*/*.dat
/dists/msvc*/*.dll
/dists/msvc*/test_runner.cpp
/dists/msvc/[Dd]ebug*/
/dists/msvc/[Rr]elease*/
/dists/msvc/[Aa]nalysis*/
/dists/msvc/*.lib
/dists/msvc/*.SAV
/dists/msvc/*.dat
/dists/msvc/*.dll
/dists/msvc/test_runner.cpp

/dists/engine-data/testbed-audiocd-files/testbed.config
/dists/engine-data/testbed-audiocd-files/testbed.out
Expand All @@ -134,18 +154,24 @@ project.xcworkspace
/devtools/convbdf
/devtools/md5table
/devtools/make-scumm-fontdata
/devtools/create_access/create_access
/devtools/create_cryo/create_cryo_dat
/devtools/create_cryomni3d/create_cryomni3d_dat
/devtools/create_drascula/create_drascula
/devtools/create_glk/create_glk
/devtools/create_hugo/create_hugo
/devtools/create_kyradat/create_kyradat
/devtools/create_lure/create_lure
/devtools/create_mads/create_mads
/devtools/create_mortdat/create_mortdat
/devtools/create_neverhood/create_neverhood
/devtools/create_project/create_project
/devtools/create_supernova/create_supernova
/devtools/create_teenagent/create_teenagent
/devtools/create_titanic/create_titanic
/devtools/create_tony/create_tony
/devtools/create_toon/create_toon
/devtools/create_translations/create_translations
/devtools/create_xeen/create_xeen
/devtools/extract_mort/extract_mort
/devtools/qtable/qtable
/devtools/skycpt/skycpt
Expand Down Expand Up @@ -185,6 +211,7 @@ ipch/
*.tss
*.VC.db
.vs/
UpgradeLog.htm

#Ignore default Visual Studio build folders
[Dd]ebug/
Expand All @@ -196,6 +223,9 @@ ipch/
LLVM32/
LLVM64/

#Ignore files generated by Visual Studio Code
.vscode/

#Ignore gettext generated files
/messages.mo

Expand All @@ -212,12 +242,19 @@ ScummVM.includes
.DS_Store

#Ignore MS Visual C++ temporary files/subdirectories (except create_project.bat)
dists/msvc*/**
!dists/msvc*/create_project.bat
dists/msvc/**
!dists/msvc/create_project.bat

#Ignore bison debug output
*.output

#Ignore CMake build files
CMakeFiles
CMakeCache.txt
cmake_install.cmake
.ninja_*
*.ninja

#Ignore Xcode output/project files
out/
/*.xcodeproj
Expand All @@ -227,6 +264,12 @@ psp2pkg/
*.velf
*.vpk

#Ignore Switch files
switch_release/
scummvm.elf
scummvm.nro
scummvm_switch.zip

#Ignore gmon.out created by gprof
gmon.out
/scummvm_libs_2015
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@ script:
- cd ~/
- git clone --depth=50 https://github.com/libretro/libretro-super
- cd libretro-super/travis
- ./build-long.sh
- ./build-long.sh
Loading

0 comments on commit a063a1b

Please sign in to comment.