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
Iván Fernández
e27c724b52
Added the new SheepShaver icon by Weedy Weed Smoker
2013-06-19 18:07:16 +02: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
1bc3691805
Removed clean rule for etherslavetool.
2013-05-05 14:18:10 -04:00
Dan Sumorok
93effd9192
Darwin/lowmem and Darwin/pagezero do not need to be removed for clean.
2013-05-01 06:55:49 -04:00
Dan Sumorok
a421d35b9d
Fix for OS X build under x-windows. Separated out sound option.
2013-04-30 20:41:50 -04:00
asvitkine
0231906d6d
Merge pull request #31 from vasi/toggle-fullscreen
...
SDL: Allow toggling fullscreen/windowed mode
2013-04-24 17:30:51 -07:00
Dave Vasilevsky
26d5f6b7f2
SDL: Allow fullscreen toggle in BasiliskII
2013-04-24 04:13:14 -04:00
Dave Vasilevsky
eceafc6200
SDL: Allow toggling fullscreen/windowed mode
2013-04-24 04:13:07 -04:00
Dave Vasilevsky
efae88ea7c
SDL: Let video driver know about cursor type change
2013-04-24 04:12:06 -04:00
Dave Vasilevsky
ff423fe7c9
SDL: Let driver_base be reused in a different video mode
...
Split init() into one-time initialization, and adaptation to a new video mode.
2013-04-24 04:09:47 -04:00
Dave Vasilevsky
e9c913c4ae
SDL: Completely collapse fullscreen/window drivers
2013-04-24 03:30:52 -04:00
Dave Vasilevsky
9e807c884c
SDL: Move init() method into base
2013-04-24 03:30:52 -04:00
Dave Vasilevsky
19529cacd4
SDL: Remove useless virtual qualifiers
2013-04-24 03:30:52 -04:00
Dave Vasilevsky
14e6e654f0
SDL: Move mouse movement to base
2013-04-24 03:30:52 -04:00
Dave Vasilevsky
d0648a7039
SDL: Make VOSF update functions apply to driver_base
...
They don't use anything special from fullscreen/windowed derived classes.
Also, get rid of unneeded friend declarations.
2013-04-24 03:30:51 -04:00
Dave Vasilevsky
2a5100e8d2
SDL: Move destruction into base
2013-04-24 03:30:51 -04:00
Dave Vasilevsky
fed95369d1
SDL: Move window title setting to base
2013-04-24 03:30:51 -04:00
Dave Vasilevsky
b2e5125868
SDL: Move cursor initialization to base
...
Also decide in just one place whether to use hardware or software cursor.
2013-04-24 03:29:53 -04:00
Dave Vasilevsky
6eb54dccbe
SDL: Move more initialization to base
...
Including blitter, gray ramp, frame buffer initialization.
2013-04-24 00:07:50 -04:00
Dave Vasilevsky
053308e4f9
SDL: Move VOSF initialization to base
2013-04-24 00:07:50 -04:00
Dave Vasilevsky
0c2658f4d1
SDL: Prepare to collapse fullscreen/window drivers
...
We want to have just one base driver that can handle both fullscreen and
windowed mode, so that we can easily switch between modes.
Create a virtual init() method to do construction, so we can move common code
from the derived classes into the base init().
2013-04-24 00:07:49 -04:00
Dave Vasilevsky
82adeb988b
SDL: Remove unused method and ivars
...
mouse_last_x, mouse_last_y and driver_window::mouse_moved() look like remnants
of X11 video, they're never really used.
2013-04-24 00:07:49 -04:00
Dave Vasilevsky
94ebea3509
SDL: Don't uselessly free the_host_buffer
...
It always points to a member of an SDL_Surface, which is freed by SDL.
2013-04-24 00:07:43 -04:00
Dave Vasilevsky
c0d7aa0004
SDL: Remove old hack, reduce flicker
...
The old SDL_QuitSubsystem workaround is probably obsolete, and causes
flicker on resolution changes.
2013-04-24 00:04:49 -04:00
Dave Vasilevsky
02d844c6a7
SDL: Make non-Mac fullscreen cursor visible
...
Issue: https://github.com/cebix/macemu/issues/26
On non-Mac platforms, driver_fullscreen constructor sets up software cursor,
but switch_to_current_mode() ask for a hardware cursor, possibly due to a typo.
Neither one ends up being drawn, so the cursor goes invisible.
This change makes them agree to use a software cursor. We should eventually
move to just one place deciding which cursor to use, so they don't have to be
kept in sync.
2013-04-22 02:06:15 -04:00