Skip to content

Commit

Permalink
Update scripts and documentation
Browse files Browse the repository at this point in the history
  • Loading branch information
jcm93 authored and LukeUsher committed Feb 6, 2025
1 parent b4ef96e commit 1323a62
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 11 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Build (New)
name: Build
on:
workflow_call:
inputs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ concurrency:
jobs:
build-project:
name: Build
uses: ./.github/workflows/build_new.yml
uses: ./.github/workflows/build.yml
permissions:
contents: read
2 changes: 1 addition & 1 deletion .github/workflows/push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ permissions:
jobs:
build:
name: Build ares
uses: ./.github/workflows/build_new.yml
uses: ./.github/workflows/build.yml
secrets: inherit
with:
codesign: true
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
----------------------------------------------------------------------
ares

Copyright (c) 2004-2024 ares team, Near et al
Copyright (c) 2004-2025 ares team, Near et al

Permission to use, copy, modify, and/or distribute this software for any
purpose with or without fee is hereby granted, provided that the above
Expand Down
8 changes: 3 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,21 +14,19 @@ Official releases are available from
Nightly Builds
--------------

Automated, untested builds of ares are available for Windows and macOS as a [pre-release](https://github.com/higan-emu/ares/releases/tag/nightly).
Automated, untested builds of ares are available for Windows and macOS as a [pre-release](https://github.com/ares-emulator/ares/releases/tag/nightly).
Only the latest nightly build is kept.

Building ares
-------------

Build instructions are available on the ares wiki. See build instructions for:
ares supports building on Windows, macOS, and various Linux/BSD distributions. See build instructions for:

* [Windows](https://github.com/ares-emulator/ares/wiki/Build-Instructions-For-Windows)
* [macOS](https://github.com/ares-emulator/ares/wiki/Build-Instructions-For-macOS)
* [Linux](https://github.com/ares-emulator/ares/wiki/Build-Instructions-For-Linux)
* [BSD](https://github.com/ares-emulator/ares/wiki/Build-Instructions-For-BSD)

For legacy Makefile build instructions, see [here](https://github.com/ares-emulator/ares/wiki/Legacy-Build-Instructions).

Command-line options
--------------------

Expand All @@ -40,7 +38,7 @@ Usage: ./ares [options] game(s)
--help Displays available options and exit
--fullscreen Start in full screen mode
--system system Specify the system name
--shader shader Specify GLSL shader name to load (requires OpenGL driver)
--shader shader Specify a slang shader to load (requires OpenGL or Metal)
--setting name=value Specify a value for a setting
--dump-all-settings Show a list of all existing settings and exit
--no-file-prompt Do not prompt to load (optional) additional roms (eg: 64DD)
Expand Down
File renamed without changes.
2 changes: 0 additions & 2 deletions scripts/update-subtrees.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,4 @@ cd "$(dirname "$0")"/.. || exit 1
git subtree pull --prefix=ares/n64/vulkan/parallel-rdp https://github.com/Themaister/parallel-rdp-standalone.git master --squash
git subtree pull --prefix=thirdparty/sljit https://github.com/zherczeg/sljit.git master --squash
git subtree pull --prefix=thirdparty/libchdr https://github.com/rtissera/libchdr master --squash
git subtree pull --prefix=thirdparty/librashader https://github.com/SnowflakePowered/librashader master --squash
git subtree pull --prefix=thirdparty/slang-shaders https://github.com/libretro/slang-shaders master --squash
git subtree pull --prefix=thirdparty/ymfm https://github.com/aaronsgiles/ymfm main --squash

0 comments on commit 1323a62

Please sign in to comment.