Build fixes for deprecated X11 variant

This commit is contained in:
Aaron Culliney 2014-10-30 00:11:17 -07:00
parent 5af194c56d
commit 65f991ebcc
2 changed files with 8 additions and 10 deletions

View File

@ -1,8 +1,6 @@
dnl ---------------------------------------------------------------------------
AC_DEFINE(PACKAGE_URL, "https://github.com/mauiaaron/apple2", [apple2ix project URL])
AC_DEFINE(WEB_RESOURCES, "ftp://ftp.apple.asimov.net", [Apple II Web Resources])
AC_DEFINE(PACKAGE_MANPAGE, "man apple2ix", [manpage info])
AC_PREREQ([2.69])
AC_INIT([apple2ix], [0.8])

View File

@ -413,9 +413,9 @@ static void c_flash_cursor(int on) {
colormap[ COLOR_FLASHING_BLACK].green = 0;
colormap[ COLOR_FLASHING_BLACK].blue = 0;
colormap[ COLOR_FLASHING_WHITE].red = 0xffff;
colormap[ COLOR_FLASHING_WHITE].green = 0xffff;
colormap[ COLOR_FLASHING_WHITE].blue = 0xffff;
colormap[ COLOR_FLASHING_WHITE].red = (uint8_t)0xffff;
colormap[ COLOR_FLASHING_WHITE].green = (uint8_t)0xffff;
colormap[ COLOR_FLASHING_WHITE].blue = (uint8_t)0xffff;
}
else
{
@ -423,9 +423,9 @@ static void c_flash_cursor(int on) {
colormap[ COLOR_FLASHING_WHITE].green = 0;
colormap[ COLOR_FLASHING_WHITE].blue = 0;
colormap[ COLOR_FLASHING_BLACK].red = 0xffff;
colormap[ COLOR_FLASHING_BLACK].green = 0xffff;
colormap[ COLOR_FLASHING_BLACK].blue = 0xffff;
colormap[ COLOR_FLASHING_BLACK].red = (uint8_t)0xffff;
colormap[ COLOR_FLASHING_BLACK].green = (uint8_t)0xffff;
colormap[ COLOR_FLASHING_BLACK].blue = (uint8_t)0xffff;
}
}
}
@ -534,8 +534,8 @@ static void parseArgs() {
#endif
if (strstr(argv[i], "--help") || strstr(argv[i], "-h")) {
printf("%s v%s emulator help :\n", PACKAGE_NAME, PACKAGE_VERSION);
printf("\tManpage : %s\n", PACKAGE_MANPAGE);
printf("\tWeb Resources : %s\n", WEB_RESOURCES);
printf("\tPress F10 for main menu\n");
printf("\tPress F1 and F2 to insert disk images\n");
exit(0);
} else if (strstr(argv[i], "--version") || strstr(argv[i], "-v")) {
printf("%s v%s\n", PACKAGE_NAME, PACKAGE_VERSION);