3253 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
asvitkine	a21ad0d7c4	Merge pull request #211 from rickyzhang82/pr-fix-indentation ... Fix indentation.	2020-07-03 17:05:58 -04:00
Ricky Zhang	98f3cab953	Fix indentation. ... Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>	2020-07-03 10:00:15 -04:00
asvitkine	ef57fd2c5f	Merge pull request #210 from rickyzhang82/pr-enhance-sdl2-scale-up ... Enhanced scale up and scale down in SDL2.	2020-07-02 20:15:37 -04:00
Ricky Zhang	6f4da45eeb	Enhanced scale up and scale down in SDL2. ... - Enable window mode to be resizable. - When restore the window, restore the scale ratio to 1. Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>	2020-07-02 18:35:18 -04:00
asvitkine	864b4a1652	Merge pull request #206 from rickyzhang82/pr-fix-framebuffer-bug ... Abort when frame buffer memory allocation fails.	2020-07-01 21:36:25 -04:00
asvitkine	b49d9b7485	Merge pull request #205 from rickyzhang82/pr-fix-mac-hang ... For Darwin, the default addressing mode is memory banks.	2020-07-01 21:35:47 -04:00
asvitkine	03f5cc8c79	Merge pull request #209 from rickyzhang82/pr-travis-ci ... Beef up CI test cases	2020-07-01 21:35:22 -04:00
Ricky Zhang	0b38469385	Add Mac OS X CI. ... Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>	2020-06-30 21:20:22 -04:00
Ricky Zhang	d30528795b	Beef up CI build cases. ... - Add addressing modes direct and memory banks. Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>	2020-06-30 20:43:54 -04:00
Ricky Zhang	bdf5a276d3	Abort when frame buffer memory allocation fails. ... - Remove unused code in vm_acquire_framebuffer function. Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>	2020-06-30 18:25:50 -04:00
Ricky Zhang	56665d30a3	For Darwin, the default addressing mode is memory banks. ... When the host OS is Mac OS X, direct addressing in BII doesn't guarantee that the allocated memory for frame buffer base address in the host (FrameBaseHost) satisfies the following conditions: - FrameBaseHost > RamBaseHost - (FrameBaseHost - RamBaseHost) + Frame_Size < 4GiB where RamBaseHost refers to the emulated RAM base address in the host. This may cause the random hang problem where the allocated frame address failed to meet the conditions above. Because the direct addressing mapping is a simple math: RamAddrMac = RamAddrHost - RamBaseHost. See details: https://github.com/cebix/macemu/issues/203 Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>	2020-06-30 18:07:25 -04:00
asvitkine	16081b2878	Merge pull request #202 from rickyzhang82/pr-enable-sdl2 ... Enable SDL2 for Linux and Mac OS X	2020-06-29 22:15:43 -04:00
Ricky Zhang	18701c97df	Fix year in project ... Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>	2020-06-29 22:10:27 -04:00
Ricky Zhang	8e88e462ee	Fix code review issues. ... Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>	2020-06-28 18:42:14 -04:00
Ricky Zhang	e6cd178881	Point CI status to upstream-master branch. ... Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>	2020-06-28 10:29:52 -04:00
Ricky Zhang	1bfb0e94a3	Back out the hack from kanjitalk755 ... Remove the unused header. Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>	2020-06-27 12:13:51 -04:00
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