mirror/86Box
1
0
Fork 0
mirror of https://github.com/86Box/86Box.git synced 2026-02-27 17:34:25 -07:00
Code Issues Packages Projects Releases Activity

Merge branch '86Box:master' into unix_ods

Browse Source
This commit is contained in:
Valerio Vitali
2025-09-14 19:05:09 +02:00
committed by GitHub
parent 677a50dda4 38759c1ae0
commit ba5db694f8
112 changed files with 1978 additions and 19866 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/unix/assets/86Box.spec
View File

@@ -15,7 +15,7 @@
%global romver 4.1
Name: 86Box
Version: 5.1
Version: 6.0
Release: 1%{?dist}
Summary: Classic PC emulator
License: GPLv2+
@@ -72,7 +72,7 @@ Collection of ROMs for use with 86Box.
%autosetup -p1 -a1
%build
%ifarch i386 x86_64
%ifarch x86_64
%cmake -DRELEASE=on
%else
%ifarch arm aarch64
@@ -121,5 +121,5 @@ popd
%{_datadir}/%{name}/roms
%changelog
* Sat Aug 31 Jasmine Iwanek <jriwanek[AT]gmail.com> 5.1-1
* Sat Aug 31 Jasmine Iwanek <jriwanek[AT]gmail.com> 6.0-1
- Bump release

2
src/unix/assets/net.86box.86Box.metainfo.xml
View File

@@ -11,7 +11,7 @@
</categories>
<launchable type="desktop-id">net.86box.86Box.desktop</launchable>
<releases>
<release version="5.1" date="2025-08-27"/>
<release version="6.0" date="2025-09-14"/>
</releases>
<content_rating type="oars-1.1" />
<description>

6
src/unix/unix.c
View File

@@ -1027,12 +1027,8 @@ unix_executeLine(char *line)
# define EMU_GIT_HASH "0000000"
# endif
# if defined(__arm__) || defined(__TARGET_ARCH_ARM)
# define ARCH_STR "arm"
# elif defined(__aarch64__) || defined(_M_ARM64)
# if defined(__aarch64__) || defined(_M_ARM64)
# define ARCH_STR "arm64"
# elif defined(__i386) || defined(__i386__) || defined(_M_IX86)
# define ARCH_STR "i386"
# elif defined(__x86_64) || defined(__x86_64__) || defined(__amd64) || defined(_M_X64)
# define ARCH_STR "x86_64"
# else