kanjitalk755
7b13571587
Merge branch 'test_keymap'
2020-02-10 09:58:54 +09:00
kanjitalk755
c4570fe272
Merge branch 'test_notX'
2020-02-08 19:21:14 +09:00
kanjitalk755
6d2acbb07b
revert Makefile.in
2020-02-07 17:57:44 +09:00
kanjitalk755
ccf38a4005
condition modified
2020-02-07 11:16:59 +09:00
Andrew Tonner
f86b9b2abd
Actually remove the commented-out code
2020-02-06 18:14:16 -08:00
Andrew Tonner
bb69145861
OulanB's adb button buffer proposed change
2020-02-06 18:12:23 -08:00
kanjitalk755
1a875b1c10
in case backend is not X
2020-02-07 11:04:02 +09:00
Seth Polsley
899734d81d
Removing core audio flag for BII builds
2020-02-05 04:30:17 -06:00
kanjitalk755
57b3f7cf21
keymap test
2020-02-05 15:22:58 +09:00
rakslice
eb35678f0d
add missing common prefs multiple values; remove platform prefs from unix that are common prefs
2020-02-04 06:25:12 -08:00
kanjitalk755
f5b277548b
test for #24
2020-01-31 23:31:38 +09:00
kanjitalk755
2e001f465e
fixed autoconf build for macOS
2020-01-28 22:33:13 +09:00
kanjitalk755
b5fbba6e53
fix for New Build System (Xcode10+)
2020-01-22 10:48:34 +09:00
kanjitalk755
71cbb23b42
fix for writing resource fork on APFS
2020-01-12 19:59:51 +09:00
Seth Polsley
35439819d3
Best guess audio CD from data calls to allow multiple discs and testing different interface identifiers
2020-01-08 03:02:08 -06:00
Seth Polsley
281a8a9f68
Added support for mounting multiple bin/cue files
2020-01-06 15:50:53 -06:00
kanjitalk755
f07cc69531
BII: Reverted to JIT disabled
2019-12-09 10:37:18 +09:00
Seth Polsley
28cd764a31
Turn off 3d sound CD emulation since only stereo output at the moment
2019-11-10 18:58:35 -06:00
Seth Polsley
447c7b365d
Better AudioPlay support and CDScan implemented
2019-11-10 18:24:35 -06:00
Seth Polsley
9a18393fc5
testing track position hack which makes more games work with mixed-mode
2019-11-10 05:00:01 -06:00
Seth Polsley
35e6d4fcdf
Minor compatibility change for BII support
2019-11-05 02:18:11 -06:00
Seth Polsley
f7da6ba4e5
Cleaned up unused code for sound in traps
2019-11-05 01:40:53 -06:00
Seth Polsley
2ba2d12f8b
Scratch work in audio.cpp to re-implement driver logic in trapped-out code, but working due to change in rscr patcher
2019-11-05 01:20:21 -06:00
kanjitalk755
f171c611c2
Adjust preprocessor definitions
2019-10-26 20:47:06 +09:00
kanjitalk755
96a42689fd
BII JIT
2019-10-24 11:23:07 +09:00
kanjitalk755
858f8257a6
Fix for SDL2.0.10
2019-10-20 15:35:50 +09:00
kanjitalk755
977056a075
Use fpu_ieee instead of fpu_uae
...
Minimize BasiliskII.app/Contents/Resources
2019-10-14 14:54:32 +09:00
kanjitalk755
a489b71bb2
Added bundle identifier for BII
2019-07-17 12:06:35 +09:00
Seth
c7594f569a
Adding CD scan stub
2019-07-09 16:10:20 -05:00
Seth
64d6c0668f
Added helper functions and strings so BII compiles with bin/cue support
2019-06-16 12:52:29 -05:00
Seth
e4c34683a4
CD volume control enabled
2019-06-13 22:46:44 -05:00
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
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
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
kanjitalk755
3db0cf3d0b
modified for Xcode10
2018-10-28 14:56:55 +09: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
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
