Merge branch 'libretro:master' into master

.editorconfig

@@ -1,4 +1,4 @@
-# EditorConfig: http://EditorConfig.org
+# EditorConfig: https://EditorConfig.org
 
 # Top-most EditorConfig file
 root = true

.github/workflows/crowdin.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Setup Java JDK
-        uses: actions/setup-java@v1.3.0
+        uses: actions/setup-java@v1
         with:
           java-version: 1.8
       - name: Setup Python

.gitignore

@@ -9,6 +9,8 @@
 *.map
 *.swp
 *.cache
+*.gcda
+*.gcno
 .tmp
 .tmp.c
 .tmp.cxx
@@ -69,6 +71,7 @@ apple/RetroArch_iOS.xcodeproj/project.xcworkspace/*
 /rsound.h
 .pc
 /media/shaders_glsl/
+/media/shaders_slang/
 /obj-w32/
 .cproject
 .settings
@@ -78,6 +81,7 @@ convert_rumble.awk
 *~
 assets
 info
+content_favorites.lpl
 content_history.lpl
 content_image_history.lpl
 content_music_history.lpl
@@ -90,7 +94,6 @@ database
 overlays
 playlists
 states
-system
 shaders/shaders_cg
 shaders/shaders_glsl
 shaders/shaders_slang
@@ -213,3 +216,11 @@ libretro-common/samples/streams/rzip/rzip
 
 # DINGUX
 *.opk
+
+#VITA
+param.sfo
+*.wo
+*.elf
+*.self
+*.vpk
+/.vs

.travis.yml

@@ -70,29 +70,6 @@ matrix:
       script:
         - ./configure --enable-opengl --disable-metal
         - make
-    - os: osx
-      osx_image: xcode8
-      script:
-        - xcodebuild -target RetroArch -configuration Release -project pkg/apple/RetroArch.xcodeproj
-    - os: osx
-      osx_image: xcode11.2
-      script:
-        - brew update-reset
-        - brew install --force-bottle qt5
-        - security create-keychain -p travis build.keychain
-        - security default-keychain -s build.keychain
-        - security unlock-keychain -p travis build.keychain
-        - echo $OSX_CERT | base64 --decode > dev.p12
-        - security import dev.p12 -k build.keychain -P $OSX_CERT_PASS -T /usr/bin/codesign
-        - rm dev.p12
-        - security set-key-partition-list -S "apple-tool:,apple:,codesign:" -s -k travis build.keychain
-        - xcodebuild -target RetroArchQt -configuration Release -project pkg/apple/RetroArch_Metal.xcodeproj
-      deploy:
-        skip_cleanup: true
-        provider: script
-        script: bash travis_metal_deploy.sh
-        on:
-          branch: master
     - language: android
       # Android builds are only supported on Trusty
       dist: trusty

AUTHORS.h

@@ -93,7 +93,6 @@ ekipan
 Emmanuel Martin (daliaetnano)
 endrift
 erbridge
-esoptron
 Ethan Lee (flibitijibibo)
 Exvat
 Ezio-PS
@@ -214,6 +213,7 @@ Nathan S. (natinusala)
 NathanStrong-Tripwire
 nattycleopatra
 nayslayer
+Nephilim
 netux79
 nfnty
 nia (ensra)

Makefile

@@ -22,7 +22,7 @@ endif
 
 OBJ :=
 LIBS :=
-DEF_FLAGS :=
+DEF_FLAGS := -I.
 ASFLAGS :=
 DEFINES := -DHAVE_CONFIG_H -DRARCH_INTERNAL -D_FILE_OFFSET_BITS=64
 DEFINES += -DGLOBAL_CONFIG_DIR='"$(GLOBAL_CONFIG_DIR)"'
@@ -118,7 +118,7 @@ ifneq ($(CXX_BUILD), 1)
    CFLAGS += -D_GNU_SOURCE
 endif
 
-DEF_FLAGS += $(INCLUDE_DIRS) -I. -Ideps -Ideps/stb
+DEF_FLAGS += $(INCLUDE_DIRS) -Ideps -Ideps/stb
 
 CFLAGS += $(DEF_FLAGS)
 CXXFLAGS += $(DEF_FLAGS) -D__STDC_CONSTANT_MACROS