Commit Graph

2131 Commits

Author SHA1 Message Date
Adam Sampson 413190d12f Use openpty if possible.
The code this affects in sshpty.c originally came from OpenSSH, which
now uses openpty by preference when it's available. openpty is a
BSD-ism, but it's been provided by glibc on Linux with the BSD
semantics since 1998.
2020-08-23 17:26:15 +01:00
Adam Sampson 4da2082c07 The mono palette hack isn't needed for SheepShaver. 2020-08-23 16:47:48 +01:00
uyjulian bb5caf093a
Merge latest ARAnyM changes 2020-08-23 08:34:42 -05:00
rakslice e5c4699923 put error message on stderr 2020-08-18 21:09:28 -07:00
rakslice 639f05da7e don't call SetWindowGammaRamp without sdl_window 2020-08-18 20:53:39 -07:00
rakslice ba111a5cb7 Merge branch 'kanjitalk755_master' into gamma 2020-08-18 04:48:28 -07:00
rakslice bb080a262e repeat gamma entries to handle B2 thousands (16-bit) color mode; ignore its solid grey palettes such as those that happen during mode changes 2020-08-18 04:21:23 -07:00
rakslice b4b652d696 fix sdl error message output 2020-08-18 04:13:50 -07:00
rakslice d1fcff0a08 corresponding gamma change for sdl1 2020-08-18 03:28:43 -07:00
rakslice 792ad5ccff cleanup 2020-08-18 03:28:23 -07:00
rakslice ffee1ebad2 Add gamma support for direct color modes 2020-08-17 21:05:08 -07:00
kanjitalk755 6985ad67fe BII: prepare JIT 2020-08-13 21:00:42 +09:00
kanjitalk755 630f4ffafb fixed leak 2020-08-12 20:49:14 +09:00
kanjitalk755 1f2b35fef2 reserve framebuffer 2020-08-12 11:39:58 +09:00
kanjitalk755 d906fb23b0 CD fix
default palette
2020-08-10 13:01:22 +09:00
kanjitalk755 7c6b9a67f6 the first steps for Apple Silicon 2020-08-08 11:50:55 +09:00
Ricky Zhang 13017f711f
Fix a weird whitespace.
Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
2020-07-15 21:56:00 -04:00
Ricky Zhang 82524ba034
Unwrap the formula.
Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
2020-07-15 21:54:06 -04:00
Ricky Zhang 2e96512f26
Fix if/else format.
Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
2020-07-15 21:42:59 -04:00
Ricky Zhang 5f1b41eb42
Improve the comment readability.
Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
2020-07-15 21:14:20 -04:00
Ricky Zhang 03ebc5375b
Fix comment.
Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
2020-07-15 20:55:34 -04:00
Ricky Zhang 342fbbce34
Port mini vMac guest OS screen ROM patch.
- Added Mac SE 24 bit ROM screen patch from mini vMac.
  The guest OS resolution in System 6 can be defined
  at an arbitrary combination.
- Mac frame buffer base mapping is moved out from guest RAM.
  This creates more leg room for the host frame buffer.
- Enable System 6 vscreen support in SDL2. Passed build and test.
- Enable System 6 vscreen support in SDL1. Passed build and test.
- Eanble System 6 vscreen support in XWidnow. Passed build and test.

See my [screen cast demo here](https://youtu.be/aXzM8t_u3zI)

Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
2020-07-15 19:14:36 -04:00
Seth Polsley 478fc39650 Setting optimization level 2020-07-14 23:07:46 -05:00
Seth Polsley d7fb0ac298 Audio CD format as default and update based on data mode 2020-07-14 19:13:33 -05:00
Seth Polsley 8124b61d2b Enable optimization by fixing inits and access bounds 2020-07-14 16:48:06 -05:00
Seth Polsley 4191a86895 Removing recovered references to coreaudio, not needed for sdl2 builds 2020-07-13 01:25:37 -05:00
Seth Polsley c7a7e034ed Cleaning associated xcode project files 2020-07-13 01:16:25 -05:00
Seth Polsley 2c8678417c Remove coreaudio embed from BII builds since using SDL2 audio 2020-07-12 23:34:19 -05:00
Seth Polsley 7441d04a28 Minor cleanup of bincue vars 2020-07-12 16:54:40 -05:00
Seth Polsley 3e32a6da32 Enforce only one player at a time, pause any other 2020-07-10 17:02:04 -05:00
Seth Polsley 47fca465ba Remove the one dependency on unicode for reading rom file 2020-07-07 01:05:41 -05:00
Seth Polsley 084a8fbd74 Does Win BII need Unicode? removing... no others have it and prefer to add it to both sheep and BII together 2020-07-07 00:18:18 -05:00
Seth Polsley 1775fb3776 Adding bincue flag in configure 2020-07-06 22:02:19 -05:00
Seth Polsley 80399941b2 Cleaning up build scripts with Bincue for Windows and *nix 2020-07-06 18:47:26 -05:00
Seth Polsley 30cf26e1f6 Windows bincue support 2020-07-06 00:04:08 -05:00
Seth Polsley 66a69dc79b Refactoring to handle crossplatform bincue support 2020-07-05 23:54:53 -05:00
Ricky Zhang 2595059146
Fix a minor bug for B/W palette.
Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
2020-07-04 16:47:58 -04:00
Ricky Zhang bae7a4d16b
Explained why the magic number used in 24bit ROM frame mapping.
Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
2020-07-04 14:45:21 -04:00
Ricky Zhang e63c6b91dc
Patch SDL2 palette for 24bit ROM.
24bit ROM doesn't invoke video driver control. Therefore, a manual step
is required to add a black & white palette for guest_surface in SDL2.

Please check out [the screen cast here](https://youtu.be/br5Hjt9F6X4).

Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
2020-07-04 14:22:33 -04:00
Ricky Zhang 40f6c77775
Move the RAM debug message to the proper place.
Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
2020-07-03 19:42:55 -04:00
Ricky Zhang 7e83b9c49e Fix Indentations.
Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
2020-07-03 19:42:10 -04:00
Ricky Zhang 98f3cab953 Fix indentation.
Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
2020-07-03 10:00:15 -04:00
Ricky Zhang 6f4da45eeb Enhanced scale up and scale down in SDL2.
- Enable window mode to be resizable.
- When restore the window, restore the scale ratio to 1.

Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
2020-07-02 18:35:18 -04:00
asvitkine 864b4a1652
Merge pull request #206 from rickyzhang82/pr-fix-framebuffer-bug
Abort when frame buffer memory allocation fails.
2020-07-01 21:36:25 -04:00
Ricky Zhang bdf5a276d3
Abort when frame buffer memory allocation fails.
- Remove unused code in vm_acquire_framebuffer function.

Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
2020-06-30 18:25:50 -04:00
Ricky Zhang 56665d30a3
For Darwin, the default addressing mode is memory banks.
When the host OS is Mac OS X, direct addressing in BII doesn't guarantee
that the allocated memory for frame buffer base address in the host
(FrameBaseHost) satisfies the following conditions:

- FrameBaseHost > RamBaseHost
- (FrameBaseHost - RamBaseHost) + Frame_Size < 4GiB
where RamBaseHost refers to the emulated RAM base address in the host.

This may cause the random hang problem where the allocated frame address
failed to meet the conditions above.

Because the direct addressing mapping is a simple math:

RamAddrMac = RamAddrHost - RamBaseHost.

See details: https://github.com/cebix/macemu/issues/203

Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
2020-06-30 18:07:25 -04:00
Ricky Zhang 18701c97df
Fix year in project
Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
2020-06-29 22:10:27 -04:00
Ricky Zhang 8e88e462ee
Fix code review issues.
Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
2020-06-28 18:42:14 -04:00
Ricky Zhang 1bfb0e94a3
Back out the hack from kanjitalk755
Remove the unused header.

Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
2020-06-27 12:13:51 -04:00
Ricky Zhang dc8bb7e2a3
Back out the hack from kanjitalk755
- In 8 bit color game, the hack crashed the app.
- After backing out the hack, I can play 256 color game with displaycolordepth 8.
- By default, the displaycolordepth is 0.

Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
2020-06-25 16:56:40 -04:00
Ricky Zhang d28599f49d
Backport MacOSX support.
- video_sdl2 for Mac OS X requires MacOSX update.

Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
2020-06-25 15:50:40 -04:00
Ricky Zhang a46759990d
Backport SDL2 features from https://github.com/kanjitalk755/macemu
By default, without providing `with-sdl2` in configure it uses SDL1.
Users need to explicitly request SDL2.

Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
2020-06-25 15:28:41 -04:00
Ricky Zhang b0bdceac34 Revert "Merge pull request #190 from fragglet/patch-1"
This reverts commit a4a2c88ed7, reversing
changes made to 1918557e78.
2020-06-25 09:43:20 -04:00
Seth Polsley 23da9e72eb Fix handling of nocdrom 2020-05-25 18:55:56 -05:00
Seth Polsley bebeacc895 adding adb back for build, fixing automerge problem 2020-05-25 16:52:45 -05:00
Seth Polsley 8e110b063c Merge branch 'master' into cdaudio_test 2020-05-25 16:31:02 -05:00
Seth Polsley 7eb7a477d0 clang debug flag adjustment 2020-05-25 15:58:15 -05:00
kanjitalk755 a01387b1af prefs item "sdlrender" 2020-05-18 17:39:05 +09:00
kanjitalk755 a528b0a40f BII: fixed writing xpram file 2020-05-16 21:18:16 +09:00
Roland Illig 8a4b84b9d7
src/Unix/Darwin/testlmem.sh: make code shorter
The old code used the `[[` shell keyword, which is only available in bash.
The interpreter in line 1 is `/bin/sh` though.
This confused my shell portability check in pkgsrc, since that check neither guesses the target platform from the filename, nor assumes that `/bin/sh` is actually bash, even though this may be true on macOS.

The change makes the code shorter with the well-known `${var:-default}` pattern.
Since `$1` is now only accessed when it is defined, this allows the program to have a `set -eu` at the top.
This in turn would make all the `&&` redundant since it applies automatic error checking.

The `{ ... } 1>&2` could also be replaced with a single `exec 1>&2` at the top.
2020-05-05 19:48:35 +02:00
bolt c6e1af7ff4 Fix compile time warning on enum compare 2020-04-09 15:07:29 +02:00
bolt 767b97311b Add the strings from commit 00f02d9d0c to user_strings.h 2020-04-09 14:50:07 +02:00
kanjitalk755 617a723a16
Merge pull request #40 from emendelson/master
New icons; removed unused icon code
2020-03-27 23:27:43 +09:00
emendelson 0e01e5c91e New icons; removed unused icon code
Replace (again) the Windows and MacOS icons and remove the c-file icons and the reference to them in the source.
2020-03-26 20:27:24 -04:00
kanjitalk755 27d3d93b7c
Merge pull request #39 from emendelson/master
Updated icons; add Windows medium icon
2020-03-24 09:15:23 +09:00
kanjitalk755 c0dfecdd1a fix error for linux build 2020-03-23 11:58:42 +09:00
emendelson 8ca7815baf Updated icons; add Windows medium icon
Replace the existing icons with the 7/8 design; add a 48x48 icon for the Windows build.
2020-03-22 14:00:18 -04:00
kanjitalk755 946f4bb77d BII/SS common: read keycodes, if failed, read BasiliskII_keycodes 2020-03-21 19:48:58 +09:00
kanjitalk755 b3c4d46ca9 changed default keycodes file name 2020-03-21 10:21:53 +09:00
kanjitalk755 ecef51bc47 fixed keycodes file name (SS)
fixed capslock (Windows)
2020-03-19 11:10:02 +09:00
rakslice 2a6dc7e328 clean up some warnings 2020-03-17 18:47:02 -07:00
rakslice cd269a9ce1 In SheepShaver GUI don't show JIT checkbox in non-JIT build 2020-03-17 16:24:07 -07:00
rakslice f1b0a20b37 get prefs_editor_gtk building in mingw32 2020-03-17 16:13:44 -07:00
rakslice aeb585527d changes for buildability under MSYS2 mingw32 2020-03-17 15:11:12 -07:00
asvitkine a4a2c88ed7
Merge pull request #190 from fragglet/patch-1
configure: Enable /dev/ptmx for Linux, Darwin.
2020-03-15 19:04:20 -04:00
anabate123 00f02d9d0c
Added more Mac models to the ModelID string 2020-03-14 18:59:27 -04:00
kanjitalk755 59ce931955 fixed destroying bridge 2020-03-08 12:33:44 +09:00
kanjitalk755 7062e864c8 Fixed SS build 2020-03-06 10:38:56 +09:00
kanjitalk755 e4ee28b199 Supports etherhelper (Xcode only) 2020-03-05 16:07:59 +09:00
kanjitalk755 0ad7a968ba Merge remote-tracking branch 'dsumorok/master' 2020-03-05 15:53:44 +09:00
kanjitalk755 1601829d22 BII: changed monitor default 2020-02-17 11:54:48 +09:00
Andrew Tonner 8b44b00da3 In extfs icon creation, ensure that the times on the host file are set correctly; actually allocate space for the other HInfo that set_finfo reads, such as the times 2020-02-12 16:28:00 -08:00
Andrew Tonner 837c82d8b8 expect TCHAR returns from RegQueryValueEx now that we are potentially building with _UNICODE 2020-02-12 16:16:31 -08:00
Andrew Tonner 07e9db881c failsafe for localtime(-1) on Windows to avoid segfault 2020-02-12 16:13:26 -08:00
Andrew Tonner 744df7adf3 Don't try to receive frames when eth is unloaded on the MacOS side as it will call uninitialized vectors 2020-02-11 06:38:01 -08:00
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
Simon Howard 507508b66d
configure: Enable /dev/ptmx for Linux, Darwin.
Both of these systems have /dev/ptmx for creating pseudoterminals.
OS X Leopard (10.5) added it in 2007, and Linux has had support for
it since v2.1 (1998).

This fixes a bug with pseudoterminal creation on Linux and macOS
where a new pseudoterminal cannot be created because the wrong
method is being used to find one.
2020-01-25 01:05:52 -05:00
uyjulian 36b6d0769b
Zero out memory 2020-01-22 02:41:06 -06:00
uyjulian cfcfde0480
Use locking on idle wait cond 2020-01-22 02:35:48 -06:00
uyjulian 63ddee1be1
Set areg 7 to 0x2000 on m68k reset 2020-01-22 02:35:11 -06:00
kanjitalk755 b5fbba6e53 fix for New Build System (Xcode10+) 2020-01-22 10:48:34 +09:00
uyjulian 9dc485c56a
Sync with latest ARAnyM changes 2020-01-12 09:50:04 -06:00
uyjulian 67dd2e6676
Disable PIE, add sanity check for >4GB 2020-01-12 09:45:10 -06: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
uyjulian 03fc337242
uae_cpu is based upon ARAnyM sources 2019-09-02 14:40:01 -05:00
uyjulian 28bc58ccd2
Use release configuration by default 2019-09-01 17:01:25 -05:00
uyjulian 48a41966fd
Sync with ARAnyM compiler sources 2019-09-01 16:56:03 -05:00
uyjulian 730ca109b7
Remove SDL1 support; add SDL2 support from kanjitalk755 repository 2019-09-01 14:51:28 -05:00
uyjulian fcdfd2f799
Cleanup of sysdeps header file 2019-09-01 14:37:24 -05: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
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 removed a space from BasiliskII/src/Unix/configure.ac, which
caused "configure" to fail to properly determine the correct set of
libraries to link against when using X11, which caused linking to
fail.  This fix restores the missing space.
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