Commit Graph

2360 Commits

Author SHA1 Message Date
James Touton
f05cd77eb4 Renamed ASM_SYM_FOR_FUNC to ASM_SYM.
Use ASM_SYM in place of __asm__ in a couple places.
2015-08-06 00:54:21 -07:00
Alexei Svitkine
6c8d16ef3a Fix issue where unminimizing a SheepShaver window on Mac OS X
results in redraw artifacts.
2015-06-30 15:01:51 -04:00
Alexei Svitkine
a18ecb8549 Fix SheepShaver Launcher build. 2015-06-29 12:54:51 -04:00
Alexei Svitkine
d3cb3ca95f Fix some warnings when building Xcode project. 2015-06-29 11:50:50 -04:00
asvitkine
339c421787 Merge pull request #74 from Masaq-/sheep_net
fix sheep_net kernel panic when combined with Linux AppleTalk module
2015-06-20 20:11:28 -04:00
Masaq-
c5dc44e117 fix sheep_net kernel panic when combined with Linux AppleTalk module 2015-06-20 01:56:34 +00:00
Alexei Svitkine
4f700dd489 Remove unnecessary resource forks and finder info and update
the finder info for the CW project to carry the .mcp extension.
2015-06-06 12:32:29 -04:00
Alexei Svitkine
1cef34125c Add Etherner drive source code and CodeWarrior project file, from:
https://web.archive.org/web/20131124123749/http://gwenole.beauchesne.free.fr/sheepshaver/files/SheepShaver-Ethernet.tar.bz2

The project can be used in CodeWarrior to build a binary blob that
can then be converted into EthernetDriverFull.i by hexconv.cpp.
2015-06-06 12:15:29 -04:00
asvitkine
48b838e1cc Merge pull request #71 from Masaq-/sheep_net
fixes for sheep_net kernel panic and memory leak
2015-05-28 00:53:42 -04:00
Masaq-
9ae8499d64 make sheep_net removable from Linux 2.6.31 onward 2015-05-28 02:10:59 +00:00
Masaq-
3a36a1e456 fix memory leak reported by kmemleak 2015-05-28 02:10:45 +00:00
Masaq-
d77100ae1f fix sheep_net Linux kernel panic on n2n edge0 tap device 2015-05-28 02:10:23 +00:00
asvitkine
eb3ef0bd01 Merge pull request #68 from pulkomandy/master
Fix BeOS build and add Haiku support.
2015-04-29 20:53:35 -04:00
Adrien Destugues
80cb8e0cff BeOS: null-terminate strings when converting file names. 2015-04-28 21:35:14 +02:00
Adrien Destugues
fd49455eec BeOS: get video to work again.
* The code was hardwired for 8-bit mode, unplug that and set it up for
32bit mode (much simpler).
* You need a ROM that supports 32bit mode for now
* Mode switching not supported yet.
2015-04-28 21:35:13 +02:00
Adrien Destugues
c226da6172 BeOS: support for vmdir preferences. 2015-04-28 21:35:13 +02:00
Adrien Destugues
c97be8dbb2 BeOS: implement charset conversion. 2015-04-28 21:35:12 +02:00
Adrien Destugues
83f03d417a BeOS: stray backslash in about_window.cpp 2015-04-28 21:35:12 +02:00
Adrien Destugues
371d385c6b Missing include for memset. 2015-04-28 21:35:11 +02:00
Adrien Destugues
09638b2536 BeOS: set some required defines for FPU configuration. 2015-04-28 21:35:11 +02:00
Adrien Destugues
66f68a995a BeOS: WIP update to video mode switching support code. 2015-04-28 21:35:04 +02:00
Adrien Destugues
2adcbc2694 Haiku: Set -fomit-frame-pointer and -fno-PIC
* This frees some registers and make the x86 assembler code work.
* Restore use of fpu_x86 because of this.
2015-04-28 21:11:29 +02:00
Adrien Destugues
2ad0536d13 Add Haiku support.
* Haiku is mostly compatible with BeOS, but there are a few minor
changes.
2015-04-28 21:11:28 +02:00
asvitkine
6e06a22dd5 Merge pull request #59 from atmaxinger/master
Allow the user to specify wether a Volume shall be treated as CDROM
2015-04-27 00:09:44 -04:00
asvitkine
c2b519ee1e Merge pull request #60 from rickyzhang82/sheep-net-bug-fix
Make sheep_net driver work with newer versions of the Linux kernel.
2014-09-19 22:21:58 -04:00
Ricky Zhang
5192d60805
Fix space/tab indention 2014-09-19 09:59:23 -04:00
Maximilian Irlinger
85c81e3848 Remove all tab line indents from VMSettingsController.mm 2014-09-19 07:28:21 +02:00
Maximilian Irlinger
72c79d1a6d Simplify some code, style changes 2014-09-19 07:19:42 +02:00
Maximilian Irlinger
4ee413bc35 Identation fixes 2014-09-19 07:19:11 +02:00
Ricky Zhang
39be6a0ac9
Use atomic operation 2014-09-18 16:10:41 -04:00
Ricky Zhang
b5b415da0d
Apply patch for 3.15 kernel 2014-09-18 11:38:06 -04:00
Maximilian Irlinger
aea2b09d47 Identation & bracket position changes 2014-09-15 07:37:49 +02:00
Maximilian Irlinger
50787359a5 Fix some more identation 2014-09-15 07:35:53 +02:00
Maximilian Irlinger
6cdb38e234 Fix some identation 2014-09-15 07:33:03 +02:00
Maximilian Irlinger
2721c8b694 Change position of if bracket 2014-09-15 07:31:53 +02:00
Maximilian Irlinger
71932affc8 One more style change 2014-09-15 07:27:40 +02:00
Maximilian Irlinger
b29e53229d Fix tabs in VMSettingsController.h 2014-09-15 07:11:45 +02:00
atmaxinger
df35760137 Some coding style changes 2014-09-15 07:09:09 +02:00
asvitkine
70ac4e94e3 Merge pull request #53 from vasi/gui-objects
Change GUI object extension, so GCC doesn't think we're Go
2014-03-06 00:26:01 -05:00
Dave Vasilevsky
4dd7f9236f Change GUI object extension, so GCC doesn't think we're Go 2014-03-05 20:11:55 -05:00
Maximilian Irlinger
fd62819e49 User can now specify wether the selected disk image is a CDROM (required for some games e.g. Diablo 2) 2014-03-02 14:32:57 +01:00
Alexei Svitkine
a3abfdc041 Fix building Obj-C code with SDK >= 10.6. 2014-01-05 10:16:51 -05:00
Alexei Svitkine
86c50b78fe update sheepthreads.c to work with newer PPC Linux distros
Patch by "Kernigh" posted on emaculation.com forums.
2013-11-05 22:39:34 -05:00
Alexei Svitkine
43779be775 Merge branch 'master' of https://github.com/cebix/macemu 2013-08-12 18:48:57 -04:00
Alexei Svitkine
56db3ed482 add xcode build instructions doc, based on my original email to
the basilisk list
2013-08-12 18:48:34 -04:00
asvitkine
0a010b8447 Merge pull request #46 from vasi/launcher-add-bundle
Mac: Allow selecting bundles in the disk prefs
2013-08-11 10:10:15 -07:00
Dave Vasilevsky
3914fd4a20 Mac: Allow selecting bundles in the disk prefs
Users should be able to select sparsebundles in the disk prefs, but should
still be able to navigate inside .sheepvm bundles.

See https://github.com/cebix/macemu/pull/25#issuecomment-15900806
2013-08-10 22:11:22 -04:00
asvitkine
44c7e447a7 Merge pull request #35 from dsumorok/buildfix
Buildfix
2013-06-02 22:32:57 -07:00
asvitkine
18a3f58dc5 Merge pull request #40 from vasi/freebsd
FreeBSD/amd64
2013-05-30 21:44:37 -07:00
Dave Vasilevsky
e3710843b1 FreeBSD amd64 fixups
* Look for CPU named "amd64" as well as "x86_64"
* Don't use /dev/ptmx on FreeBSD
* On amd64 FreeBSD uses SIGSEGV, not SIGBUS
* Use MAP_FIXED to force allocations within 32-bits, it's the only way
* Need <sys/param.h> for SHMLBA
* The old offsetof() fix is no longer needed
* Preliminary work on instruction skipping
2013-05-30 21:34:30 -04:00