Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add needed #include <stdexcept> #195

Merged
merged 3 commits into from
Jun 8, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
102 changes: 1 addition & 101 deletions .cirrus.yml
Original file line number Diff line number Diff line change
@@ -1,43 +1,9 @@
linux-x86_64-binaries_task:
container:
image: ubuntu:latest

setup_script:
- apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y install build-essential curl libgtk2.0-dev libpulse-dev mesa-common-dev libgtksourceview2.0-dev libcairo2-dev libsdl2-dev libxv-dev libao-dev libopenal-dev libudev-dev zip

matrix:
- build_higan_script:
- make -C higan-ui build=performance local=false
- make -C icarus

package_higan_script:
- mkdir higan-nightly
- cp -a higan-ui/out/higan higan-nightly/higan
- cp -a higan/System higan-nightly
- cp -a icarus/out/icarus higan-nightly/icarus
- cp -a icarus/Database higan-nightly
- cp -a icarus/Firmware higan-nightly
- cp -a GPLv3.txt higan-nightly
- cp -a extras/* higan-nightly
- zip -r higan-nightly.zip higan-nightly

matrix:
- only_if: $CIRRUS_RELEASE != ""
environment:
OS: linux-x86_64
GITHUB_TOKEN: ENCRYPTED[7a134a5ab55ae4be1e91c44040969d89e5f4017e2d71f4f03fbde21e136085b6f366c33e0bbcc2d2c6d23914a149aa66]
upload_script: ./.cirrus.upload.sh
- only_if: $CIRRUS_RELEASE == ""

higan-nightly_artifacts:
path: "higan-nightly.zip"

freebsd-x86_64-binaries_task:
freebsd_instance:
image_family: freebsd-12-2

setup_script:
- pkg install --yes curl gmake gdb gcc8 pkgconf sdl2 openal-soft gtksourceview2 libXv zip
- pkg install --yes curl gmake gdb gcc8 pkgconf sdl2 openal-soft gtk3 gtksourceview3 libXv zip

matrix:
- build_higan_script:
Expand Down Expand Up @@ -65,69 +31,3 @@ freebsd-x86_64-binaries_task:

higan-nightly_artifacts:
path: "higan-nightly.zip"

windows-x86_64-binaries_task:
container:
image: ubuntu:latest

setup_script:
- apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y install build-essential curl mingw-w64 zip

matrix:
- build_higan_script:
- make -C higan-ui build=performance local=false platform=windows compiler="x86_64-w64-mingw32-g++" windres="x86_64-w64-mingw32-windres"
- make -C icarus platform=windows compiler="x86_64-w64-mingw32-g++" windres="x86_64-w64-mingw32-windres"

package_higan_script:
- mkdir higan-nightly
- cp -a higan-ui/out/higan.exe higan-nightly/higan.exe
- cp -a icarus/out/icarus.exe higan-nightly/icarus.exe
- cp -a higan/System higan-nightly/Templates
- mkdir higan-nightly/Systems
- cp -a icarus/Database higan-nightly
- cp -a icarus/Firmware higan-nightly
- cp -a GPLv3.txt higan-nightly
- cp -a extras/* higan-nightly
- zip -r higan-nightly.zip higan-nightly

matrix:
- only_if: $CIRRUS_RELEASE != ""
environment:
OS: windows-x86_64
GITHUB_TOKEN: ENCRYPTED[7a134a5ab55ae4be1e91c44040969d89e5f4017e2d71f4f03fbde21e136085b6f366c33e0bbcc2d2c6d23914a149aa66]
upload_script: ./.cirrus.upload.sh
- only_if: $CIRRUS_RELEASE == ""

higan-nightly_artifacts:
path: "higan-nightly.zip"

macOS-x86_64-binaries_task:
osx_instance:
image: mojave-base

matrix:
- build_higan_script:
- make -C higan-ui build=performance local=false
- make -C icarus

package_higan_script:
- mkdir higan-nightly
- cp -a higan-ui/out/higan.app higan-nightly
- cp -a higan/System higan-nightly
- cp -a icarus/out/icarus.app higan-nightly
- cp -a icarus/Database higan-nightly
- cp -a icarus/Firmware higan-nightly
- cp -a GPLv3.txt higan-nightly
- cp -a extras/* higan-nightly
- zip -r higan-nightly.zip higan-nightly

matrix:
- only_if: $CIRRUS_RELEASE != ""
environment:
OS: macOS-x86_64
GITHUB_TOKEN: ENCRYPTED[7a134a5ab55ae4be1e91c44040969d89e5f4017e2d71f4f03fbde21e136085b6f366c33e0bbcc2d2c6d23914a149aa66]
upload_script: ./.cirrus.upload.sh
- only_if: $CIRRUS_RELEASE == ""

higan-nightly_artifacts:
path: "higan-nightly.zip"
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
if: matrix.os.name == 'ubuntu'
run: |
sudo apt-get update -y -qq
sudo apt-get install libsdl2-dev libgtksourceview2.0-dev libgtk2.0-dev libao-dev libopenal-dev
sudo apt-get install libsdl2-dev libgtk-3-dev gtksourceview-3.0 libao-dev libopenal-dev
- name: Make
run: make -j4 -C ${{ matrix.program }} build=performance local=false
- name: Upload
Expand Down
58 changes: 4 additions & 54 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,60 +33,10 @@ Nightly Builds
Automated, untested builds of higan are available
for each supported operating system:

<table>
<tr>
<th scope=row>Windows</th>
<td>
<a href="https://api.cirrus-ci.com/v1/artifact/github/higan-emu/higan/windows-x86_64-binaries/higan-nightly/higan-nightly.zip">
higan
</a>
</td>
<td>
<img
src="https://api.cirrus-ci.com/github/higan-emu/higan.svg?task=windows-x86_64-binaries"
alt="">
</td>
</tr>
<tr>
<th scope=row>Linux</th>
<td>
<a href="https://api.cirrus-ci.com/v1/artifact/github/higan-emu/higan/linux-x86_64-binaries/higan-nightly/higan-nightly.zip">
higan
</a>
</td>
<td>
<img
src="https://api.cirrus-ci.com/github/higan-emu/higan.svg?task=linux-x86_64-binaries"
alt="">
</td>
</tr>
<tr>
<th scope=row>macOS</th>
<td>
<a href="https://api.cirrus-ci.com/v1/artifact/github/higan-emu/higan/macOS-x86_64-binaries/higan-nightly/higan-nightly.zip">
higan
</a>
</td>
<td>
<img
src="https://api.cirrus-ci.com/github/higan-emu/higan.svg?task=macOS-x86_64-binaries"
alt="">
</td>
</tr>
<tr>
<th scope=row>FreeBSD</th>
<td>
<a href="https://api.cirrus-ci.com/v1/artifact/github/higan-emu/higan/freebsd-x86_64-binaries/higan-nightly/higan-nightly.zip">
higan
</a>
</td>
<td>
<img
src="https://api.cirrus-ci.com/github/higan-emu/higan.svg?task=freebsd-x86_64-binaries"
alt="">
</td>
</tr>
</table>
- [Windows](https://github.com/Screwtapello/higan/releases/download/nightly/higan-windows.zip)
- [macOS](https://github.com/Screwtapello/higan/releases/download/nightly/higan-macos.zip)
- [Ubuntu Linux](https://github.com/Screwtapello/higan/releases/download/nightly/higan-ubuntu.zip)
- [FreeBSD](https://api.cirrus-ci.com/v1/artifact/github/higan-emu/higan/freebsd-x86_64-binaries/higan-nightly/higan-nightly.zip)

Preview
-------
Expand Down
2 changes: 1 addition & 1 deletion hiro/GNUmakefile
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ endif

ifneq ($(filter $(platform),linux bsd),)
ifeq ($(hiro),)
hiro := gtk2
hiro := gtk3
endif

ifeq ($(hiro),gtk2)
Expand Down
2 changes: 2 additions & 0 deletions nall/arithmetic.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
//multi-precision arithmetic
//warning: each size is quadratically more expensive than the size before it!

#include <stdexcept>

#include <nall/stdint.hpp>
#include <nall/string.hpp>
#include <nall/range.hpp>
Expand Down