Commit Graph

2564 Commits

Author SHA1 Message Date
asvitkine
3bcb0d4556
Merge pull request #156 from dcoshea/issue-152
Fix link error due to missing X11 libraries (fixes #152).
2017-12-28 13:29:58 -05:00
David O'Shea
3f2dbbac29 Fix link error due to missing X11 libraries (fixes #152).
c18d6fa removed a space from BasiliskII/src/Unix/configure.ac, which
caused "configure" to fail to properly determine the correct set of
libraries to link against when using X11, which caused linking to
fail.  This fix restores the missing space.
2017-12-28 22:42:51 +10:30
Alexei Svitkine
1c9b21f580 Fix JIT support on macOS. This was broken by a copy-paste error
in b5820d8059.
2017-12-15 16:42:49 -05:00
Alexei Svitkine
1669960afd Merge branch 'master' of https://github.com/cebix/macemu 2017-12-10 11:28:05 -05:00
Alexei Svitkine
b0c859031a Merge branch 'master' of https://github.com/cebix/macemu 2017-12-10 11:28:00 -05:00
Alexei Svitkine
c161ca5b8b clean up disabled / non-working modes out of video_macosx.mm/.h 2017-12-10 11:28:00 -05:00
Alexei Svitkine
3b77a377c2 fix colors in b2 video_macosx.mm code 2017-12-10 11:28:00 -05:00
Alexei Svitkine
e1c0a08957 clean up some code 2017-12-10 11:28:00 -05:00
Alexei Svitkine
e29cc81dbf clean up some code 2017-12-10 11:27:59 -05:00
Alexei Svitkine
d17ef870f7 Fix SDL support message in configure based on detection logic. 2017-12-10 11:27:59 -05:00
Alexei Svitkine
cd60ce9421 remove stray non-ascii chars at start of mon_cmd.cpp 2017-12-10 11:27:59 -05:00
Alexei Svitkine
3ac2640c79 Make Basilisk's configure.ac's SDL detection logic match SS's. 2017-12-10 11:27:59 -05:00
Alexei Svitkine
c41b849ecf clean up disabled / non-working modes out of video_macosx.mm/.h 2017-12-10 11:27:56 -05:00
Alexei Svitkine
ba0ed857d7 fix colors in b2 video_macosx.mm code 2017-12-10 11:27:48 -05:00
Alexei Svitkine
364cf2085e clean up some code 2017-12-10 11:27:43 -05:00
Alexei Svitkine
bb2a197c98 clean up some code 2017-12-10 11:27:32 -05:00
Alexei Svitkine
8a6a9db6d5 Fix SDL support message in configure based on detection logic. 2017-12-10 11:27:23 -05:00
Alexei Svitkine
89e4234975 remove stray non-ascii chars at start of mon_cmd.cpp 2017-12-10 11:27:16 -05:00
Alexei Svitkine
0e8e0b51b7 Make Basilisk's configure.ac's SDL detection logic match SS's. 2017-12-10 11:27:12 -05:00
Alexei Svitkine
c18d6fa923 fix configure X check to not trigger if using mac gui and some
more warning fixes
2017-12-10 11:27:08 -05:00
Alexei Svitkine
a472d9ab63 fix some format warnings 2017-12-10 11:27:08 -05:00
Alexei Svitkine
75324c10d0 silence some more warnings 2017-12-10 11:27:08 -05:00
Alexei Svitkine
b150b42fc6 Fix some string conversion warnings. 2017-12-10 11:27:08 -05:00
Alexei Svitkine
1503c84266 Merge branch 'master' of https://github.com/cebix/macemu 2017-12-10 11:27:08 -05:00
asvitkine
a1a48c1479 Merge pull request #145 from zydeco/master
fix for extfs on 64-bit macOS/iOS
2017-12-10 11:27:07 -05:00
Jesús A. Álvarez
e44a75d7eb fix indentation 2017-12-10 11:27:07 -05:00
Jesús A. Álvarez
db72f9142e fix for extfs on 64-bit macOS/iOS 2017-12-10 11:27:07 -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
Alexei Svitkine
0ec153e733 Merge branch 'master' of https://github.com/cebix/macemu 2017-12-10 11:21:02 -05:00
Alexei Svitkine
d693c8d6c8 clean up disabled / non-working modes out of video_macosx.mm/.h 2017-12-10 11:20:39 -05:00
Alexei Svitkine
34624eee4b fix colors in b2 video_macosx.mm code 2017-12-10 11:20:35 -05:00
Alexei Svitkine
af642edc16 clean up some code 2017-12-10 11:20:27 -05:00
Alexei Svitkine
93d6a4527e clean up some code 2017-12-10 11:20:23 -05:00
Alexei Svitkine
f99fc0ec71 Fix SDL support message in configure based on detection logic. 2017-12-10 11:20:17 -05:00
Alexei Svitkine
f22a1eecef remove stray non-ascii chars at start of mon_cmd.cpp 2017-12-10 11:20:11 -05:00
Alexei Svitkine
e42a40f832 Make Basilisk's configure.ac's SDL detection logic match SS's. 2017-12-10 11:19:53 -05:00
Alexei Svitkine
182a7aeadb clean up disabled / non-working modes out of video_macosx.mm/.h 2017-12-03 15:59:14 -05:00
Alexei Svitkine
a78c76f762 fix colors in b2 video_macosx.mm code 2017-12-03 15:44:31 -05:00
Alexei Svitkine
eab9d9029f clean up some code 2017-12-03 15:39:51 -05:00
Alexei Svitkine
c0200eede4 clean up some code 2017-12-03 15:32:04 -05:00
Alexei Svitkine
ee5b726d73 Fix SDL support message in configure based on detection logic. 2017-12-03 14:54:50 -05:00
Alexei Svitkine
dc65a48d32 remove stray non-ascii chars at start of mon_cmd.cpp 2017-12-03 13:43:03 -05:00
Alexei Svitkine
d77e529ce9 Make Basilisk's configure.ac's SDL detection logic match SS's. 2017-12-02 15:34:18 -05:00
Alexei Svitkine
404c5f1fd6 fix configure X check to not trigger if using mac gui and some
more warning fixes
2017-12-02 13:27:14 -05:00
Alexei Svitkine
fc082509a6 fix some format warnings 2017-12-02 12:39:30 -05:00
Alexei Svitkine
fc0d7dcdde silence some more warnings 2017-12-02 12:27:27 -05:00
Alexei Svitkine
57131adacc Fix some string conversion warnings. 2017-12-02 12:21:13 -05:00
Alexei Svitkine
87cfc1639a Merge branch 'master' of https://github.com/cebix/macemu 2017-12-02 11:36:45 -05:00
Alexei Svitkine
c9717bf331 Fix window redraw on macOS when un-minimizing. 2017-12-02 11:35:23 -05:00