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
Dan Sumorok
fcc1598086
Add no_pie linker flag for Mac OS X 10.6 and later.
2015-01-14 19:23:26 -05:00
Dan Sumorok
b8fb05fbd0
Minor build fixes
...
Removed OS X -no_pie linker flag
Fixed copy/paste error in ether helper help string
Added missing distclean targets.
2014-12-31 09:36:17 -05:00
Dan Sumorok
24005dc4ed
Merge remote-tracking branch 'us/master' into mergetest
2014-12-30 09:16:27 -05:00
Dan Sumorok
b1270264a1
Changed page zero size to 4 kB to fix problem on OS X 10.10.
2014-11-29 19:45:47 -05:00
Dan Sumorok
4f162dc6e3
Minor build fixes.
2014-11-29 19:25:31 -05: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
Dan Sumorok
3c6788fd26
Tweak of the linker commands.
2013-07-08 06:51:24 -04:00
Dan Sumorok
c01bd008db
Hack to load code below 4GB, and to make 32-bit vm allocates work.
2013-07-06 17:09:37 -04:00
Dan Sumorok
1c99d52b91
Added missing file.
2013-06-28 07:12:38 -04:00
Dan Sumorok
c4276955ba
Fixed some 64-bit releated problems on os x.
2013-06-28 07:11:52 -04:00
Dan Sumorok
45a34e2763
Merge branch 'master' into asc
2013-06-22 12:43:52 -04:00
Dan Sumorok
b609065bc4
Always start sound.
2013-06-22 12:43:41 -04:00
Dan Sumorok
3583b00a77
Copy etherhelpertool into application bundle.
...
Ignore -psn_ command line argument so OS X application bundle
can be launched.
2013-06-21 18:59:04 -04:00
Dan Sumorok
e08090095f
Fixed compile error when asc emu is not enabled.
2013-06-19 19:09:40 -04:00
Iván Fernández
e27c724b52
Added the new SheepShaver icon by Weedy Weed Smoker
2013-06-19 18:07:16 +02:00
Dan Sumorok
9aec39d3cb
Added extra ifdefs.
2013-06-18 07:02:42 -04:00
Dan Sumorok
b7cfe89445
More asc fixes.
2013-06-15 16:21:26 -04:00
Dan Sumorok
ce68f366cb
Added asc.c, and asc.h.
...
Don't stop sound if we don't have to.
2013-06-09 19:34:19 -04:00
Dan Sumorok
eedf6880db
A bit of apple sound chip support.
2013-06-09 16:27:24 -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
Dan Sumorok
8a02128473
More changes of etherslave to etherhelper.
2013-05-29 19:42:59 -04:00
Dan Sumorok
5db556214c
Renamed "etherslave" to "etherhelper".
2013-05-29 19:30:51 -04:00
Dan Sumorok
fc8835aa6f
Added more debug output.
...
No longer add ethernet interface to bridge if bridge already exists.
2013-05-29 07:00:44 -04:00
Dan Sumorok
8f863effbc
Added error messages.
2013-05-28 19:33:12 -04:00
Dan Sumorok
5aa782acc0
Changed ethernet address when using tap interface.
2013-05-27 13:55:38 -04:00
