Skip to content

Commit 7bd8425

Browse files
authored
Merge branch 'libretro:master' into master
2 parents a1a93f4 + e2fd7bd commit 7bd8425

7 files changed

Lines changed: 108 additions & 7 deletions

File tree

.github/workflows/artifacts.yml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: add artifact links to pull request and related issues
2+
on:
3+
workflow_run:
4+
workflows: ["Build"]
5+
types: [completed]
6+
7+
jobs:
8+
artifacts-url-comments:
9+
name: add artifact links to pull request and related issues job
10+
runs-on: windows-2019
11+
steps:
12+
- name: add artifact links to pull request and related issues step
13+
uses: tonyhallett/[email protected]
14+
env:
15+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
16+
with:
17+
prefix: Here are the artifacts
18+
suffix: Have a nice day.
19+
format: name
20+
addTo: pullandissues

.github/workflows/c-cpp.yml

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
name: C/C++ CI
2+
3+
on:
4+
push:
5+
branches: [ master ]
6+
pull_request:
7+
branches: [ master ]
8+
9+
jobs:
10+
build:
11+
strategy:
12+
fail-fast: false
13+
matrix:
14+
config:
15+
- displayTargetName: 'Ubuntu Latest GCC'
16+
artifact: 'virtualjaguar_libretro.so'
17+
os: ubuntu-latest
18+
build_type: 'Release'
19+
cc: 'gcc'
20+
cxx: 'g++'
21+
- displayTargetName: 'macOS Latest Clang'
22+
artifact: 'virtualjaguar_libretro.dylib'
23+
os: macos-latest
24+
build_type: 'Release'
25+
cc: 'clang'
26+
cxx: 'clang++'
27+
# - displayTargetName: 'Windows Latest MinGW'
28+
# artifact: 'virtualjaguar_libretro.so'
29+
# os: windows-latest
30+
# build_type: 'Release'
31+
# cc: 'gcc'
32+
# cxx: 'g++'
33+
34+
name: build-${{matrix.config.os}}
35+
runs-on: ${{ matrix.config.os }}
36+
37+
steps:
38+
- uses: actions/checkout@v2
39+
- name: Add Msys64 to PATH
40+
if: matrix.config.os == 'windows-latest'
41+
run: |
42+
echo "/c/msys64/mingw64/bin" >> $GITHUB_PATH
43+
echo "/c/msys64/usr/bin" >> $GITHUB_PATH
44+
shell: bash
45+
- name: make
46+
run: make -j4
47+
48+
# - name: Upload the artifacts
49+
# uses: skx/github-action-publish-binaries@master
50+
# env:
51+
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
52+
# with:
53+
# args: ${{ matrix.config.artifact }}
54+
55+
- name: upload artifacts
56+
uses: actions/upload-artifact@v2
57+
with:
58+
name: core-${{ matrix.config.os }}
59+
path: ${{ matrix.config.artifact }}
60+
if-no-files-found: error
61+
62+
- name: download artifacts
63+
uses: actions/download-artifact@v2
64+
with:
65+
name: core-${{ matrix.config.os }}

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,5 @@
55
*.exe
66
*.js
77
*.bc
8+
.DS_Store
9+
.build

README.md

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,27 @@
1-
virtualjaguar-libretro
2-
======================
1+
# virtualjaguar-libretro
32

4-
Port of Virtual Jaguar to Libretro
3+
## _Port of Virtual Jaguar to Libretro_
54

5+
---
6+
7+
<span align="center">
8+
<a href="https://github.com/libretro/virtualjaguar-libretro/actions/workflows/c-cpp.yml" alt="CI/CD">
9+
<img src="https://github.com/libretro/virtualjaguar-libretro/actions/workflows/c-cpp.yml/badge.svg" />
10+
</a>
11+
<a href="https://lgtm.com/projects/g/libretro/virtualjaguar-libretro/alerts/" alt="Total alerts">
12+
<img src="https://img.shields.io/lgtm/alerts/g/libretro/virtualjaguar-libretro.svg?logo=lgtm&logoWidth=18" />
13+
</a>
14+
<a href="https://lgtm.com/projects/g/libretro/virtualjaguar-libretro/context:cpp" alt="Language grade: C/C++">
15+
<img src="https://img.shields.io/lgtm/grade/cpp/g/libretro/virtualjaguar-libretro.svg?logo=lgtm&logoWidth=18" />
16+
</a>
17+
</span>
18+
19+
## Links
20+
621
Upstream: `git clone http://shamusworld.gotdns.org/git/virtualjaguar`
722

823
Unofficial GitHub mirror: https://github.com/mirror/virtualjaguar
924

10-
Needs battery saves
25+
## Notices
26+
27+
Battery saves unsupported

libretro.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#include <stdio.h>
21
#include <stdlib.h>
32
#include <string.h>
43
#include <libretro.h>

src/blitter.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
#include "blitter.h"
2424

2525
#include <stdlib.h>
26-
#include <stdio.h>
2726
#include <string.h>
2827
#include "jaguar.h"
2928
#include "settings.h"

src/m68000/sysdeps.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
#ifndef UAE_SYSDEPS_H
2323
#define UAE_SYSDEPS_H
2424

25-
#include <stdio.h>
2625
#include <stdlib.h>
2726
#include <assert.h>
2827
#include <limits.h>

0 commit comments

Comments
 (0)