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
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
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
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
Andrew Tonner
b72b16a775
Allow file drag and drop into the Volumes list
2017-10-04 19:46:32 -07: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
Simon Frankau
ec1a9418ab
Map framebuffer into accessible memory in 24-bit mode
2017-09-10 20:22:46 +01:00
Ricky Zhang
93e800ffc7
Fix another round of suggestions.
...
Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
2017-09-04 14:21:16 -04:00
Ricky Zhang
d2bb35ee5a
Fix all suggestions from asvitkine
...
Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
2017-09-04 07:37:29 -04:00
Ricky Zhang
f3895493ae
Add break point function for Basilisk II in cxmon.
...
To enter break point, you need to run a m68k program in Macintosh guest OS. The program
executes a new emul_op instruction 0x7138. The program will be provided
in cxmon/utils folder in a separate commit. Once emulation is suspended,
you can enter below new cxmon command to manipluate break points:
ba [address] Add a break point
br [breakpoints#] Remove a break point. If # is 0, remove all break points.
bd [breakpoints#] Disable a break point. If # is 0, disable all break points.
be [breakpoints#] Enable a break point. If # is 0, enable all break points.
bi List all break points
bs "file" Save all break points to a file
bl "file" Load break points from a file
Once emulation PC reach break point address, it automatically suspends
and traps into cxmon.
Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
2017-09-03 00:26:01 -04:00
Ricky Zhang
54680714e3
Fix mixed spaces and indentation
...
Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
2017-08-29 21:11:07 -04:00
Ricky Zhang
6dbfa73dbd
Fix mon option
...
Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
2017-08-21 17:14:07 -04:00
asvitkine
452b1a534b
Merge pull request #121 from coderforlife/fix-120
...
Fixes #120 by adding support for v4.11 Linux Kernels which need an ex…
2017-08-18 19:48:36 -04:00
Jeffrey Bush
dee8ed76ab
Fixing bincue support when compiling --with-bincue and --enable-standalone-gui in both SheepSaver and BasiliskII by adding bincue_unix.o to list of objects compiled with the GUI application and adjusting the libs slightly (note that having extra libs listed should't neagtively effect anything). Without these changes those command line arguments cannot both be used.
2017-08-18 17:52:58 -04:00
Jeffrey Bush
7b9612f24e
Fixes #120 by adding support for v4.11 Linux Kernels which need an extra header.
2017-08-18 17:20:29 -04:00
Adam Sampson
3fc8924636
Use ucontext_t instead of struct ucontext
...
ucontext_t is what POSIX requires; glibc no longer provides struct
ucontext as of 2.26: https://sourceware.org/glibc/wiki/Release/2.26
(Most architectures were already using ucontext_t, so this also makes
things more consistent; only arm and mips change.)
2017-08-09 13:04:46 +01:00
Alexei Svitkine
123a23fad5
fix sequence error compiler warning
2017-08-09 00:14:05 -04:00
Alexei Svitkine
bc7cd78467
Merge branch 'master' of https://github.com/cebix/macemu
2017-08-08 23:38:41 -04:00
Alexei Svitkine
9f93648ea5
Revert "Fix build when targeting Sierra."
...
This reverts commit 35ca220d90https://github.com/cebix/macemu/pull/115 instead.
2017-08-08 23:37:56 -04:00
asvitkine
8d1532ca32
Merge pull request #115 from rickyzhang82/pr-sierra-clock-gettime
...
Fix Mac OS X Sierra introduce clock_gettime
2017-08-08 23:35:54 -04:00
Alexei Svitkine
35ca220d90
Fix build when targeting Sierra.
...
Sierra now supports clock_gettime(), so fix some code that assumed
mach and HAVE_CLOCK_GETTIME where mutually exclusive.
2017-08-08 23:19:39 -04:00
Ricky Zhang
b32a8c8588
Fix Sierra clock_gettime issue
...
Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
2017-08-07 10:52:11 -04:00
asvitkine
b5820d8059
Merge pull request #113 from bvarner/bitbakeable
...
Changes to the Configure script to improve cross-compiling
2017-07-21 00:16:45 -04:00
bvarner
53e965a223
Remove unnecessary comment.
2017-07-20 23:22:10 -04:00
bvarner
2210c87233
Updates to signal handling detection, enabling vosf for cross-compiled overrides.
2017-07-20 18:53:04 -04:00
bvarner
87ae776a41
Consistency...
2017-07-20 18:28:24 -04:00
bvarner
02ec5fc7d4
Added environment variable overrides for cross-compile defaults using AC_ARG_VAR.
...
This lets you setup an environment to cross-compile, with extended support for how things will behave.
This should let the build play nicely with bitbake, without changing the --flags, and without breaking existing behaviors.
2017-07-20 17:18:55 -04:00
dmac
9f58eb96dc
Use relative mouse values when grabbed in sdl.
2017-07-16 12:07:08 +01:00
bvarner
1eae4613c6
Added gitignores for quilt patches
2017-07-14 15:08:02 -04:00
bvarner
bd3ef905fb
Don't do that.
2017-07-14 15:07:31 -04:00
bvarner
df6d21c394
I'm stashing there here, even though i probably shouldn't.
2017-07-14 15:06:12 -04:00
bvarner
1bfd163cf5
Better handling of SDL.
2017-07-14 12:50:45 -04:00
bvarner
cc3c3edcc0
Updates
2017-07-14 12:42:10 -04:00
bvarner
ca56f6f263
Ah, yeah. whoopse.
2017-07-14 12:30:53 -04:00
bvarner
35de22c444
Undo the SDL bits to favor the pkg-config bits. This should be more portable. I'm not sure if I'm breaking the cygwin build here, so I may have to give that a shot.
2017-07-14 12:25:37 -04:00
bvarner
65d44391c3
Other generated sources when not using JIT
2017-06-29 00:19:40 -04:00
bvarner
9f9893f178
move some things around here.
2017-06-28 23:37:55 -04:00
bvarner
c93058f9a6
Use SDL 1. This isn't an SDL2 App. D'oh
2017-06-28 18:06:16 -04:00
bvarner
859c4f29b5
Undo a debug output and set sigsegv_recovery if we force ac_cv_have_extended_signals.
2017-06-28 18:02:37 -04:00
bvarner
89cf05aec6
Adding an echo here to see if it's testing under a cross-build.
2017-06-28 17:57:51 -04:00
bvarner
b5790efba9
Added an enable option to force cross-compiles to use extended signal handling.
2017-06-28 17:53:45 -04:00
bvarner
9dc8bba39a
Added SDL2 macros
2017-06-28 16:14:09 -04:00
bvarner
023d0d57c7
Condense to guilty until proven innocent.
2017-06-28 15:54:00 -04:00
bvarner
9735385a47
Testing this out just to see what the output is underbitbake
2017-06-28 15:48:29 -04:00
bvarner
7ae960e4eb
Add npth to the search path.
2017-06-28 15:00:45 -04:00
bvarner
a1bea9b897
Oh yeah, use a list.
2017-06-28 13:20:15 -04:00
bvarner
94a385352e
bitbake still couldn't find it, so let's try brackets.
2017-06-28 13:17:12 -04:00
bvarner
ffa877ee6c
Use AC_SEARCH_LIBS for pthread location.
2017-06-28 13:10:59 -04:00
bvarner
f2acf91add
Adding addtional Quote around expressions in AC_TRANSLATE_DEFINE. During cross-compile builds, when values contain 'guessing yes' the single-bracket expands to multiple argments. Adding the additional quote around the entire expression avoids this. The translate call to was missing quotes, which was inconsistent with the rest of the translate calls.
2017-06-28 12:38:50 -04:00
bvarner
e671489ad1
Updated configure.ac with openssl cross-compiling updates for /dev/ptc and /dev/ptmx
2017-06-28 11:58:55 -04:00
Alexei Svitkine
14f2e85c6f
silence some warnings
2017-04-20 20:44:03 -04:00
Alexei Svitkine
181634ab31
Fix more Xcode8 warnings and tweak project settings.
2016-12-17 23:31:03 -05:00
Alexei Svitkine
6bc3dd29a8
Fix off by one error in sscanf length arg.
2016-12-17 22:43:38 -05:00
Alexei Svitkine
d19e757e1c
Fix some more Xcode8 warnings & analyze warnings.
2016-12-17 22:24:00 -05:00
Alexei Svitkine
1f211fb37b
fix some warnings in Xcode8 build
2016-12-17 22:04:57 -05:00
Alexei Svitkine
5538376dc8
Add an Xcode 8 project for SheepShaver that builds an x86 32-bit
...
application (since 64-bit doesn't work with current OS X) and uses
pre-built (by GCC) compiler JIT source files.
2016-12-17 21:38:25 -05:00
asvitkine
84dfc1e98d
Merge pull request #87 from runn1ng/master
...
Making tunconfig working
2016-11-20 20:08:55 -05:00
Alexei Svitkine
268611ca75
Fix SLIRP networking on OS X (and maybe other platforms?).
...
The bug was introduced by 0daa18ab2a
2016-11-02 02:08:51 -04:00
asvitkine
1bf6f4d640
Merge pull request #92 from rickyzhang82/customized-color-depth
...
Customized color depth in SDL
2016-08-19 06:18:02 -07:00
Ricky Zhang
042574382e
1. Added document for sheep_net module.
...
2. Fixed wrong use of ipip_hdr. It is for IP tunnel. This caused serious issues in IP packet filtering. Basically, it filtered out most packets sent from outsides. The correct way to get IP header destination IP address is ip_hdr.
3. Fixed ARP spoofing from guest OS to host OS. At anytime fake MAC address should be hided.
4. Changed module init and remove as non debug message.
Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
2016-08-18 14:00:09 -04:00
Ricky Zhang
10e4bba941
Add customized color depth in SDL. To change color depth, add bit of color depth as displaycolordepth prefs in .basilisk_ii_prefs.
2016-08-15 07:38:25 -04:00
Ricky Zhang
27cb1ef84a
Explictly pass SheepVars by af_packet_priv.
2016-08-13 07:33:35 -04:00
Ricky Zhang
212b8237b6
Fix sk_alloc function change since 4.2 Linux kernel.
2016-08-12 11:13:31 -04:00
Dmitry Brant
6ac8f16efb
Improve naming consistency.
2016-08-02 09:02:40 -04:00
Dmitry Brant
72ac1218f0
Correctly set last-modified time on exported files in Windows.
2016-07-30 14:16:34 -04:00
Dmitry Brant
e1693eb92b
Correctly set last-modified time on exported files.
2016-07-29 11:45:51 -04:00
Karel Bilek
c40e8516ce
Making tunconfig working
2016-05-28 02:20:35 +02:00
asvitkine
7de64a6fce
Merge pull request #81 from vasi/sdl-volume
...
Enable audio volume in SDL
2015-12-27 22:57:10 -05:00
Dave Vasilevsky
c2236350f4
Use constant for max volume
2015-12-27 22:42:37 -05:00
Dave Vasilevsky
4fa03d5fb1
Cleanups: Set to NULL after free, remove commented out code
2015-12-27 22:39:23 -05:00
Dave Vasilevsky
09a0525aac
Enable audio volume in SDL
...
This is useful for keeping the volume of SS/B2 separate from that of the host machine. For example, you can mute a game in SS, while still playing music on your host.
2015-12-27 22:13:00 -05:00
Dave Vasilevsky
4b5f3bd87b
Enable real addressing by disabling PIE
2015-12-27 21:15:26 -05:00
Alexei Svitkine
db375713bb
Fix CrossPlatform files for SheepShaver build and a warning.
2015-12-26 02:17:08 -05:00
Alexei Svitkine
11f7e3b1a1
Fix typo in an earlier commit.
2015-08-10 10:36:39 -04:00
