Macintosh-Tools/macemu
1
0
Fork 0
mirror of https://github.com/kanjitalk755/macemu.git synced 2024-11-28 08:49:32 +00:00
Code Issues Projects Releases Wiki Activity
2,887 Commits 5 Branches 17 Tags 21 MiB
zydeco_rootless
Commit Graph

1775 Commits

Author SHA1 Message Date
kanjitalk755
e676dbf839 BII/SS pref item "yearofs" 2019-02-05 18:44:24 +09:00
kanjitalk755
805ba753b2 SS preference "Save and Quit" button 2019-02-02 19:53:00 +09:00
kanjitalk755
10de3e7239 static link (BII/SS Windows) 2019-01-20 19:11:43 +09:00
kanjitalk755
d736cc58de add pref items for scaling 2019-01-12 18:22:51 +09:00
kanjitalk755
3db0cf3d0b modified for Xcode10 2018-10-28 14:56:55 +09:00
kanjitalk755
61b454b68a rollback caps lock 2018-07-13 18:38:53 +09:00
kanjitalk755
97f642676b fix caps lock again 
symlink adb.cpp
 2018-07-13 15:44:37 +09:00
kanjitalk755
bdd101e951 fix caps lock 2018-07-11 17:50:57 +09:00
kanjitalk755
93fb08d8ce BII fix pref item ramsize 2018-07-08 19:43:36 +09:00
kanjitalk755
e690b631da BII enable --config argument 
SS delete dead links
 2018-07-06 19:33:30 +09:00
kanjitalk755
8f2660a7de redraw when palette changed 
modify keymap
 2018-06-29 19:31:45 +09:00
kanjitalk755
8f0df8ec70 fix double free in SDL 2018-06-28 18:58:55 +09:00
kanjitalk755
700b57d758 added pref item "hotkey" 
added MB notation pref item "ramsize"
 2018-06-27 19:13:30 +09:00
kanjitalk755
52fe2290fe Linux: change configure defaults to SDL2 
MinGW: change SDL1 to SDL2
 2018-06-26 21:00:52 +09:00
kanjitalk755
afa52545ff fix include for mingw32 build 2018-06-24 23:08:36 +09:00
kanjitalk755
949e07e4eb fix for linux build 2018-06-23 14:59:07 +09:00
kanjitalk755
a76069f879 View menu removed 2018-06-21 15:21:56 +09:00
kanjitalk755
6039a60549 fix merge error 2018-06-20 21:26:11 +09:00
kanjitalk755
d8290af331 Merge branch 'mingw32' 2018-06-20 19:34:06 +09:00
kanjitalk755
0e06d9358b refactor pref menu 2018-06-19 19:07:14 +09:00
kanjitalk755
418d92dafe BII buildable 2018-06-19 13:36:27 +09:00
kanjitalk755
1cd716ee8e Merge commit 'da46a07b7c25996aeda2cf8b49d3b9bf2e08c46f' into mingw32 2018-06-19 10:33:33 +09:00
kanjitalk755
7f8ddaeacf in case using SDL1 
fix merge error of configure.ac
 2018-06-18 18:42:19 +09:00
kanjitalk755
7a3b70153c Embed SDL2.framework 2018-06-16 23:45:04 +09:00
kanjitalk755
f053fda3c8 fix for sheepvm 2018-06-16 13:33:13 +09:00
kanjitalk755
8d89152b79 set current directory 2018-06-15 21:57:59 +09:00
kanjitalk755
51e08e9b76 BII clipboard-exchange enabled 2018-06-15 16:47:07 +09:00
kanjitalk755
51491dd03f pref menu enabled 2018-06-15 14:52:28 +09:00
kanjitalk755
a98054215e SDL related fix 
update project files
add a pref
 2018-06-14 18:26:27 +09:00
kanjitalk755
e01129b748 Merge commit '01f63e605a68856718dd16e07835cd2d61ba6727' into DavidLudwig_and_jvernet 2018-06-14 17:33:25 +09:00
kanjitalk755
d247c35d58 Merge commit '2e302d60a337daa252c6992335e6365a9beac83f' 2018-06-08 14:11:27 +09:00
jvernet
01f63e605a Merge branch 'master' of https://github.com/DavidLudwig/macemu 2018-01-31 19:39:26 +01:00
Alexei Svitkine
588a2ae9cd don't try to run diskutil eject (null) 2018-01-01 15:42:53 -05:00
David O'Shea
9e2fc30ecd Basilisk II: Add icons for X11 based on the MacOS X icons (fixes #160). 
Note that it appears that a 'make clean' may be required due to the
change in user_strings_unix.h failing to cause all of the modules that
include it to be rebuilt.
 2017-12-31 12:10:30 +10:30
David O'Shea
802224630d Basilisk II: Update README to cover bridging tun interfaces. 
Now that issue #154 has been fixed, when Basilisk II is configured to
use "tun" for networking, the generated tunN interface can be bridged,
enabling AppleTalk frames to be forwarded without the Linux host
needing to be able to route AppleTalk.

This commit updates the README to discuss this possibility and briefly
outline how it can be achieved.  A number of spelling corrections and
other minor clarifications are made in the same area.
 2017-12-29 11:49:37 +10:30
asvitkine
461332cbf7
Merge pull request #157 from dcoshea/issue-154 
Avoid an all-zero Ethernet/MAC address when using TUN/TAP (fixes #154).
 2017-12-28 13:31:41 -05:00
asvitkine
86c5613701
Merge pull request #155 from dcoshea/issue-153 
Fix TUN/TAP detection on CentOS 7 (#include <sys/socket.h>) (fixes #153).
 2017-12-28 13:31:00 -05:00
David O'Shea
385b49ba8e Avoid an all-zero Ethernet/MAC address when using TUN/TAP (fixes #154). 
Previously, when "ether tun" configuration was used on a Linux host,
packets were sent with Ethernet/MAC address 00:00:00:00:00:00.  Under
CentOS 7 at least, this did not appear to cause any issues where the
tun interface on the host was configured with an IP address, but when
an attempt was made to bridge the tun interface, it was no longer
possible to establish IP communication between the emulated machine
and either the Linux host or a Windows NT Server 4 VM.

This fix causes an Ethernet/MAC address to be generated in the same
way when using TUN/TAP as is done for ethertap.
 2017-12-28 22:49:01 +10:30
David O'Shea
3f2dbbac29 Fix link error due to missing X11 libraries (fixes #152). 
c18d6fa removed a space from BasiliskII/src/Unix/configure.ac, which
caused "configure" to fail to properly determine the correct set of
libraries to link against when using X11, which caused linking to
fail.  This fix restores the missing space.
 2017-12-28 22:42:51 +10:30
David O'Shea
bbd3d3f57c Fix TUN/TAP detection on CentOS 7 (#include <sys/socket.h>) (fixes #153). 
Previously, "checking whether TUN/TAP is supported..." in "configure"
failed to detect TUN/TAP support due to compile errors due to "struct
sockaddr" not being defined.  This fix causes sys/socket.h to be
#included if it exists.
 2017-12-28 22:28:05 +10:30
Alexei Svitkine
1c9b21f580 Fix JIT support on macOS. This was broken by a copy-paste error 
in b5820d8059.
 2017-12-15 16:42:49 -05:00
Alexei Svitkine
c41b849ecf clean up disabled / non-working modes out of video_macosx.mm/.h 2017-12-10 11:27:56 -05:00
Alexei Svitkine
ba0ed857d7 fix colors in b2 video_macosx.mm code 2017-12-10 11:27:48 -05:00
Alexei Svitkine
364cf2085e clean up some code 2017-12-10 11:27:43 -05:00
Alexei Svitkine
bb2a197c98 clean up some code 2017-12-10 11:27:32 -05:00
Alexei Svitkine
8a6a9db6d5 Fix SDL support message in configure based on detection logic. 2017-12-10 11:27:23 -05:00
Alexei Svitkine
0e8e0b51b7 Make Basilisk's configure.ac's SDL detection logic match SS's. 2017-12-10 11:27:12 -05:00
Alexei Svitkine
c18d6fa923 fix configure X check to not trigger if using mac gui and some 
more warning fixes
 2017-12-10 11:27:08 -05:00
Alexei Svitkine
a472d9ab63 fix some format warnings 2017-12-10 11:27:08 -05:00
Alexei Svitkine
75324c10d0 silence some more warnings 2017-12-10 11:27:08 -05:00
Alexei Svitkine
b150b42fc6 Fix some string conversion warnings. 2017-12-10 11:27:08 -05:00
Alexei Svitkine
1503c84266 Merge branch 'master' of https://github.com/cebix/macemu 2017-12-10 11:27:08 -05:00
Jesús A. Álvarez
e44a75d7eb fix indentation 2017-12-10 11:27:07 -05:00
Jesús A. Álvarez
db72f9142e fix for extfs on 64-bit macOS/iOS 2017-12-10 11:27:07 -05:00
Alexei Svitkine
1e4e7179d4 more changes needed to move STR_WINDOW_TITLE_GRABBED cross-platform code 2017-12-10 11:27:03 -05:00
kanjitalk755
aa24dbc3df revert BasiliskII/src/slirp/* 2017-12-09 21:10:30 +09:00
kanjitalk755
a944344f84 BasiliskII/src/slirp/* copied from jvernet/macemu 2017-12-06 15:35:41 +09:00
kanjitalk755
e42b6a50c3 revert SDL 2017-12-05 23:49:59 +09:00
Alexei Svitkine
c9717bf331 Fix window redraw on macOS when un-minimizing. 2017-12-02 11:35:23 -05:00
Alexei Svitkine
2bdbd22e85 Fix setting window title on Mac Sierra when grabbing mouse. 2017-11-25 10:36:00 -05:00
Alexei Svitkine
5256a8e6f1 Revert of 9f58eb96dc. Causes issues 
with mouse coordinates under Sierra.
 2017-11-25 09:40:00 -05:00
kanjitalk755
056dc36070 revert BasiliskII, change only SheepShaver 2017-11-18 13:08:30 +09:00
kanjitalk755
5065fb9d95 64-bit build for 10.10+ 2017-11-17 21:43:36 +09:00
David Ludwig
28206248d4 bug-fix: crash on startup, when passing in single-parameter, command-line args 2017-11-07 17:57:41 -05:00
asvitkine
f0488d8396 Merge pull request #138 from rakslice/tap_0901 
Support version 0901 TAP devices in Windows
 2017-10-11 21:33:01 -04:00
asvitkine
82f288f302 Merge pull request #139 from rakslice/tap_broadcast 
Accept eth and atalk broadcast/multicast packets when using TAP in Windows
 2017-10-11 21:31:44 -04:00
asvitkine
9a330603fd Merge pull request #136 from rickyzhang82/pr-emulated-hard-drive-in-24-bit-rom 
Patch installing BII emulated hard drive in .sound driver Open call.
 2017-10-11 21:30:54 -04:00
Alexei Svitkine
331556d309 use correct conversion function 2017-10-11 21:28:43 -04:00
Andrew Tonner
6c37eb236b Accept eth and atalk broadcast/multicast packets when using TAP in Windows 2017-10-09 16:24:43 -07:00
Andrew Tonner
517e2aa7ab Support version 0901 TAP devices in Windows 2017-10-09 16:08:55 -07:00
jvernet
e6808d6556 timer symlink ?? 2017-10-09 22:18:17 +02:00
jvernet
d3fc193d66 Slirp 64 bits 
- Slirp 64 Bits
- added to the basilisk XCode Project
 2017-10-09 21:45:44 +02:00
Ricky Zhang
67437652cb
Fix 1 bit BW guest OS frame buffer in 8 bit per pixel SDL surface. 
Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
 2017-10-07 22:56:30 -04:00
Ricky Zhang
ca11c25882 Patch install BII drive in .sound driver Open call. 
Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
 2017-10-06 22:28:11 -04:00
asvitkine
8d53921b20 Merge pull request #133 from rickyzhang82/pr-enhance-rom-break-point 
Enhance ROM break point feature.
 2017-10-06 21:32:14 -04:00
Ricky Zhang
cba9b032fb
Fix several minor issues. 
Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
 2017-10-06 20:01:55 -04:00
asvitkine
40716c7c91 Merge pull request #131 from simon-frankau/classic_video 
Map framebuffer into accessible memory in 24-bit mode
 2017-10-06 08:44:16 -04:00
jvernet
b2f4de5a89 SheepShaver Pref Editor Udate 2017-10-05 22:20:15 +02:00
jvernet
f8e69c4fb8 Remove slirp debug message 2017-10-05 19:31:26 +02:00
jvernet
38c6541edc 64 Bits Slirp 
At least it will not crash anymore
 2017-10-05 19:15:27 +02:00
Andrew Tonner
b72b16a775 Allow file drag and drop into the Volumes list 2017-10-04 19:46:32 -07:00
jvernet
dc0663b72d Revert "64 bits slirp ?" 
This reverts commit 000ec0f135.
 2017-10-04 18:22:53 +02:00
jvernet
605c811a4a Revert "SLIRP 0.9.1" 
This reverts commit 4682bb80a1.
 2017-10-04 18:22:48 +02:00
jvernet
c20d9d3c52 Revert "SLIRP 0.10.1" 
This reverts commit ef4725552e.
 2017-10-04 18:22:40 +02:00
jvernet
ef4725552e SLIRP 0.10.1 
64 Bits clean ?
 2017-10-03 22:37:31 +02:00
jvernet
4682bb80a1 SLIRP 0.9.1 2017-10-03 22:34:56 +02:00
jvernet
000ec0f135 64 bits slirp ? 2017-10-03 22:33:01 +02:00
jvernet
7b8beab25a Basilisk Macbook Keycode 
French Macbook Keycode file
 2017-10-03 21:41:12 +02:00
jvernet
34765ae740 Added pref items 
{"keycodes",
	{"keycodefile",
	{"mousewheelmode",
	{"mousewheellines"
to have again international keyboard
 2017-10-03 21:39:30 +02:00
jvernet
1316b64bb7 Some Warning removed and 64bits 2017-10-03 21:37:24 +02:00
jvernet
54ea054993 XCode 9 Project 2017-10-03 21:32:48 +02:00
Ricky Zhang
175fbfde43 Enhance ROM break point feature. 
1. Change --break input option format. Too much typing by taking decimal address. Change to hexadecimal input.
2. Allow ROM break point to continue to execution. The original ROM break point just replace instruction in ROM break point address with emul_op M68K_EMUL_BREAK. This just halts emulation right at the break point. The patch is less invasive than the original approach. It allows emulation to continue to run by pressing 'x' to exit from cxmon.
3. Add option --loadbreak which load break point from file before emulation start.

Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
 2017-09-15 21:36:16 -04:00
David Ludwig
7a52abd378 bug-fix: video_sdl2.cpp would not compile in pre-C++11 2017-09-12 22:15:46 -04:00
David Ludwig
4e5e3377f1 Perf: re-enable VOSF on Xcode-made, OSX-host builds 2017-09-12 18:35:24 -04:00
David Ludwig
ef26204e6d Perf: make SDL2 backend update less pixels, when updating internal textures and surface(s) 2017-09-12 17:31:05 -04:00
Simon Frankau
ec1a9418ab Map framebuffer into accessible memory in 24-bit mode 2017-09-10 20:22:46 +01:00
David Ludwig
50986dcf46 Perf: make SDL2 use an ARGB8888 texture, which is natively supported via some GPUs + drivers, such as on OSX. This can remove an extraneous pixel-format conversion. 2017-09-10 14:34:13 -04:00
David Ludwig
1b08f2e9d3 BasiliskII: minor formatting tweak to configure.ac 2017-09-10 10:49:26 -04:00
David Ludwig
252890ebd0 BasiliskII: misc fixes when building on OSX, via Autotools 2017-09-10 10:19:17 -04:00
David Ludwig
78e3cbc8cb fixed compile-time warnings in video_sdl2.cpp 2017-09-09 16:49:09 +00:00