Commit Graph

2845 Commits

Author SHA1 Message Date
kanjitalk755
01a375eefc minor fix 2018-06-25 22:43:19 +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
9c0886b2b8 set version to 2.5 2018-06-21 22:55:35 +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
226f667b36 mingw32 JIT build (but crashes) 2018-06-20 10:26:37 +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
1393625c15 search path for embedded framework 2018-06-17 00:01:06 +09:00
kanjitalk755
7a3b70153c Embed SDL2.framework 2018-06-16 23:45:04 +09:00
kanjitalk755
ccb11c0d7a fixed initial chdir 2018-06-16 21:42:43 +09:00
kanjitalk755
03dda6db82 host menu re-correct 2018-06-16 17:38:57 +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
27e9a0c79a delete SheepShaver/src/MacOSX/clip_macosx64.mm 2018-06-15 16:41:45 +09:00
kanjitalk755
51491dd03f pref menu enabled 2018-06-15 14:52:28 +09:00
kanjitalk755
33a5112968 remove keyboard shortcut of host menu 2018-06-14 22:03:17 +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
06c7fc3a7e delete SheepShaver/src/slirp/* 2018-06-14 17:19:30 +09:00
kanjitalk755
d247c35d58 Merge commit '2e302d60a337daa252c6992335e6365a9beac83f' 2018-06-08 14:11:27 +09:00
kanjitalk755
693343e73d screen width&height of pref issue fixed 2018-06-08 14:00:59 +09:00
kanjitalk755
cc058a1881 clipboard-exchange enabled 2018-06-07 22:30:06 +09:00
kanjitalk755
bb4611b465 clip_macosx64.mm copied from BasiliskII 2018-06-07 22:23:22 +09:00
kanjitalk755
685ce533f8 delete symlink 2018-06-07 22:21:31 +09:00
asvitkine
2e302d60a3
Merge pull request #163 from atmaxinger/fix-devpollcdrom
Mac GUI: don't show /dev/poll/cdrom if it is configured as cdrom
2018-02-25 12:51:13 -05:00
atmaxinger
e791a1fdd6 fix identation 2018-02-25 17:44:08 +01:00
atmaxinger
4f14c44837 Fix formatting 2018-02-25 17:01:12 +01:00
atmaxinger
a2e163fea9 fix whitespaces 2018-02-22 23:08:57 +01:00
atmaxinger
f25821d067 Fix CD ROM entries appearing multiple times 2018-02-22 23:06:23 +01:00
atmaxinger
515746d584 Only remove item at index 2018-02-22 11:32:57 +01:00
atmaxinger
f2fcfffabb Always save the cdrom entries from /dev/ 2018-02-22 11:11:11 +01:00
atmaxinger
4ba1c48ec8 Always write /dev/poll/cdrom to preferences 2018-02-22 10:36:36 +01:00
atmaxinger
85bcff03d4 Block all CDROMs in /dev/ 2018-02-21 16:24:20 +01:00
atmaxinger
787661f80f Always save the default entry "cdrom /dev/poll/cdrom" 2018-02-21 15:24:29 +01:00
atmaxinger
3931036d87
Fix whitespace 2018-02-20 12:39:59 +01:00
atmaxinger
581ce7d971 Mac GUI: don't show /dev/poll/cdrom if it is configured as cdrom 2018-02-20 11:54:55 +01:00
jvernet
01f63e605a Merge branch 'master' of https://github.com/DavidLudwig/macemu 2018-01-31 19:39:26 +01:00
jvernet
ea626e216d icns 2018-01-02 17:01:45 +01:00
Alexei Svitkine
588a2ae9cd don't try to run diskutil eject (null) 2018-01-01 15:42:53 -05:00
asvitkine
62eaaee1b2
Merge pull request #161 from dcoshea/X11-icon
Basilisk II: Add icons for X11 based on the MacOS X icons (fixes #160).
2017-12-31 01:43:05 -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
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