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

1847 Commits

Author SHA1 Message Date
David Ludwig
cd57af7795 Basilisk II, bug-fix: on Mac, mouse-grabbing via Ctrl+F5 wasn't changing the title of the window 2017-09-02 10:58:53 -04:00
David Ludwig
dbd997fa47 fixed issue #20: GTK preference UI was broken in both Linux and Mac OS X 2017-08-30 12:17:37 -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
David Ludwig
1983aa1652 try making sure that the bincue sources use the correct, SDL2 audio device ID. Untested! 2017-08-27 18:11:48 -04:00
David Ludwig
d5e68ceebf use SDL2's preferred/non-legacy means of opening, and working with, an audio device 2017-08-27 18:05:13 -04:00
David Ludwig
145ca0c210 fixed issue #15: BasiliskII: running an autotools build breaks ability to build with Xcode 2017-08-27 17:37:20 -04:00
David Ludwig
51a9eeae76 fixed issue #14: Basilisk II: make Xcode generate UAE's CPU-emulation sources at build-time 2017-08-27 17:05:02 -04:00
David Ludwig
eb36b34106 Sheepshaver: misc, runtime fixes on OSX hosts 2017-08-25 17:19:36 -04:00
David Ludwig
e55df3de96 build SheepShaver against SDL2, when using its Xcode 8 project file 2017-08-25 17:01:31 -04:00
David Ludwig
3bae0bbda9 commented on use of SDL_SetRelativeMouseMode 2017-08-23 20:56:54 -04:00
David Ludwig
7767f128e5 fixed issue #19: on OS X, display can slide around if initial clicks are near top of screen 2017-08-23 20:52:30 -04:00
Ricky Zhang
6dbfa73dbd Fix mon option 
Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
 2017-08-21 17:14:07 -04:00
David Ludwig
5d4560c1a7 fixed issue #21, "BasiliskII, Win32: resizing a window does not stretch screen" 2017-08-19 17:45:26 -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
David Ludwig
e49cd855c2 made windowed-mode windows be resize-able/scale-able - guest OS display size is retained, though 2017-08-15 21:47:45 -04:00
David Ludwig
109bc3979b implemented issue #7: output stdout and stderr to a log file; removed output redirection to win32 console, which was buggy 2017-08-15 21:41:59 -04:00
David Ludwig
6abc599ddf added code to help debug issue #6: made Win32 app show stdout and stderr, if and when it is run from a command prompt window 2017-08-14 21:14:34 -04:00
David Ludwig
b9c9687153 bug-fix: anti-aliasing not always working 2017-08-14 14:50:05 -04:00
David Ludwig
2d035eb3e9 bug-fix: mouse cursor could get locked to top-left corner, when in fullscreen 2017-08-14 14:49:29 -04:00
David Ludwig
f7fceaf096 fix Issue #18: 512x384 guest display leads to app exit-on-startup 2017-08-14 14:44:09 -04:00
David Ludwig
9116cae283 apply anti-aliasing where available and appropriate 2017-08-14 14:41:04 -04:00
David Ludwig
0e5ce49f46 fixed issue #9: maintain guest OS' aspect ratio, when in fullscreen 2017-08-14 14:26:54 -04:00
David Ludwig
80a30aeca1 HACK fix for Issue #17: Thousands of Colors not working on OSX 2017-08-14 14:08:30 -04:00
David Ludwig
53cadd7fd0 restored OSX 'DEBUG' macro to DEBUG=1 2017-08-14 13:57:11 -04:00
David Ludwig
6600081b29 build fix for OSX + Xcode 2017-08-14 13:56:36 -04:00
David Ludwig
0a7640070a finished fixing issue #16: fixed Thousands of Colors on Linux 2017-08-14 13:45:15 -04:00
David Ludwig
09c100ff42 partial fix for issue #16: color is incorrect on Linux 
Thousands of Colors mode is still broken, however, Millions of Colors does work, which did not before this commit.
 2017-08-14 12:48:36 -04:00
David Ludwig
d871b70240 fixed issue #12: make autotools test for SDL2 2017-08-14 12:28:10 -04:00
David Ludwig
99f50637e1 possible fix for Issue #13: replace SDL_CreateRGBSurfaceWithFormat calls with older + backwards-compatible SDL_CreateRGBSurface calls 2017-08-14 12:01:34 -04:00
David Ludwig
1a59a5e6f4 Merge branch 'master' of https://github.com/cebix/macemu 2017-08-14 11:35:43 -04:00
David Ludwig
c6fefd0750 fixed issue #1: SDL2 backend did not support 2 or 4 bit color, in guest OS 2017-08-10 12:31:41 -04:00
David Ludwig
251c185dcd renamed variables in SDL2 backend, for improved readability 2017-08-10 10:57:58 -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 35ca220d90.

Going with https://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
David Ludwig
e0cdbe2a30 added "idlewait" support to SDL2 backend 2017-08-01 18:07:23 -04:00
David Ludwig
8874ba549f added missing MSVC post-build script 2017-07-23 21:05:08 -04:00
David Ludwig
8705276206 updated Windows + MSVC support with SDL2 support 2017-07-23 20:49:29 -04:00
David Ludwig
54e03d9647 bug-fix, Issue #2: prevent SDL2 from installing keyboard shortcuts (Command+Q, etc.) on OSX hosts, as they interfere with guest OS use 2017-07-23 16:23:51 -04:00
David Ludwig
1190a2b127 bug-fix, Issue #4: prevent guest OS from causing desktop/Spaces switches on OS X host 2017-07-23 15:22:00 -04:00
David Ludwig
84282f4525 bug-fix: buffer-overflow in SDL2 audio code 2017-07-23 15:13:50 -04:00
David Ludwig
6e36c8dd30 include SDL2 as a git submodule, currently using v2.0.5; make Mac builds (of Basilisk II) build SDL 
This should help with debugging windowing system issues, which may reside in SDL, which SDL may not provide adequate diagnostic info, or which Basilisk may not report
 2017-07-23 14:09:19 -04:00
David Ludwig
a3f3d4f5d2 dropped Mac OS X deployment target down to 10.7 (from 10.12) 2017-07-22 22:01:13 -04:00
David Ludwig
3d0ea018ed bug-fix: OS X app would not launch, when run from the Finder 2017-07-22 21:49:54 -04:00
David Ludwig
a1a85a9315 bug-fix: don't double-free the inner SDL_Surface, when the guest OS switches video modes 2017-07-22 21:31:06 -04:00
David Ludwig
e3a687ff1e updated copyright to 2017 (from 2006); added SDL2 port credit 2017-07-22 21:20:46 -04:00
David Ludwig
ad747d2049 use HOME/.basilisk_ii_xpram for saving + restoring XPRAM 2017-07-22 21:16:32 -04:00
David Ludwig
b62b8fe5ad read/write preferences from HOME/.basilisk_ii_prefs 2017-07-22 21:09:53 -04:00
David Ludwig
1d5b8e95af use the host-OS' desktop resolution, when entering full-screen. This enables use of Mac OS X's "Spaces" feature, when going to fullscreen. 2017-07-22 20:40:31 -04:00
David Ludwig
cb982ee2ed use SDL 2.0.5+, rather than SDL 1.x 
This change may end up being a bit slower on some systems, as the SDL backend will now render its content to two, new, SDL_Surfaces: one of which is in the guest OS' resolution, the other of which is application defined.

SDL2's SDL_Render API is used, which exposes some rudimentary elements of GPU + texture-based programming.  Basilisk II now maintains a single 'SDL_Texture' object, which is an SDL representation of a GPU texture.  The 'outer' surface will be used to update this texture, as requests to redraw are made.

TODO: look into removing the 'outer' SDL surface, and see if we can just copy the 'inner' surface to the SDL_Texture.
TODO: the entire SDL_Texture is updated, any time a request is made to draw.  Look into minimizing this a bit.
 2017-07-22 20:29:30 -04:00
David Ludwig
9128314cb8 Basilisk II compiles on Xcode 8, as a 64-bit Mac app 
SDL 1.x is used for display, rather than Mac OS X specific backend.  If time permits, I'll port it to SDL 2, if only to reduce Basilisk's overall code foot-print.

Lots of features are apt to be disabled, as many 'dummy' backends were used.

Video-depths other than 1-bit or 32-bit are untested, and in some cases (4-bit, at least) are currently non-functional.  This is due to a partial re-write of the SDL backend's blitting code, which was non-functional when low-bit-depths were used.

The SDL backend was also rewired, on OSX, to not attempt to align the display buffer on page-boundaries.  So far, this doesn't seem to cause any notice-able problems, however, that's only using limited knowledge and testing (System 7.5.x does boot and display at 640x480, though!).  The original display-buffer allocation code was failing to run, in some cases.

Preferences are, on Mac, currently hardcoded to be accessed at /tmp/BasiliskII/BasiliskII_Prefs.  The folder, "/tmp/BasiliskII/", may be a symbolic link to elsewhere, though.
 2017-07-22 17:43:42 -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
Andrew Tonner
bab9820231 slirp: more changes to prevent a crash in the soread without so_tcpcb case 2017-01-20 13:27:00 -08:00
Andrew Tonner
68353ca6b1 fix for null deref in slirp soread when the so doesn't have a tcpcb yet 2017-01-20 02:05:55 -08:00
Andrew Tonner
52a36f24bb guard against the slirp queues null deref on dequeues I've seen in the debugger 2017-01-20 01:33:20 -08:00
Andrew Tonner
2f9bc272be ws2 defines and missing prototypes for building withmingw32 2017-01-19 21:12:35 -08:00
Andrew Tonner
d3b56d8e32 Fix for intermittent cursor snapping: don't attempt to warp the cursor when it's not in the window 2017-01-19 05:14:20 -08:00
Andrew Tonner
83ea8b0779 Merge remote-tracking branch 'cebix/master' into windows_build_script_test_merge 2017-01-18 16:49:19 -08:00
Andrew Tonner
5c264434e7 disable obsolete cd driver warning 2017-01-18 15:57:36 -08:00
Andrew Tonner
dc54a5eceb missed commits 2017-01-18 04:51:34 -08:00
Andrew Tonner
b74ae092c9 builds on mingw32 without jit, still untested 2017-01-18 04:41:40 -08: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,
which erroneously changed some signed types to unsigned types,
breaking logic involving negative numbers (e.g. when subtracting
sizes).
 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
Dan Sumorok
dee3f7e1c5 Added tap/bridge support to ether helper. 2016-03-19 19:17:48 -04:00
Dan Sumorok
1d84d40518 Linux etherhelper build updates. 2016-03-16 18:40:33 -04:00
Dan Sumorok
7710322fd3 Linux etherhelper support. 2016-03-15 20:03:59 -04: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
Alexei Svitkine
a99d496fd4 Fix Xcode project following move of files and fix a warning. 2015-08-09 18:50:06 -04:00
Alexei Svitkine
ee25ed7142 Fix configure script following move of files to CrossPlatform. 2015-08-09 18:41:01 -04:00
Alexei Svitkine
a06cbd6784 Fix non-Windows build. 2015-08-09 18:31:30 -04:00
asvitkine
7e111f6fc5 Merge pull request #73 from Masaq-/macipx 
Patch to make MacIPX work in SheepShaver
 2015-08-09 18:14:18 -04:00
James Touton
0a9a4d0367 Changed mb type from int to bool. 2015-08-06 22:26:23 -07:00
James Touton
6cd37656b4 Added Visual Studio 2015 project files. 2015-08-06 02:37:05 -07:00
James Touton
1c9b9ba7a8 Added MSVC-friendly config.h. 2015-08-06 02:35:51 -07:00
James Touton
a6a46a2697 Unicode friendly! 2015-08-06 02:34:24 -07:00
James Touton
47e95ba2e6 Removed more spurious Windows.h #includes. 
MSVC-compatible use of #pragma pack.
Fixed potential crash in Sys_open.
Use MSVC intrinsics for byte swapping.
Ensure use of winsock2 (instead of winsock).
Set appropriate architecture #defines.
Fixed various other compile warnings/errors.
 2015-08-06 02:31:42 -07:00
James Touton
9b8238ee3e Removed spurious #includes of Windows.h. 
Fixed some more calling convention annotations.
Don't mutate the prefs string in init_tcp_listen_ports.
 2015-08-06 02:18:21 -07:00
James Touton
4499902ac5 Removed kernel_windows. Assume a Windows NT-derived operating system. 
Fixed some calling convention annotations.
Fixed some MSVC warnings.
 2015-08-06 02:09:10 -07:00
James Touton
49f33770ac Resolved numerous MSVC warnings. 2015-08-06 01:57:13 -07:00
James Touton
284900f905 Moved cross-platform sources into their own directory so that Windows builds don't need to add Unix to the include directory list. 2015-08-06 01:53:29 -07:00
James Touton
c92feaf767 Fixed a bunch of warnings in MSVC. 2015-08-06 01:37:58 -07:00
James Touton
f35cb736c7 Changed type of audio_channel_counts; fixes type conversion warnings on MSVC. 2015-08-06 01:34:55 -07:00
James Touton
1d875960db Propagate error information from set_gamma_table. 2015-08-06 01:31:26 -07:00
James Touton
73f3af6c3b gencomp builds cleanly (and produces clean-building code) on MSVC. 2015-08-06 01:28:01 -07:00
James Touton
8b4dc6ea81 gencpu builds cleanly on MSVC. 
Fixed nasty bitfield issue where MSVC enums are signed, so a two-bit bitfield set to 2 is later read as -2.
 2015-08-06 01:25:15 -07:00
James Touton
2d2e721437 Use ISO C functions for MSVC. 2015-08-06 01:17:17 -07:00
James Touton
f066f5a4fd video_sdl compiles cleanly in MSVC. 
Resolved a bunch of type conversion warnings.
 2015-08-06 01:12:43 -07:00
James Touton
0daa18ab2a slirp compiles cleanly in MSVC. 
Use standard C prototypes instead of K&R.
 2015-08-06 01:11:28 -07:00
James Touton
3271fc9d28 Added lengthof. 2015-08-06 01:02:19 -07:00
James Touton
f05cd77eb4 Renamed ASM_SYM_FOR_FUNC to ASM_SYM. 
Use ASM_SYM in place of __asm__ in a couple places.
 2015-08-06 00:54:21 -07:00
Alexei Svitkine
6c8d16ef3a Fix issue where unminimizing a SheepShaver window on Mac OS X 
results in redraw artifacts.
 2015-06-30 15:01:51 -04:00
Alexei Svitkine
d3cb3ca95f Fix some warnings when building Xcode project. 2015-06-29 11:50:50 -04:00
Masaq-
c5dc44e117 fix sheep_net kernel panic when combined with Linux AppleTalk module 2015-06-20 01:56:34 +00:00
Masaq-
7091c56ccd randomize fake Ethernet address to be used as IPX node number 2015-06-12 01:28:19 +00:00
Masaq-
9ae8499d64 make sheep_net removable from Linux 2.6.31 onward 2015-05-28 02:10:59 +00:00
Masaq-
3a36a1e456 fix memory leak reported by kmemleak 2015-05-28 02:10:45 +00:00
Masaq-
d77100ae1f fix sheep_net Linux kernel panic on n2n edge0 tap device 2015-05-28 02:10:23 +00:00
Adrien Destugues
80cb8e0cff BeOS: null-terminate strings when converting file names. 2015-04-28 21:35:14 +02:00
Adrien Destugues
fd49455eec BeOS: get video to work again. 
* The code was hardwired for 8-bit mode, unplug that and set it up for
32bit mode (much simpler).
* You need a ROM that supports 32bit mode for now
* Mode switching not supported yet.
 2015-04-28 21:35:13 +02:00
Adrien Destugues
c226da6172 BeOS: support for vmdir preferences. 2015-04-28 21:35:13 +02:00
Adrien Destugues
c97be8dbb2 BeOS: implement charset conversion. 2015-04-28 21:35:12 +02:00
Adrien Destugues
83f03d417a BeOS: stray backslash in about_window.cpp 2015-04-28 21:35:12 +02:00
Adrien Destugues
371d385c6b Missing include for memset. 2015-04-28 21:35:11 +02:00
Adrien Destugues
09638b2536 BeOS: set some required defines for FPU configuration. 2015-04-28 21:35:11 +02:00
Adrien Destugues
66f68a995a BeOS: WIP update to video mode switching support code. 2015-04-28 21:35:04 +02:00
Adrien Destugues
2adcbc2694 Haiku: Set -fomit-frame-pointer and -fno-PIC 
* This frees some registers and make the x86 assembler code work.
* Restore use of fpu_x86 because of this.
 2015-04-28 21:11:29 +02:00
Adrien Destugues
2ad0536d13 Add Haiku support. 
* Haiku is mostly compatible with BeOS, but there are a few minor
changes.
 2015-04-28 21:11:28 +02:00
Dan Sumorok
fcc1598086 Add no_pie linker flag for Mac OS X 10.6 and later. 2015-01-14 19:23:26 -05:00
Dan Sumorok
b8fb05fbd0 Minor build fixes 
Removed OS X -no_pie linker flag
Fixed copy/paste error in ether helper help string
Added missing distclean targets.
 2014-12-31 09:36:17 -05:00
Dan Sumorok
24005dc4ed Merge remote-tracking branch 'us/master' into mergetest 2014-12-30 09:16:27 -05:00
Dan Sumorok
b1270264a1 Changed page zero size to 4 kB to fix problem on OS X 10.10. 2014-11-29 19:45:47 -05:00
Dan Sumorok
4f162dc6e3 Minor build fixes. 2014-11-29 19:25:31 -05:00
Ricky Zhang
5192d60805
Fix space/tab indention 2014-09-19 09:59:23 -04:00
Ricky Zhang
39be6a0ac9
Use atomic operation 2014-09-18 16:10:41 -04:00
Ricky Zhang
b5b415da0d
Apply patch for 3.15 kernel 2014-09-18 11:38:06 -04:00
Dave Vasilevsky
4dd7f9236f Change GUI object extension, so GCC doesn't think we're Go 2014-03-05 20:11:55 -05:00
Dan Sumorok
3c6788fd26 Tweak of the linker commands. 2013-07-08 06:51:24 -04:00
Dan Sumorok
c01bd008db Hack to load code below 4GB, and to make 32-bit vm allocates work. 2013-07-06 17:09:37 -04:00
Dan Sumorok
1c99d52b91 Added missing file. 2013-06-28 07:12:38 -04:00
Dan Sumorok
c4276955ba Fixed some 64-bit releated problems on os x. 2013-06-28 07:11:52 -04:00
Dan Sumorok
45a34e2763 Merge branch 'master' into asc 2013-06-22 12:43:52 -04:00
Dan Sumorok
b609065bc4 Always start sound. 2013-06-22 12:43:41 -04:00
Dan Sumorok
3583b00a77 Copy etherhelpertool into application bundle. 
Ignore -psn_ command line argument so OS X application bundle
can be launched.
 2013-06-21 18:59:04 -04:00
Dan Sumorok
e08090095f Fixed compile error when asc emu is not enabled. 2013-06-19 19:09:40 -04:00
Dan Sumorok
9aec39d3cb Added extra ifdefs. 2013-06-18 07:02:42 -04:00
Dan Sumorok
b7cfe89445 More asc fixes. 2013-06-15 16:21:26 -04:00
Dan Sumorok
ce68f366cb Added asc.c, and asc.h. 
Don't stop sound if we don't have to.
 2013-06-09 19:34:19 -04:00
Dan Sumorok
eedf6880db A bit of apple sound chip support. 2013-06-09 16:27:24 -04:00
asvitkine
44c7e447a7 Merge pull request #35 from dsumorok/buildfix 
Buildfix
 2013-06-02 22:32:57 -07:00
Dave Vasilevsky
e3710843b1 FreeBSD amd64 fixups 
* Look for CPU named "amd64" as well as "x86_64"
* Don't use /dev/ptmx on FreeBSD
* On amd64 FreeBSD uses SIGSEGV, not SIGBUS
* Use MAP_FIXED to force allocations within 32-bits, it's the only way
* Need <sys/param.h> for SHMLBA
* The old offsetof() fix is no longer needed
* Preliminary work on instruction skipping
 2013-05-30 21:34:30 -04:00
Dan Sumorok
8a02128473 More changes of etherslave to etherhelper. 2013-05-29 19:42:59 -04:00
Dan Sumorok
5db556214c Renamed "etherslave" to "etherhelper". 2013-05-29 19:30:51 -04:00
Dan Sumorok
fc8835aa6f Added more debug output. 
No longer add ethernet interface to bridge if bridge already exists.
 2013-05-29 07:00:44 -04:00
Dan Sumorok
8f863effbc Added error messages. 2013-05-28 19:33:12 -04:00
Dan Sumorok
5aa782acc0 Changed ethernet address when using tap interface. 2013-05-27 13:55:38 -04:00
Dan Sumorok
f994087291 More work on new tap interface. 2013-05-26 20:58:03 -04:00
Dan Sumorok
19b53082a3 Added tap support to etherslave tool. 2013-05-25 22:01:21 -04:00
Dan Sumorok
c939be2d2d Removed objective-c from runtool source so it can be built with 
newer (not from Apple) versions of gcc.
 2013-05-25 10:48:15 -04:00
Dan Sumorok
531b1d7df4 Merge branch 'etherslave' 
Conflicts:
	BasiliskII/src/Unix/configure.ac
 2013-05-14 06:39:11 -04:00
Dan Sumorok
0e667be7be Merge branch 'osx-video-fix' 2013-05-14 06:37:47 -04:00
Dan Sumorok
241162f261 Fixed code that removed 15-bit color mode. 
15-bit color mode is now removed on all platforms.
The removal of 15-bit color mode now happens before the sort.
Updated a variable name.
Changed list length calculation to use C++'s clever pointer
subtraction.
 2013-05-05 16:20:37 -04:00
Dan Sumorok
e91a03f40f Added clean rule for etherslavetool. 2013-05-05 14:20:33 -04:00
Dan Sumorok
1bc3691805 Removed clean rule for etherslavetool. 2013-05-05 14:18:10 -04:00
Dan Sumorok
57b9ad0d95 Remove 15 bit video for OS X. This mode doesn't seem to work. 
This also fixes 2-bit, 4-bit, and 8-bit modes.
 2013-05-05 14:11:09 -04:00
Dan Sumorok
f1c78e659c More coding style updates. 2013-05-04 20:37:29 -04:00
Dan Sumorok
01ba04139f Updated coding style. 2013-05-04 20:36:11 -04:00
Dan Sumorok
93effd9192 Darwin/lowmem and Darwin/pagezero do not need to be removed for clean. 2013-05-01 06:55:49 -04:00
Dan Sumorok
94b790728e Added file-level comments. 2013-05-01 06:54:20 -04:00
Dan Sumorok
a250b40c80 Added new etherlave network option for OS X. 2013-04-30 20:46:31 -04:00
Dan Sumorok
a421d35b9d Fix for OS X build under x-windows. Separated out sound option. 2013-04-30 20:41:50 -04:00
Dave Vasilevsky
26d5f6b7f2 SDL: Allow fullscreen toggle in BasiliskII 2013-04-24 04:13:14 -04:00
Dave Vasilevsky
eceafc6200 SDL: Allow toggling fullscreen/windowed mode 2013-04-24 04:13:07 -04:00
Dave Vasilevsky
efae88ea7c SDL: Let video driver know about cursor type change 2013-04-24 04:12:06 -04:00
Dave Vasilevsky
ff423fe7c9 SDL: Let driver_base be reused in a different video mode 
Split init() into one-time initialization, and adaptation to a new video mode.
 2013-04-24 04:09:47 -04:00
Dave Vasilevsky
e9c913c4ae SDL: Completely collapse fullscreen/window drivers 2013-04-24 03:30:52 -04:00
Dave Vasilevsky
9e807c884c SDL: Move init() method into base 2013-04-24 03:30:52 -04:00
Dave Vasilevsky
19529cacd4 SDL: Remove useless virtual qualifiers 2013-04-24 03:30:52 -04:00
Dave Vasilevsky
14e6e654f0 SDL: Move mouse movement to base 2013-04-24 03:30:52 -04:00
Dave Vasilevsky
d0648a7039 SDL: Make VOSF update functions apply to driver_base 
They don't use anything special from fullscreen/windowed derived classes.
Also, get rid of unneeded friend declarations.
 2013-04-24 03:30:51 -04:00
Dave Vasilevsky
2a5100e8d2 SDL: Move destruction into base 2013-04-24 03:30:51 -04:00
Dave Vasilevsky
fed95369d1 SDL: Move window title setting to base 2013-04-24 03:30:51 -04:00
Dave Vasilevsky
b2e5125868 SDL: Move cursor initialization to base 
Also decide in just one place whether to use hardware or software cursor.
 2013-04-24 03:29:53 -04:00
Dave Vasilevsky
6eb54dccbe SDL: Move more initialization to base 
Including blitter, gray ramp, frame buffer initialization.
 2013-04-24 00:07:50 -04:00
Dave Vasilevsky
053308e4f9 SDL: Move VOSF initialization to base 2013-04-24 00:07:50 -04:00
Dave Vasilevsky
0c2658f4d1 SDL: Prepare to collapse fullscreen/window drivers 
We want to have just one base driver that can handle both fullscreen and
windowed mode, so that we can easily switch between modes.

Create a virtual init() method to do construction, so we can move common code
from the derived classes into the base init().
 2013-04-24 00:07:49 -04:00
Dave Vasilevsky
82adeb988b SDL: Remove unused method and ivars 
mouse_last_x, mouse_last_y and driver_window::mouse_moved() look like remnants
of X11 video, they're never really used.
 2013-04-24 00:07:49 -04:00
Dave Vasilevsky
94ebea3509 SDL: Don't uselessly free the_host_buffer 
It always points to a member of an SDL_Surface, which is freed by SDL.
 2013-04-24 00:07:43 -04:00
Dave Vasilevsky
c0d7aa0004 SDL: Remove old hack, reduce flicker 
The old SDL_QuitSubsystem workaround is probably obsolete, and causes
flicker on resolution changes.
 2013-04-24 00:04:49 -04:00
Dave Vasilevsky
02d844c6a7 SDL: Make non-Mac fullscreen cursor visible 
Issue: https://github.com/cebix/macemu/issues/26

On non-Mac platforms, driver_fullscreen constructor sets up software cursor,
but switch_to_current_mode() ask for a hardware cursor, possibly due to a typo.
Neither one ends up being drawn, so the cursor goes invisible.

This change makes them agree to use a software cursor. We should eventually
move to just one place deciding which cursor to use, so they don't have to be
kept in sync.
 2013-04-22 02:06:15 -04:00
Dave Vasilevsky
2fb9487933 Mac: Fix mouse grabbing 
If mouse is grabbed on OS X, every time the mouse cursor icon changes the
cursor is recentered. Workaround similar to Windows in video_set_cursor().
 2013-04-20 19:02:33 -04:00
Dave Vasilevsky
8204105c41 Prefs: Fix buffer overrun 
Prevent intermittent crashing when prefs contains empty lines or lines with
no spaces.
 2013-04-20 19:01:54 -04:00
Dave Vasilevsky
8f27d4af9b Standalone GUI doesn't need to pull in all the generic disks 2013-03-28 06:30:08 -04:00
Hans de Goede
2226aa4752 don't strip -g option to GCC for B2 2013-03-12 19:08:11 -04:00
Hans de Goede
90c113c43b check for WANT_SDL_VIDEO rather than WANT_SDL when deciding to use X11 2013-03-12 18:59:58 -04:00
Hans de Goede
cb42ef255b fix linux crash on sscanf failure 2013-03-12 18:55:58 -04:00
asvitkine
3b177f141f Merge pull request #22 from vasi/dmg-sparsebundle 
Sparsebundle support
 2013-03-11 18:53:54 -07:00
Dave Vasilevsky
912d2e05be disk_generic: Iterate using index instead of pointers 2013-03-11 17:10:38 -04:00
Dave Vasilevsky
c79a52f3b8 disk_generic: Distinguish between unknown disks, and unmountable disks 2013-03-11 17:08:27 -04:00
Dave Vasilevsky
cdb0338883 sparsebundle: Handle locking properly 2013-03-11 16:50:12 -04:00
Dave Vasilevsky
9953374b25 sparsebundle: Don't write zeros in unallocated space 
Also close files when we're done with them.
 2013-03-11 16:18:43 -04:00
Dave Vasilevsky
127441afb7 sparsebundle: Use pointers to member functions 2013-03-10 12:12:24 -04:00
Dave Vasilevsky
753a5c40fe sparsebundle: Remove old TODOs 2013-03-10 12:05:43 -04:00
Dave Vasilevsky
0c8292aea3 sparsebundle: Minor fixes 
- Allocate memory in disk_sparsebundle() constructor
- Constify constructor parameter
- Be careful with invalid fds
 2013-03-10 12:03:34 -04:00
Doug Brown
0980a87e3f Ensure ROM is above RAM in Windows. 
Fixes black screen on newer versions of Windows.
 2013-03-02 12:29:39 -08:00
Doug Brown
ed358ca618 Fix case sensitivity of MinGW basetsd.h header when compiling inside Linux. 2013-03-01 03:08:29 -08:00
asvitkine
ef5a6ef3a7 Merge pull request #19 from landonf/landonf-pty-fix 
Set tty raw mode when using a pty.
 2013-02-28 20:56:14 -08:00
Landon Fuller
2c8507ea97 Set tty raw mode when using a pty. 2013-02-25 20:24:56 -05:00
Dave Vasilevsky
17aabc4c40 Generify vhd, too 2013-02-24 15:57:18 -05:00
Dave Vasilevsky
5c7af60f16 generically search for disk types 2013-02-24 15:43:54 -05:00
Dave Vasilevsky
3af3834b8e Basilisk deserves sparse bundles too! 2013-02-24 14:40:41 -05:00
Dave Vasilevsky
917984e6ec Add to make links 2013-02-24 14:15:21 -05:00
Dave Vasilevsky
2a15911938 Full sparsebundle implementation 2013-02-24 14:11:29 -05:00
Dave Vasilevsky
091db05aac Partial implementation of sparsebundles; still needs Info.plist parsing 2013-02-24 13:02:16 -05:00
Charles Lehner
76911be266 Fix compilation error on OS X. 2012-10-30 09:34:10 -04:00
Charles Lehner
349fad4d2f Add port redirection option for networking with slirp. 
Port forwarding allows the emulator to host servers that can be
accessed from outside the virtual network.

The code for parsing the preference option "redir" is adapted from
qemu code. The rest was already implemented.
 2012-10-30 01:32:38 -04:00
Christian Bauer
b4940ae29d more cleanups (unused/uninitialized variables, forgotten free()s, etc.) 2012-09-08 12:33:39 +02:00