Commit Graph

1106 Commits

Author SHA1 Message Date
atmaxinger
4ba1c48ec8 Always write /dev/poll/cdrom to preferences 2018-02-22 10:36:36 +01:00
atmaxinger
85bcff03d4 Block all CDROMs in /dev/ 2018-02-21 16:24:20 +01:00
atmaxinger
787661f80f Always save the default entry "cdrom /dev/poll/cdrom" 2018-02-21 15:24:29 +01:00
atmaxinger
3931036d87
Fix whitespace 2018-02-20 12:39:59 +01:00
atmaxinger
581ce7d971 Mac GUI: don't show /dev/poll/cdrom if it is configured as cdrom 2018-02-20 11:54:55 +01:00
jvernet
ea626e216d icns 2018-01-02 17:01:45 +01:00
Alexei Svitkine
8a6a9db6d5 Fix SDL support message in configure based on detection logic. 2017-12-10 11:27:23 -05:00
Alexei Svitkine
b150b42fc6 Fix some string conversion warnings. 2017-12-10 11:27:08 -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
Alexei Svitkine
bc7edbc677 move STR_WINDOW_TITLE_GRABBED to user_strings.h and fix header
guard for user_strings_unix.h
2017-12-10 11:26:26 -05:00
kanjitalk755
f96c92ad51 SheepShaver/src/slirp/* copied from jvernet/macemu 2017-12-09 21:24:46 +09:00
kanjitalk755
87ddeb520b delete symlink SheepShaver/src/slirp 2017-12-09 21:23:54 +09:00
kanjitalk755
aa24dbc3df revert BasiliskII/src/slirp/* 2017-12-09 21:10:30 +09:00
kanjitalk755
e42b6a50c3 revert SDL 2017-12-05 23:49:59 +09:00
kanjitalk755
ae88e28ed7 delete SDL/* to revert 2017-12-05 23:46:02 +09:00
kanjitalk755
ce426edbc4 revert adb.cpp (symlink) 2017-12-05 11:18:35 +09:00
kanjitalk755
73a0dc21a7 delete adb.cpp to revert 2017-12-05 11:17:32 +09:00
kanjitalk755
86ad0c8ef4 copied video_sdl.cpp from cebix/macemu 2017-12-04 23:06:25 +09:00
kanjitalk755
5c4466b841 fix #1 2017-12-04 22:43:51 +09:00
kanjitalk755
616fb5808c JIT code patch tool 2017-12-04 21:25:52 +09:00
kanjitalk755
6eaa8cb232 separate JIT code, macOS and others 2017-12-04 20:38:21 +09:00
kanjitalk755
42353c9698 improve stability 2017-11-27 23:55:12 +09:00
kanjitalk755
4fa3294118 boot stability after forced termination 2017-11-27 22:35:17 +09:00
kanjitalk755
03d2502cc6 fixed: localtime() may return NULL 2017-11-26 16:22:52 +09:00
Alexei Svitkine
7378a62032 Set Xcode to use tabs. 2017-11-25 10:27:00 -05:00
kanjitalk755
7e28b437c4 improve launch stability 2017-11-25 03:17:06 +09:00
kanjitalk755
aaeb0dd5eb revert vm_protect of ROM area 2017-11-24 21:40:06 +09:00
kanjitalk755
0903a3adfd offset error fixed 2017-11-24 21:07:07 +09:00
kanjitalk755
f170a527b2 64-bit JIT 2017-11-22 11:27:42 +09:00
kanjitalk755
164935017b sigsegv copy from BasiliskII 2017-11-22 10:13:46 +09:00
kanjitalk755
956aebe9b3 delete symlink 2017-11-22 09:26:56 +09:00
kanjitalk755
056dc36070 revert BasiliskII, change only SheepShaver 2017-11-18 13:08:30 +09:00
kanjitalk755
e7c041c0d5 delete symbolic links 2017-11-18 12:46:22 +09:00
kanjitalk755
5065fb9d95 64-bit build for 10.10+ 2017-11-17 21:43:36 +09:00
asvitkine
e07640979e
Merge pull request #42 from ifernandez/master
Added the new SheepShaver icon by Weedy Weed Smoker
2017-11-01 19:56:22 -04:00
Alexei Svitkine
e60c1aa1d7 fix ss build on newer osx 2017-10-11 21:17:14 -04:00
jvernet
b904304e89 Try to fix build error on SheepShaver XCode Project 2017-10-09 22:19:16 +02: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
jvernet
b2f4de5a89 SheepShaver Pref Editor Udate 2017-10-05 22:20:15 +02:00
David Ludwig
449936e461 SheepShaver: added --sdlrender option, when on Unix 2017-09-10 15:19:50 +00:00
David Ludwig
83096e1ca7 SheepShaver: added --with-sdl1 to configure script 2017-09-10 10:48:56 -04:00
David Ludwig
8940880794 make build scripts reference both video_sdl.cpp and video_sdl2.cpp 2017-09-04 12:44:34 -04:00
David Ludwig
bcd784d7c4 SheepShaver: make Autotools use SDL2 2017-09-01 18:48:40 -04:00
David Ludwig
eb36b34106 Sheepshaver: misc, runtime fixes on OSX hosts 2017-08-25 17:19:36 -04:00
David Ludwig
e55df3de96 build SheepShaver against SDL2, when using its Xcode 8 project file 2017-08-25 17:01:31 -04:00
asvitkine
c6e04efa11 Merge pull request #122 from coderforlife/fix-107
Fixes #107 by automatically using the precompiled opcodes when approp…
2017-08-18 19:49:47 -04:00
Jeffrey Bush
dee8ed76ab Fixing bincue support when compiling --with-bincue and --enable-standalone-gui in both SheepSaver and BasiliskII by adding bincue_unix.o to list of objects compiled with the GUI application and adjusting the libs slightly (note that having extra libs listed should't neagtively effect anything). Without these changes those command line arguments cannot both be used. 2017-08-18 17:52:58 -04:00
Jeffrey Bush
b14bcdcf91 Fixes #107 by automatically using the precompiled opcodes when appropiate. 2017-08-18 17:38:34 -04:00
Alexei Svitkine
79ec72e0cb Remove -lclip from xcode8 project. 2017-03-31 01:08:44 -04:00
Andrew Tonner
3a742ae3f2 python build script: symlink m4 dir before autogen that requires it 2017-01-22 23:26:36 -08:00
Andrew Tonner
2e7771a4ae python build script: put showing environment after the GTK install so we can double check the paths 2017-01-22 23:01:08 -08:00
Andrew Tonner
2f8c7f441c python build script: set ACLOCAL_PATH for gtk 2017-01-22 22:15:29 -08:00
Andrew Tonner
519276d788 python build script: added gtk donwload/install 2017-01-22 21:11:01 -08:00
Andrew Tonner
fcfa19ca27 python build scripts: URLs cleanup 2017-01-22 21:10:22 -08:00
Andrew Tonner
b8b7b96a1c put build tools first in the path rather than last 2017-01-22 21:10:07 -08:00
Andrew Tonner
c4c61cec64 python build script: adding sed and grep I'm using from msys to packages list 2017-01-22 18:48:39 -08:00
Andrew Tonner
f2238fe3e7 python build script: option to use a specific mingw path 2017-01-22 17:48:56 -08:00
Andrew Tonner
e3fe441709 python build script: build arg for passing --build to configure scripts 2017-01-22 16:49:23 -08:00
Andrew Tonner
8548644595 don't show "Will install to" output if that is disabled 2017-01-22 16:28:32 -08:00
Andrew Tonner
7c01c27e02 python build script: option to add an additional PATH entry with highest priority for building 2017-01-22 16:08:03 -08:00
Andrew Tonner
bab9a35ff2 python build script: fix for top Makefile changes 2017-01-22 15:25:02 -08:00
Andrew Tonner
4326182b02 python build script: fix for fresh install 2017-01-22 15:08:33 -08:00
Andrew Tonner
cc0c168685 when making links, if the link already exists as a directory, remove the directory first 2017-01-22 15:07:47 -08:00
Andrew Tonner
4715db8f28 top level script should make sure directories it wants to put symlinks in exist 2017-01-22 00:58:09 -08:00
Andrew Tonner
fa9b425541 python build script: remove old config.status before rebuilding 2017-01-20 13:27:25 -08:00
Andrew Tonner
bdd2ee1190 python build script: do make clean if we reconfigured 2017-01-19 21:38:37 -08:00
Andrew Tonner
69a3c31fff Add configure option to disable VOSF; add it to python build script 2017-01-19 21:38:21 -08:00
Andrew Tonner
1229eb0ea9 if the originals for any symlinked dirs (which are just copies under msys/mingw) have been updated, delete the copies and make links again 2017-01-19 21:14:46 -08:00
Andrew Tonner
d8f5d43a9c python build script: when getting modified time for a directory, also check contents' times 2017-01-19 05:13:01 -08:00
Andrew Tonner
21a6d39d4b python build script: jit option 2017-01-19 05:12:03 -08:00
Andrew Tonner
dae89116e7 python build script: option to copy the supplied precompiled dyngen output files instead of running dyngen 2017-01-18 21:11:21 -08:00
Andrew Tonner
1af0c4685a python build script: give a better error message when there is a syntax error in the JSON cache file 2017-01-18 19:57:34 -08:00
Andrew Tonner
9efd46d396 build script pep-8 2017-01-18 19:31:27 -08:00
Andrew Tonner
bd3fecc780 build script cleanup & renames & updating TODOs; cleanup gitignore 2017-01-18 19:29:13 -08:00
Andrew Tonner
e303e314f5 use explicit __thiscall calling convention for member function casts on mingw32 2017-01-18 19:11:19 -08:00
Andrew Tonner
ffd6294943 build script comments & todos & cleanup 2017-01-18 19:01:49 -08:00
Andrew Tonner
7ef9f10712 don't undef __STRICT_ANSI__ since it's not necessary with gnu++11 2017-01-18 19:00:42 -08:00
Andrew Tonner
83ea8b0779 Merge remote-tracking branch 'cebix/master' into windows_build_script_test_merge 2017-01-18 16:49:19 -08:00
Andrew Tonner
b90b67971c fpclassify return type may vary 2017-01-18 16:01:52 -08:00
Andrew Tonner
aabd23408d option to run a shell command 2017-01-18 15:02:20 -08:00
Andrew Tonner
17b977b6ad fix silly name of inline bswap 16 2017-01-18 14:48:02 -08:00
Andrew Tonner
e0783e5c20 add option to copy sheepshaver exe after build 2017-01-18 14:47:21 -08:00
Andrew Tonner
fa8c87acff add LDFLAGS for static libgcc and stdc++ so we don't need dlls for those 2017-01-18 14:46:55 -08:00
Andrew Tonner
0ffa196f29 remove PASCAL undef 2017-01-18 14:44:33 -08:00
Andrew Tonner
daac4f58ec reverse serial_windows.cpp symlink removal 2017-01-18 04:52:19 -08:00
Andrew Tonner
b74ae092c9 builds on mingw32 without jit, still untested 2017-01-18 04:41:40 -08:00
Brian Recchia
43df07e706 Update XcodeBuildHowTo.txt
removed dungeons from project
2017-01-16 16:00:36 -05:00
Alexei Svitkine
181634ab31 Fix more Xcode8 warnings and tweak project settings. 2016-12-17 23:31:03 -05:00
Alexei Svitkine
4fffae7ff8 Fold clip into sheepshaver target in Xcode8. 2016-12-17 22:59:22 -05:00
Alexei Svitkine
3985c6afdc Make some Xcode8 project settings consistent. 2016-12-17 22:52:59 -05:00
Alexei Svitkine
d19e757e1c Fix some more Xcode8 warnings & analyze warnings. 2016-12-17 22:24:00 -05:00
Alexei Svitkine
1f211fb37b fix some warnings in Xcode8 build 2016-12-17 22:04:57 -05:00
Alexei Svitkine
5538376dc8 Add an Xcode 8 project for SheepShaver that builds an x86 32-bit
application (since 64-bit doesn't work with current OS X) and uses
pre-built (by GCC) compiler JIT source files.
2016-12-17 21:38:25 -05: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
Dave Vasilevsky
f64b888f78 Make dyngen_barrier() stronger on x86
GCC 5 will optimize out an empty 'asm volatile' in op_sraw_T0_T1, and then give us multiple return points. Add a nop so it doesn't do this, at the cost of lower code density.
2015-12-28 23:28:17 -05:00
Dave Vasilevsky
c91ef547bd Allow building with GCC 5
* Disable -freorder-blocks-and-partition, since it can override -fno-reorder-blocks
* Disable look-header copying, since it tends to cause early returns
* Disable argument pushing, we don't want to change esp
2015-12-28 23:26:19 -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
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
asvitkine
7e111f6fc5 Merge pull request #73 from Masaq-/macipx
Patch to make MacIPX work in SheepShaver
2015-08-09 18:14:18 -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
Masaq-
9fb6b134ec build ethernet ndrv with CodeWarrior Pro 6.3 2015-06-12 01:28:02 +00:00
Masaq-
5321720764 enable raw mode for Ethernet ndrv driver 2015-06-12 01:27:50 +00:00
Masaq-
c465aaec9c enable raw mode for Ethernet stub driver 2015-06-12 01:27:32 +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
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
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
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
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
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
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
Dave Vasilevsky
47ec992f6d Make the standalone GUI build on Linux again 2013-04-05 17:30:23 -04:00
Dave Vasilevsky
d23a421a49 Work even if TRUE is undefined 2013-03-27 03:38:59 -04:00
Hans de Goede
d6416e2d07 don't strip SS when installing 2013-03-12 19:05:07 -04:00
Hans de Goede
469dce168d fix whitespace issue in configure.ac 2013-03-12 19:02:33 -04:00
Alexei Svitkine
9f5d67497d update xcode project for sparsebundle support 2013-03-12 18:50:44 -04:00
Dave Vasilevsky
b05e0ba074 sparsebundle: Fix spacing in Makefile 2013-03-11 17:16:32 -04:00
Dave Vasilevsky
9f77458b75 Fix spacing 2013-03-03 17:05:02 -05:00
Dave Vasilevsky
17aabc4c40 Generify vhd, too 2013-02-24 15:57:18 -05:00
Dave Vasilevsky
917984e6ec Add to make links 2013-02-24 14:15:21 -05:00
Dave Vasilevsky
2a15911938 Full sparsebundle implementation 2013-02-24 14:11:29 -05:00
Dave Vasilevsky
091db05aac Partial implementation of sparsebundles; still needs Info.plist parsing 2013-02-24 13:02:16 -05:00
Alexei Svitkine
407edc8bfd Cleanup shm cleanup code. 2012-09-02 11:29:16 -04:00
Alexei Svitkine
77862b2103 Update version in version.h too. 2012-07-07 21:25:44 -04:00
Alexei Svitkine
3ddc4ff65d Make version number show up in Finder's get info and update Xcode project. 2012-07-07 14:08:38 -04:00
Alexei Svitkine
6d5a8230e6 Bump SheepShaver version to 2.4. 2012-07-07 11:51:31 -04:00
Alexei Svitkine
f32285ca47 Update SheepShaver xcode project for pict.c/pict.h addition 2012-07-07 11:39:56 -04:00
Alexei Svitkine
ea862c2bea Include pict.c and pict.h in 'make links'. 2012-07-07 11:33:57 -04:00
Charles
6f2635ee31 More clipboard-related fixes for Basilisk / SheepShaver
This patch fixes one lingering problem with the 64-bit clipboard code; the way it was designed, the Mac clipboard was being cleared every time a single item was being requested by GetScrap, causing clipboards with multiple items to be unceremoniously whittled down to one. On the other hand, a similar issue was causing some items to get duplicated on the host pasteboard. This patch fixes the issue by making conversion between the host pasteboard and the Mac clipboard a singular operation; when the pasteboard data changes on the host side, it is all converted and sent to the Mac pasteboard at once, and similarly, all Mac clipboard data is sent to the host pasteboard in one operation. Also, data from the host side is copied to the Mac clipboard only if it has changed since the last check, which should improve performance as conversions will not be done over and over every time the Mac side checks whether the scrap has changed.

In addition, I've added a rudimentary PICT converter. It's rudimentary at the moment, only going in one direction, converting to PICT and not from PICT, and currently it always rasterizes the source image and creates a PICT containing bitmap data. However, it's a start, and it should solve Ronald's issue with copying images from OS X to Mac OS. In the future, more could possibly be added. I've put the new PICT code in the main source directory instead of in the MacOSX subdirectory, so that it can be used by other platforms if needed.

I would like to leave the license on the new PICT code as "Public Domain" if that is okay.

Thanks,
Charles
2012-07-07 11:30:21 -04:00