diff --git a/.github/workflows/build_new.yml b/.github/workflows/build.yml similarity index 99% rename from .github/workflows/build_new.yml rename to .github/workflows/build.yml index a23cdc3c9..041372d45 100644 --- a/.github/workflows/build_new.yml +++ b/.github/workflows/build.yml @@ -1,4 +1,4 @@ -name: Build (New) +name: Build on: workflow_call: inputs: diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index dd36661b6..0395894ec 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -12,6 +12,6 @@ concurrency: jobs: build-project: name: Build - uses: ./.github/workflows/build_new.yml + uses: ./.github/workflows/build.yml permissions: contents: read diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 0fc5adbc7..7dbbc0764 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -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 diff --git a/LICENSE b/LICENSE index 6e81bab67..876f24216 100644 --- a/LICENSE +++ b/LICENSE @@ -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 diff --git a/README.md b/README.md index e551b0683..c93e683e4 100644 --- a/README.md +++ b/README.md @@ -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 -------------------- @@ -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) diff --git a/scripts/macos-make-universal_new.sh b/scripts/macos-make-universal.sh similarity index 100% rename from scripts/macos-make-universal_new.sh rename to scripts/macos-make-universal.sh diff --git a/scripts/update-subtrees.sh b/scripts/update-subtrees.sh index dc92442ef..484f7d4ff 100755 --- a/scripts/update-subtrees.sh +++ b/scripts/update-subtrees.sh @@ -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