Macintosh-Tools
/
macemu
mirror of https://github.com/kanjitalk755/macemu.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
2,522 Commits 5 Branches 17 Tags 20 MiB
Commit Graph

2522 Commits

Author SHA1 Message Date
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 3cb91cc003 Merge pull request #95 from atsampson/master 
Add MacTimeToTime to SheepShaver's macos_util.
 2016-08-26 11:55:07 -04:00
Adam Sampson b44a674d7e Add MacTimeToTime to SheepShaver's macos_util. 
Commit e1693eb92b made extfs_unix.cpp
require this function in both BasiliskII and SheepShaver, but only added
the function itself to BasiliskII.
 2016-08-20 03:14:21 +01: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
asvitkine ad270e5a84 Merge pull request #94 from rickyzhang82/pr-sheep-net-bug-fix 
Fixed show stopper bug in sheep_net module.
 2016-08-19 06:16:53 -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
asvitkine dc112290ac Merge pull request #90 from rickyzhang82/sheep-net-bug-fix 
Fix sk_alloc function change since 4.2 Linux kernel.
 2016-08-13 09:10:56 -07: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
asvitkine 58eb2560c8 Merge pull request #89 from dbrant/mtime 
Set last-modified time on exported files in Windows.
 2016-08-02 18:34:55 -04:00
Dmitry Brant 6ac8f16efb Improve naming consistency. 2016-08-02 09:02:40 -04:00
Dmitry Brant f1b702bddd Merge branch 'mtime' of github.com:dbrant/macemu into mtime 2016-07-30 14:16:54 -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 d776afa35a Correctly set last-modified time on exported files in Windows. 2016-07-30 14:14:56 -04:00
asvitkine aec76768b5 Merge pull request #88 from dbrant/mtime 
Correctly set last-modified time on exported files.
 2016-07-29 19:17:00 -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
Christian Bauer b58a9260bd Add checks for realloc() result 2016-01-31 16:00:57 +01:00
Christian Bauer 07b8b22c9b Update autotools stuff for cxmon 
Remove autotools generated files from the repository, provide a 'bootstrap'
script for regenerating them, and update the configure.ac and Makefile.am
files.
 2016-01-31 15:46:49 +01:00
Alexei Svitkine 922f9d9fff Merge branch 'master' of https://github.com/cebix/macemu 2015-12-29 11:42:05 -05:00
Alexei Svitkine 041fb86fdf Import cxmon-3.2 source. 2015-12-29 11:40:33 -05: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
asvitkine d73ff7c871 Merge pull request #80 from vasi/yosemite 
Build on Mac OS X 10.10+
 2015-12-27 22:28:48 -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
Dave Vasilevsky a89bb77bde Fix DiskType missing symbol 2015-12-27 20:49:56 -05:00
Alexei Svitkine db375713bb Fix CrossPlatform files for SheepShaver build and a warning. 2015-12-26 02:17:08 -05:00
Alexei Svitkine 934fbca480 More updates for CrossPlatform dir move. 2015-12-26 02:11:18 -05:00
Alexei Svitkine 11f7e3b1a1 Fix typo in an earlier commit. 2015-08-10 10:36:39 -04:00
Alexei Svitkine daafe565a1 Fix file includes following move to CrossPlatform. 2015-08-09 18:53:51 -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 1dd04867dd Update 'make links' symlinks to Basilisk following move to 
CrossPlatform.
 2015-08-09 18:46:03 -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
asvitkine c689f178a1 Merge pull request #76 from Bekenn/msvc 
A bunch of changes enabling the use of Visual Studio 2015.
 2015-08-09 18:12:29 -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