Seth
ff2dc11f09
Extended mode and sector size support
2019-06-13 13:31:36 -05:00
Seth
2bcfae861f
Switch to SDL AudioStream to convert CD Audio
2019-06-13 12:59:49 -05:00
kanjitalk755
b62e20838c
disable mouse grab if hard-cursor used
2019-05-03 18:50:41 +09:00
asvitkine
01052ca89d
Merge pull request #181 from atsampson/scsifix
...
Remove obsolete sg.h workaround.
2019-04-05 01:12:49 -04:00
Seth
a25325fc7d
Snapshot of working bincue build, although no audio plays yet; saving all files in case xcode messes something up and needs reverting
2019-04-04 03:41:09 -05:00
Seth
1824cd8dc4
Reverting video_sdl2 to fixed branch (automerge picked up erroneous old version)
2019-04-03 22:19:57 -05:00
Seth
b5cec617eb
Merge remote-tracking branch 'upstream/master'
2019-04-03 12:41:45 -05:00
kanjitalk755
4603bd305c
fix cursor for high DPI
...
ignore Alt+F4 for all platform
2019-04-01 12:29:42 +09:00
kanjitalk755
7131e8205d
Windows: ignore Alt+F4
2019-03-30 13:23:52 +09:00
kanjitalk755
62deb590a6
fixed hot spot
2019-03-29 12:59:13 +09:00
kanjitalk755
2d76498256
hard cursor in full screen mode
2019-03-28 14:32:16 +09:00
Vladimir Serbinenko
6267af0315
sigsegv.cpp: Add addr32 decode
...
With this fix I can compile with ./configure --enable-addressing=direct,0x100000
and then I don't need to change vm.mmap_min_addr and hence without root
privileges
2019-03-21 15:13:53 +01:00
Seth
1889560d1f
deadlock and video fix comments tidied
2019-02-26 21:02:57 -06:00
Seth
537412b959
trying to remove graphical anomalies, alternative deadlock fix branch
2019-02-26 13:21:31 -06:00
kanjitalk755
1b6a63edf7
alternative PR#11
2019-02-26 14:57:02 +09:00
Seth Polsley
d9ba646899
Moving SDL video mutex lock to avoid deadlock between buffering and drawing threads
2019-02-25 18:43:34 -06:00
kanjitalk755
f67fe9671b
SDL2.framework relative path -> absolute path
2019-02-25 18:39:25 +09:00
kanjitalk755
6751b6d668
Merge pull request #10 from DrLex0/better_video_modes_handling
...
Improve video mode handling
2019-02-24 12:05:00 +09:00
Alexander Thomas
f91d6d9622
Improve video mode handling
...
Instead of using a generic list and then filtering 512x384 in SheepShaver,
start with the correct list right away. This avoids SS unexpectedly
refusing to run at 512x384.
2019-02-24 00:29:41 +01:00
Alexander Thomas
0fe02268f7
Enable high-resolution SDL2 rendering.
...
Combined with 'scale_nearest true', this offers sharp graphics on retina
displays.
2019-02-23 20:10:11 +01:00
kanjitalk755
ab0948d02e
BII/SS fix scroll wheel
2019-02-20 18:34:53 +09:00
kanjitalk755
dce4a951bb
invert sign of yearofs and dayofs
2019-02-10 11:10:23 +09:00
Alexander Thomas
64e408ced6
Add prefs item "dayofs" for finer-grained time offset
2019-02-09 22:44:43 +01:00
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
Adam Sampson
668c2ba107
Remove obsolete sg.h workaround.
...
This is no longer necessary as of glibc 2.2 (released in November 2000),
and it causes breakage when /usr/include/linux is installed using a
symlink-based system like stow.
2018-10-31 12:43:55 +00:00
Adam Sampson
5d77f86575
Make vdeplug support optional.
...
Linking with -lvdeplug without checking whether it exists causes
failures from later configure tests; this makes it an optional
dependency in the same way as other libraries.
2018-10-31 12:36:35 +00:00
MSharq
e583d05868
fixed vde_sock pointer
2018-10-29 21:14:25 +01:00
MSharq
242e8af3a7
fixed a bug
2018-10-29 15:44:53 +01:00
MSharq
2bc581d4f6
fixed indentation ether_unix
2018-10-28 19:42:04 +01:00
MSharq
cf406ec953
fixed indentation ether_unix
2018-10-28 19:40:08 +01:00
kanjitalk755
3db0cf3d0b
modified for Xcode10
2018-10-28 14:56:55 +09:00
MSharq
0c622863cf
fixed a bug
2018-10-23 15:37:09 +02:00
MSharq
30fdd103a2
changed vde switch to vde_switch in the usage function
2018-10-20 15:11:40 +02:00
MSharq
50c98de60f
a few indentation fixes
2018-10-20 15:07:38 +02:00
MSharq
e4332cc72a
added the printf statement for all Ethernet devices
2018-10-20 11:18:08 +02:00
MSharq
90b65715ae
added VDE functionality
2018-09-28 16:14:14 +02: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
uyjulian
8c0a84c536
Removed more unused files
2018-06-07 15:06:41 -05:00
uyjulian
e99d4e579c
Remove low memory globals hack (it doesn't work)
2018-06-07 15:01:48 -05:00
uyjulian
8353a9ed44
Hope it works
2018-06-06 23:11:08 -05:00
uyjulian
77e20bda2a
Back to BasiliskII uae_cpu but with ARAnyM JIT
2018-04-22 20:39:37 -05:00
uyjulian
1758ef58b5
Port of CPU code from ARAnyM (currently hangs)
2018-04-15 20:23:12 -05:00
uyjulian
1bf6e93461
Downgraded emulated UAE cpu
2018-04-15 17:33:50 -05:00
uyjulian
76d285a6f2
Convert buildsystem to CMake
2018-04-15 15:59:59 -05:00
uyjulian
c4b1b1937e
Remove support for all other platforms other than macOS
2018-04-15 11:17:57 -05: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
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
David Ludwig
1eb824a04e
added pref, "sdlrender", which can force a specific, SDL2 renderer (software can be faster in some cases, such as on VirtualBox hosts)
2017-09-09 16:48:30 +00:00
David Ludwig
cbda5759bb
added --with-sdl1 option to configure scripts, to force the use of SDL 1.x, over SDL 2.x
2017-09-09 15:15:28 +00:00
David Ludwig
20ad70cb35
unset the executable bit from video_sdl2.cpp
2017-09-09 01:09:13 +00:00
David Ludwig
1c0e8655dc
for non-OSX hosts, make GNU Autotools revert to using SDL 1.x, if SDL 2.x can't be found
2017-09-08 23:43:01 +00: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
David Ludwig
68ee5f23f9
make video_sdl*.cpp's header-comments refer to the versions of SDL that they target
2017-09-04 12:49:54 -04:00
David Ludwig
8940880794
make build scripts reference both video_sdl.cpp and video_sdl2.cpp
2017-09-04 12:44:34 -04:00
David Ludwig
a646f6dc3f
added compile-time checks for SDL version, when compiling video_sdl*.cpp
2017-09-04 12:28:25 -04:00
David Ludwig
f8682679c2
moved SDL2 video code to video_sdl2.cpp; restored SDL1 implementation of video_sdl.cpp
2017-09-04 12:18:52 -04:00
David Ludwig
22eaa317a8
reverted to SDL 1.x compatible audio APIs (which still work in SDL2)
2017-09-04 12:13:50 -04:00
David Ludwig
573ffee8b1
fixed issue #31 , "on multi-monitor OS X host: cursor can get locked to fullscreen display for guest OS"
2017-09-04 11:41:26 -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
David Ludwig
7a36983f11
fixed issue #27 : on OS X host, mouse can get locked to portion of fullscreen display
2017-09-02 15:54:33 -04:00
David Ludwig
0f8f30f639
Basilisk II, bug-fix: switching to fullscreen, via Ctrl+Enter, on a non-primary host display, could cause mouse cursor to jump to a different display
...
This bug was observed occurring on an OSX 10.12 host.
2017-09-02 15:36:56 -04:00
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 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
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
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
