Commit Graph

2630 Commits

Author SHA1 Message Date
Ricky Zhang
8e88e462ee
Fix code review issues.
Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
2020-06-28 18:42:14 -04:00
Ricky Zhang
e6cd178881
Point CI status to upstream-master branch.
Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
2020-06-28 10:29:52 -04:00
Ricky Zhang
1bfb0e94a3
Back out the hack from kanjitalk755
Remove the unused header.

Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
2020-06-27 12:13:51 -04:00
Ricky Zhang
9ef2f87adb
Add CI for SDL1 and SDL2.
Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
2020-06-27 00:17:25 -04:00
Ricky Zhang
dc8bb7e2a3
Back out the hack from kanjitalk755
- In 8 bit color game, the hack crashed the app.
- After backing out the hack, I can play 256 color game with displaycolordepth 8.
- By default, the displaycolordepth is 0.

Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
2020-06-25 16:56:40 -04:00
Ricky Zhang
d28599f49d
Backport MacOSX support.
- video_sdl2 for Mac OS X requires MacOSX update.

Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
2020-06-25 15:50:40 -04:00
Ricky Zhang
a46759990d
Backport SDL2 features from https://github.com/kanjitalk755/macemu
By default, without providing `with-sdl2` in configure it uses SDL1.
Users need to explicitly request SDL2.

Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
2020-06-25 15:28:41 -04:00
asvitkine
5cbf07e9f5
Merge pull request #201 from rickyzhang82/pr-revert-broken-commit
Revert "Merge pull request #190 from fragglet/patch-1"
2020-06-25 10:24:37 -04:00
Ricky Zhang
b0bdceac34 Revert "Merge pull request #190 from fragglet/patch-1"
This reverts commit a4a2c88ed7, reversing
changes made to 1918557e78.
2020-06-25 09:43:20 -04:00
asvitkine
b2d281e5ab
Merge pull request #200 from aviallon/patch-int-narrowing
Fix build fail under GCC 10
2020-06-20 13:48:03 -04:00
Antoine Viallon
f13f25db3e
Fix build fail under GCC 10
GCC fails to build because of -Wnarrowing
2020-06-20 19:19:49 +02:00
asvitkine
cbad6f95ea
Merge pull request #196 from b01t/fix_warnings
Fix compile time warning on enum compare
2020-05-05 17:50:41 -04:00
asvitkine
9a905723db
Merge pull request #198 from rillig/patch-1
src/Unix/Darwin/testlmem.sh: make code shorter
2020-05-05 17:50:15 -04:00
Roland Illig
8a4b84b9d7
src/Unix/Darwin/testlmem.sh: make code shorter
The old code used the `[[` shell keyword, which is only available in bash.
The interpreter in line 1 is `/bin/sh` though.
This confused my shell portability check in pkgsrc, since that check neither guesses the target platform from the filename, nor assumes that `/bin/sh` is actually bash, even though this may be true on macOS.

The change makes the code shorter with the well-known `${var:-default}` pattern.
Since `$1` is now only accessed when it is defined, this allows the program to have a `set -eu` at the top.
This in turn would make all the `&&` redundant since it applies automatic error checking.

The `{ ... } 1>&2` could also be replaced with a single `exec 1>&2` at the top.
2020-05-05 19:48:35 +02:00
asvitkine
7790aa7e0c
Merge pull request #195 from b01t/master
Add the strings from commit 00f02d9d0c
2020-04-12 20:06:18 -04:00
bolt
5670c82b0d Fix compile time warning on enum compare 2020-04-09 15:22:00 +02:00
bolt
c6e1af7ff4 Fix compile time warning on enum compare 2020-04-09 15:07:29 +02:00
bolt
767b97311b Add the strings from commit 00f02d9d0c to user_strings.h 2020-04-09 14:50:07 +02:00
asvitkine
a4a2c88ed7
Merge pull request #190 from fragglet/patch-1
configure: Enable /dev/ptmx for Linux, Darwin.
2020-03-15 19:04:20 -04:00
asvitkine
1918557e78
Merge pull request #192 from anabate123/patch-1
Added more Mac models to the ModelID string
2020-03-15 19:04:08 -04:00
anabate123
00f02d9d0c
Added more Mac models to the ModelID string 2020-03-14 18:59:27 -04:00
Simon Howard
507508b66d
configure: Enable /dev/ptmx for Linux, Darwin.
Both of these systems have /dev/ptmx for creating pseudoterminals.
OS X Leopard (10.5) added it in 2007, and Linux has had support for
it since v2.1 (1998).

This fixes a bug with pseudoterminal creation on Linux and macOS
where a new pseudoterminal cannot be created because the wrong
method is being used to find one.
2020-01-25 01:05:52 -05:00
asvitkine
01052ca89d
Merge pull request #181 from atsampson/scsifix
Remove obsolete sg.h workaround.
2019-04-05 01:12:49 -04:00
asvitkine
9a3bd0b258
Merge pull request #183 from phcoder/master
sigsegv.cpp: Add addr32 decode
2019-04-05 01:12:11 -04:00
Vladimir Serbinenko
6267af0315 sigsegv.cpp: Add addr32 decode
With this fix I can compile with ./configure --enable-addressing=direct,0x100000
and then I don't need to change vm.mmap_min_addr and hence without root
privileges
2019-03-21 15:13:53 +01:00
Adam Sampson
668c2ba107 Remove obsolete sg.h workaround.
This is no longer necessary as of glibc 2.2 (released in November 2000),
and it causes breakage when /usr/include/linux is installed using a
symlink-based system like stow.
2018-10-31 12:43:55 +00:00
asvitkine
143b0827dd
Merge pull request #180 from atsampson/vdefix
Make vdeplug support optional.
2018-10-31 08:40:58 -04:00
Adam Sampson
5d77f86575 Make vdeplug support optional.
Linking with -lvdeplug without checking whether it exists causes
failures from later configure tests; this makes it an optional
dependency in the same way as other libraries.
2018-10-31 12:36:35 +00:00
asvitkine
507813529e
Merge pull request #179 from MSharq/MSharq
added VDE functionality
2018-10-29 20:58:20 -04:00
MSharq
e583d05868 fixed vde_sock pointer 2018-10-29 21:14:25 +01:00
MSharq
242e8af3a7 fixed a bug 2018-10-29 15:44:53 +01:00
MSharq
2bc581d4f6 fixed indentation ether_unix 2018-10-28 19:42:04 +01:00
MSharq
cf406ec953 fixed indentation ether_unix 2018-10-28 19:40:08 +01:00
Christian Bauer
76c5a97efe Fix libreadline detection. 2018-10-28 13:28:06 +01:00
Christian Bauer
ddf1bcf094 Fix const-ness of main() parameters. 2018-10-27 22:48:58 +02:00
MSharq
0c622863cf fixed a bug 2018-10-23 15:37:09 +02:00
MSharq
30fdd103a2 changed vde switch to vde_switch in the usage function 2018-10-20 15:11:40 +02:00
MSharq
50c98de60f a few indentation fixes 2018-10-20 15:07:38 +02:00
MSharq
320fae37a4 printfs for the selected ethernet device 2018-10-20 11:37:07 +02:00
MSharq
e4332cc72a added the printf statement for all Ethernet devices 2018-10-20 11:18:08 +02:00
asvitkine
5f04c95b79
adding static to VDECONN
Co-Authored-By: MSharq <mdshrq7@gmail.com>
2018-10-20 09:59:57 +02:00
asvitkine
f7023246d9
Update BasiliskII/src/Unix/ether_unix.cpp
Co-Authored-By: MSharq <mdshrq7@gmail.com>
2018-10-20 09:49:42 +02:00
MSharq
90b65715ae added VDE functionality 2018-09-28 16:14:14 +02:00
asvitkine
2e302d60a3
Merge pull request #163 from atmaxinger/fix-devpollcdrom
Mac GUI: don't show /dev/poll/cdrom if it is configured as cdrom
2018-02-25 12:51:13 -05:00
atmaxinger
e791a1fdd6 fix identation 2018-02-25 17:44:08 +01:00
atmaxinger
4f14c44837 Fix formatting 2018-02-25 17:01:12 +01:00
atmaxinger
a2e163fea9 fix whitespaces 2018-02-22 23:08:57 +01:00
atmaxinger
f25821d067 Fix CD ROM entries appearing multiple times 2018-02-22 23:06:23 +01:00
atmaxinger
515746d584 Only remove item at index 2018-02-22 11:32:57 +01:00
atmaxinger
f2fcfffabb Always save the cdrom entries from /dev/ 2018-02-22 11:11:11 +01:00