Macintosh-Tools/macemu
1
0
Fork 0
mirror of https://github.com/kanjitalk755/macemu.git synced 2024-12-11 00:52:26 +00:00
Code Issues Projects Releases Wiki Activity
2,849 Commits 6 Branches 17 Tags 21 MiB
5be50d7959
Commit Graph

2849 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
asvitkine
ff129e8649
Merge pull request #158 from rickyzhang82/pr-travis-ci 
Add Travis CI configuration file and README.md status.
 2017-12-28 20:43:13 -05:00
asvitkine
b54b25f67d
Merge pull request #159 from dcoshea/README-Linux-bridging 
Basilisk II: Update README to cover bridging tun interfaces.
 2017-12-28 20:42:39 -05:00
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
Ricky Zhang
8c64ebfd03 Add Travis CI configuration file and README.md status. 2017-12-28 20:06:35 -05:00
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
asvitkine
3bcb0d4556
Merge pull request #156 from dcoshea/issue-152 
Fix link error due to missing X11 libraries (fixes #152).
 2017-12-28 13:29:58 -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
1669960afd Merge branch 'master' of https://github.com/cebix/macemu 2017-12-10 11:28:05 -05:00
Alexei Svitkine
b0c859031a Merge branch 'master' of https://github.com/cebix/macemu 2017-12-10 11:28:00 -05:00
Alexei Svitkine
c161ca5b8b clean up disabled / non-working modes out of video_macosx.mm/.h 2017-12-10 11:28:00 -05:00
Alexei Svitkine
3b77a377c2 fix colors in b2 video_macosx.mm code 2017-12-10 11:28:00 -05:00
Alexei Svitkine
e1c0a08957 clean up some code 2017-12-10 11:28:00 -05:00
Alexei Svitkine
e29cc81dbf clean up some code 2017-12-10 11:27:59 -05:00
Alexei Svitkine
d17ef870f7 Fix SDL support message in configure based on detection logic. 2017-12-10 11:27:59 -05:00
Alexei Svitkine
cd60ce9421 remove stray non-ascii chars at start of mon_cmd.cpp 2017-12-10 11:27:59 -05:00
Alexei Svitkine
3ac2640c79 Make Basilisk's configure.ac's SDL detection logic match SS's. 2017-12-10 11:27:59 -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
89e4234975 remove stray non-ascii chars at start of mon_cmd.cpp 2017-12-10 11:27:16 -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
asvitkine
a1a48c1479 Merge pull request #145 from zydeco/master 
fix for extfs on 64-bit macOS/iOS
 2017-12-10 11:27:07 -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
Alexei Svitkine
bc7edbc677 move STR_WINDOW_TITLE_GRABBED to user_strings.h and fix header 
guard for user_strings_unix.h
 2017-12-10 11:26:26 -05:00
Alexei Svitkine
0ec153e733 Merge branch 'master' of https://github.com/cebix/macemu 2017-12-10 11:21:02 -05:00
Alexei Svitkine
d693c8d6c8 clean up disabled / non-working modes out of video_macosx.mm/.h 2017-12-10 11:20:39 -05:00
Alexei Svitkine
34624eee4b fix colors in b2 video_macosx.mm code 2017-12-10 11:20:35 -05:00
Alexei Svitkine
af642edc16 clean up some code 2017-12-10 11:20:27 -05:00
Alexei Svitkine
93d6a4527e clean up some code 2017-12-10 11:20:23 -05:00
Alexei Svitkine
f99fc0ec71 Fix SDL support message in configure based on detection logic. 2017-12-10 11:20:17 -05:00
Alexei Svitkine
f22a1eecef remove stray non-ascii chars at start of mon_cmd.cpp 2017-12-10 11:20:11 -05:00
Alexei Svitkine
e42a40f832 Make Basilisk's configure.ac's SDL detection logic match SS's. 2017-12-10 11:19:53 -05:00
kanjitalk755
f96c92ad51 SheepShaver/src/slirp/* copied from jvernet/macemu 2017-12-09 21:24:46 +09:00
kanjitalk755
87ddeb520b delete symlink SheepShaver/src/slirp 2017-12-09 21:23:54 +09: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