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
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
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
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
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
Ricky Zhang
b0bdceac34
Revert "Merge pull request #190 from fragglet/patch-1"
...
This reverts commit a4a2c88ed7d13df0d16c3f8a737fc06f329b70cc, reversing
changes made to 1918557e787da22766797f4354c1af13de06a09e.
2020-06-25 09:43:20 -04: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
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
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
bolt
c6e1af7ff4
Fix compile time warning on enum compare
2020-04-09 15:07:29 +02:00
bolt
767b97311b
Add the strings from commit 00f02d9d0c47cda3ca42ef2efca29900087613c7 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
rakslice
2a6dc7e328
clean up some warnings
2020-03-17 18:47:02 -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
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
7062e864c8
Fixed SS build
2020-03-06 10:38:56 +09:00
kanjitalk755
e4ee28b199
Supports etherhelper (Xcode only)
2020-03-05 16:07:59 +09:00
kanjitalk755
0ad7a968ba
Merge remote-tracking branch 'dsumorok/master'
2020-03-05 15:53:44 +09:00
kanjitalk755
1601829d22
BII: changed monitor default
2020-02-17 11:54:48 +09:00
Andrew Tonner
8b44b00da3
In extfs icon creation, ensure that the times on the host file are set correctly; actually allocate space for the other HInfo that set_finfo reads, such as the times
2020-02-12 16:28:00 -08:00
Andrew Tonner
837c82d8b8
expect TCHAR returns from RegQueryValueEx now that we are potentially building with _UNICODE
2020-02-12 16:16:31 -08:00
Andrew Tonner
07e9db881c
failsafe for localtime(-1) on Windows to avoid segfault
2020-02-12 16:13:26 -08:00
Andrew Tonner
744df7adf3
Don't try to receive frames when eth is unloaded on the MacOS side as it will call uninitialized vectors
2020-02-11 06:38:01 -08:00
kanjitalk755
7b13571587
Merge branch 'test_keymap'
2020-02-10 09:58:54 +09:00
kanjitalk755
c4570fe272
Merge branch 'test_notX'
2020-02-08 19:21:14 +09:00
kanjitalk755
6d2acbb07b
revert Makefile.in
2020-02-07 17:57:44 +09:00
kanjitalk755
ccf38a4005
condition modified
2020-02-07 11:16:59 +09:00
Andrew Tonner
f86b9b2abd
Actually remove the commented-out code
2020-02-06 18:14:16 -08:00
Andrew Tonner
bb69145861
OulanB's adb button buffer proposed change
2020-02-06 18:12:23 -08:00
kanjitalk755
1a875b1c10
in case backend is not X
2020-02-07 11:04:02 +09:00
Seth Polsley
899734d81d
Removing core audio flag for BII builds
2020-02-05 04:30:17 -06:00
