Commit Graph

3387 Commits

Author SHA1 Message Date
Ricky Zhang
9ef2f87adb
Add CI for SDL1 and SDL2.
Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
2020-06-27 00:17:25 -04:00
Ricky Zhang
dc8bb7e2a3
Back out the hack from kanjitalk755
- In 8 bit color game, the hack crashed the app.
- After backing out the hack, I can play 256 color game with displaycolordepth 8.
- By default, the displaycolordepth is 0.

Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
2020-06-25 16:56:40 -04:00
Ricky Zhang
d28599f49d
Backport MacOSX support.
- video_sdl2 for Mac OS X requires MacOSX update.

Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
2020-06-25 15:50:40 -04:00
Ricky Zhang
a46759990d
Backport SDL2 features from https://github.com/kanjitalk755/macemu
By default, without providing `with-sdl2` in configure it uses SDL1.
Users need to explicitly request SDL2.

Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
2020-06-25 15:28:41 -04:00
asvitkine
5cbf07e9f5
Merge pull request #201 from rickyzhang82/pr-revert-broken-commit
Revert "Merge pull request #190 from fragglet/patch-1"
2020-06-25 10:24:37 -04:00
Ricky Zhang
b0bdceac34 Revert "Merge pull request #190 from fragglet/patch-1"
This reverts commit a4a2c88ed7, reversing
changes made to 1918557e78.
2020-06-25 09:43:20 -04:00
asvitkine
b2d281e5ab
Merge pull request #200 from aviallon/patch-int-narrowing
Fix build fail under GCC 10
2020-06-20 13:48:03 -04:00
Antoine Viallon
f13f25db3e
Fix build fail under GCC 10
GCC fails to build because of -Wnarrowing
2020-06-20 19:19:49 +02:00
kanjitalk755
607f4ed354 avoid compile error in g++10 2020-06-03 19:10:08 +09:00
kanjitalk755
9895200f79 fixed video contstants 2020-06-02 22:49:03 +09:00
Seth Polsley
23da9e72eb Fix handling of nocdrom 2020-05-25 18:55:56 -05:00
Seth Polsley
bebeacc895 adding adb back for build, fixing automerge problem 2020-05-25 16:52:45 -05:00
Seth Polsley
8e110b063c Merge branch 'master' into cdaudio_test 2020-05-25 16:31:02 -05:00
Seth Polsley
eb722fc799 Merge remote-tracking branch 'upstream/master' 2020-05-25 16:21:28 -05:00
Seth Polsley
7eb7a477d0 clang debug flag adjustment 2020-05-25 15:58:15 -05:00
kanjitalk755
a01387b1af prefs item "sdlrender" 2020-05-18 17:39:05 +09:00
kanjitalk755
a528b0a40f BII: fixed writing xpram file 2020-05-16 21:18:16 +09:00
asvitkine
cbad6f95ea
Merge pull request #196 from b01t/fix_warnings
Fix compile time warning on enum compare
2020-05-05 17:50:41 -04:00
asvitkine
9a905723db
Merge pull request #198 from rillig/patch-1
src/Unix/Darwin/testlmem.sh: make code shorter
2020-05-05 17:50:15 -04:00
Roland Illig
8a4b84b9d7
src/Unix/Darwin/testlmem.sh: make code shorter
The old code used the `[[` shell keyword, which is only available in bash.
The interpreter in line 1 is `/bin/sh` though.
This confused my shell portability check in pkgsrc, since that check neither guesses the target platform from the filename, nor assumes that `/bin/sh` is actually bash, even though this may be true on macOS.

The change makes the code shorter with the well-known `${var:-default}` pattern.
Since `$1` is now only accessed when it is defined, this allows the program to have a `set -eu` at the top.
This in turn would make all the `&&` redundant since it applies automatic error checking.

The `{ ... } 1>&2` could also be replaced with a single `exec 1>&2` at the top.
2020-05-05 19:48:35 +02:00
asvitkine
7790aa7e0c
Merge pull request #195 from b01t/master
Add the strings from commit 00f02d9d0c
2020-04-12 20:06:18 -04:00
bolt
5670c82b0d Fix compile time warning on enum compare 2020-04-09 15:22:00 +02:00
bolt
c6e1af7ff4 Fix compile time warning on enum compare 2020-04-09 15:07:29 +02:00
bolt
767b97311b Add the strings from commit 00f02d9d0c to user_strings.h 2020-04-09 14:50:07 +02:00
kanjitalk755
617a723a16
Merge pull request #40 from emendelson/master
New icons; removed unused icon code
2020-03-27 23:27:43 +09:00
emendelson
0e01e5c91e New icons; removed unused icon code
Replace (again) the Windows and MacOS icons and remove the c-file icons and the reference to them in the source.
2020-03-26 20:27:24 -04:00
kanjitalk755
27d3d93b7c
Merge pull request #39 from emendelson/master
Updated icons; add Windows medium icon
2020-03-24 09:15:23 +09:00
kanjitalk755
c0dfecdd1a fix error for linux build 2020-03-23 11:58:42 +09:00
emendelson
8ca7815baf Updated icons; add Windows medium icon
Replace the existing icons with the 7/8 design; add a 48x48 icon for the Windows build.
2020-03-22 14:00:18 -04:00
kanjitalk755
946f4bb77d BII/SS common: read keycodes, if failed, read BasiliskII_keycodes 2020-03-21 19:48:58 +09:00
kanjitalk755
b3c4d46ca9 changed default keycodes file name 2020-03-21 10:21:53 +09:00
kanjitalk755
ecef51bc47 fixed keycodes file name (SS)
fixed capslock (Windows)
2020-03-19 11:10:02 +09:00
kanjitalk755
c4956c40f8
Update README.md 2020-03-18 15:29:20 +09:00
kanjitalk755
6fe0d3ab7c SS Windows: enabled JIT compiler by default 2020-03-18 15:27:54 +09:00
kanjitalk755
573adb507f
Merge pull request #37 from rakslice/sheepshaver_mingw32_jit
SS mingw32 JIT & GTK prefs GUI fixes
2020-03-18 15:13:23 +09:00
rakslice
9dabd45086 bump dyngen output for updated bswap_16 2020-03-17 19:37:58 -07:00
rakslice
2a6dc7e328 clean up some warnings 2020-03-17 18:47:02 -07:00
rakslice
40cb4bf236 implementing bswap_16 to avoid incorrect result from cygwin 1.7 gcc 3.4.4 built dyngen for lhz 2020-03-17 18:46:40 -07:00
rakslice
12f8469172 fix clean of dyngen binary 2020-03-17 18:21:36 -07:00
rakslice
d936e9938d SS: Fix JIT on minwg32
- add wrappers with default calling convention for powerpc_cpu member functions used through nv_mem_fun ptr()
** explicit wrappers for member functions that were used explicitly
** dynamic wrapper generator in nv_mem_fun1_t for member functions used dynamically via the instruction table
- add missing direct addressing (non-zero constant offset to Mac memory) support in lvx and stvx implementations
- fix mismatched parameter lists between powerpc_jit member functions and the calls they get through the jit_info table to fix problems at -O2
2020-03-17 17:45:38 -07:00
rakslice
a667dc9787 SS: add pregenerated dyngen output from cygwin; on cygwin run the dyngen, otherwise on Windows use this pregenerated dyngen 2020-03-17 16:31:00 -07:00
rakslice
ef2f205d6b Remove frsqrte dyngen op def because do_frsqrte is missing 2020-03-17 16:24:14 -07:00
rakslice
cd269a9ce1 In SheepShaver GUI don't show JIT checkbox in non-JIT build 2020-03-17 16:24:07 -07:00
rakslice
f1b0a20b37 get prefs_editor_gtk building in mingw32 2020-03-17 16:13:44 -07:00
rakslice
aeb585527d changes for buildability under MSYS2 mingw32 2020-03-17 15:11:12 -07:00
asvitkine
a4a2c88ed7
Merge pull request #190 from fragglet/patch-1
configure: Enable /dev/ptmx for Linux, Darwin.
2020-03-15 19:04:20 -04:00
asvitkine
1918557e78
Merge pull request #192 from anabate123/patch-1
Added more Mac models to the ModelID string
2020-03-15 19:04:08 -04:00
anabate123
00f02d9d0c
Added more Mac models to the ModelID string 2020-03-14 18:59:27 -04:00
kanjitalk755
59ce931955 fixed destroying bridge 2020-03-08 12:33:44 +09:00
kanjitalk755
f9eae2025f SS: Added etherhelper (Xcode only) 2020-03-06 19:10:01 +09:00