vice-emu-commit Mailing List for VICE (Page 1058)
Versatile Commodore Emulator
Brought to you by:
blackystardust,
gpz
Menu
▾
▴
vice-emu-commit — Commit notifications for the source server
You can subscribe to this list here.
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
(38) |
May
(60) |
Jun
(122) |
Jul
(148) |
Aug
(178) |
Sep
(151) |
Oct
(131) |
Nov
(208) |
Dec
(129) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2009 |
Jan
(193) |
Feb
(209) |
Mar
(221) |
Apr
(243) |
May
(165) |
Jun
(168) |
Jul
(198) |
Aug
(161) |
Sep
(103) |
Oct
(98) |
Nov
(168) |
Dec
(99) |
| 2010 |
Jan
(263) |
Feb
(156) |
Mar
(57) |
Apr
(93) |
May
(85) |
Jun
(124) |
Jul
(57) |
Aug
(58) |
Sep
(113) |
Oct
(148) |
Nov
(114) |
Dec
(193) |
| 2011 |
Jan
(200) |
Feb
(207) |
Mar
(91) |
Apr
(91) |
May
(142) |
Jun
(104) |
Jul
(115) |
Aug
(137) |
Sep
(266) |
Oct
(91) |
Nov
(85) |
Dec
(186) |
| 2012 |
Jan
(98) |
Feb
(146) |
Mar
(160) |
Apr
(99) |
May
(59) |
Jun
(257) |
Jul
(84) |
Aug
(103) |
Sep
(169) |
Oct
(206) |
Nov
(90) |
Dec
(296) |
| 2013 |
Jan
(294) |
Feb
(130) |
Mar
(36) |
Apr
(14) |
May
(51) |
Jun
(74) |
Jul
(180) |
Aug
(85) |
Sep
(26) |
Oct
(45) |
Nov
(29) |
Dec
(21) |
| 2014 |
Jan
(56) |
Feb
(40) |
Mar
(57) |
Apr
(30) |
May
(31) |
Jun
(11) |
Jul
(107) |
Aug
(135) |
Sep
(142) |
Oct
(195) |
Nov
(139) |
Dec
(133) |
| 2015 |
Jan
(293) |
Feb
(161) |
Mar
(146) |
Apr
(85) |
May
(139) |
Jun
(51) |
Jul
(21) |
Aug
(24) |
Sep
(29) |
Oct
(136) |
Nov
(212) |
Dec
(118) |
| 2016 |
Jan
(119) |
Feb
(165) |
Mar
(229) |
Apr
(219) |
May
(134) |
Jun
(119) |
Jul
(134) |
Aug
(236) |
Sep
(203) |
Oct
(215) |
Nov
(300) |
Dec
(140) |
| 2017 |
Jan
(188) |
Feb
(20) |
Mar
(147) |
Apr
(198) |
May
(26) |
Jun
(21) |
Jul
(67) |
Aug
(219) |
Sep
(209) |
Oct
(194) |
Nov
(144) |
Dec
(99) |
| 2018 |
Jan
(139) |
Feb
(122) |
Mar
(116) |
Apr
(85) |
May
(232) |
Jun
(181) |
Jul
(190) |
Aug
(105) |
Sep
(92) |
Oct
(178) |
Nov
(105) |
Dec
(86) |
| 2019 |
Jan
(119) |
Feb
(79) |
Mar
(74) |
Apr
(117) |
May
(115) |
Jun
(307) |
Jul
(107) |
Aug
(131) |
Sep
(103) |
Oct
(60) |
Nov
(118) |
Dec
(70) |
| 2020 |
Jan
(114) |
Feb
(103) |
Mar
(77) |
Apr
(121) |
May
(193) |
Jun
(110) |
Jul
(214) |
Aug
(210) |
Sep
(179) |
Oct
(260) |
Nov
(237) |
Dec
(334) |
| 2021 |
Jan
(163) |
Feb
(186) |
Mar
(58) |
Apr
(81) |
May
(108) |
Jun
(175) |
Jul
(154) |
Aug
(180) |
Sep
(217) |
Oct
(204) |
Nov
(232) |
Dec
(190) |
| 2022 |
Jan
(253) |
Feb
(134) |
Mar
(229) |
Apr
(190) |
May
(125) |
Jun
(70) |
Jul
(8) |
Aug
(22) |
Sep
(19) |
Oct
(33) |
Nov
(94) |
Dec
(164) |
| 2023 |
Jan
(158) |
Feb
(366) |
Mar
(272) |
Apr
(109) |
May
(198) |
Jun
(226) |
Jul
(200) |
Aug
(94) |
Sep
(108) |
Oct
(62) |
Nov
(175) |
Dec
(116) |
| 2024 |
Jan
(35) |
Feb
(40) |
Mar
(51) |
Apr
(89) |
May
(24) |
Jun
(26) |
Jul
(53) |
Aug
(71) |
Sep
(23) |
Oct
(11) |
Nov
(22) |
Dec
(58) |
| 2025 |
Jan
(26) |
Feb
(40) |
Mar
(107) |
Apr
(39) |
May
(35) |
Jun
(20) |
Jul
(11) |
Aug
(24) |
Sep
(35) |
Oct
(28) |
Nov
(14) |
Dec
|
|
From: <fa...@us...> - 2008-07-22 13:12:09
|
Revision: 19070
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=19070&view=rev
Author: fabbo
Date: 2008-07-22 13:12:16 +0000 (Tue, 22 Jul 2008)
Log Message:
-----------
Remove resources that are not used anymore
Modified Paths:
--------------
branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/uijoystick.c
Modified: branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/uijoystick.c
===================================================================
--- branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/uijoystick.c 2008-07-22 05:53:17 UTC (rev 19069)
+++ branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/uijoystick.c 2008-07-22 13:12:16 UTC (rev 19070)
@@ -298,36 +298,7 @@
SendMessage(joy_hwnd, CB_SETCURSEL, (WPARAM)res_value,0);
joy1 = device = res_value;
- joy_hwnd = GetDlgItem(hwnd, IDC_JOY_FIRE1_BUTTON);
- SendMessage(joy_hwnd, CB_ADDSTRING, 0,
- (LPARAM)translate_text(IDS_ALL_BUTTONS_AS_FIRE));
- /*joystick_ui_get_autofire_buttons(joy_hwnd, device);*/
- resources_get_int("JoyFire1Button", &res_value);
- SendMessage(joy_hwnd, CB_SETCURSEL, (WPARAM)res_value, 0);
- resources_get_int("JoyAutofire1Speed", &res_value);
- SetDlgItemInt(hwnd, IDC_JOY_FIRE1_SPEED, res_value, FALSE);
- joy_hwnd = GetDlgItem(hwnd, IDC_JOY_FIRE1_AXIS);
- SendMessage(joy_hwnd, CB_ADDSTRING, 0,
- (LPARAM)translate_text(IDS_NUMERIC_SEE_ABOVE));
- /*joystick_ui_get_autofire_axes(joy_hwnd, device);*/
- resources_get_int("JoyAutofire1Axis", &res_value);
- SendMessage(joy_hwnd, CB_SETCURSEL, (WPARAM)res_value, 0);
- joy_hwnd = GetDlgItem(hwnd, IDC_JOY_AUTOFIRE1_BUTTON);
- SendMessage(joy_hwnd, CB_ADDSTRING, 0,
- (LPARAM)translate_text(IDS_NO_BUTTON_NO_AUTOFIRE));
- /*joystick_ui_get_autofire_buttons(joy_hwnd, device);*/
- resources_get_int("JoyAutofire1Button", &res_value);
- SendMessage(joy_hwnd, CB_SETCURSEL, (WPARAM)res_value, 0);
- EnableWindow(GetDlgItem(hwnd, IDC_JOY_FIRE1_BUTTON),
- (device >= JOYDEV_HW_BASE));
- EnableWindow(GetDlgItem(hwnd, IDC_JOY_FIRE1_SPEED),
- (device >= JOYDEV_HW_BASE) && (res_value == 0));
- EnableWindow(GetDlgItem(hwnd, IDC_JOY_FIRE1_AXIS),
- (device >= JOYDEV_HW_BASE));
- EnableWindow(GetDlgItem(hwnd, IDC_JOY_AUTOFIRE1_BUTTON),
- (device >= JOYDEV_HW_BASE));
-
joy_hwnd = GetDlgItem(hwnd,IDC_JOY_DEV2);
SendMessage(joy_hwnd, CB_ADDSTRING, 0,
(LPARAM)intl_translate_text_new(IDS_NONE));
@@ -342,111 +313,9 @@
SendMessage(joy_hwnd, CB_SETCURSEL, (WPARAM)res_value,0);
joy2 = device = res_value;
- joy_hwnd = GetDlgItem(hwnd, IDC_JOY_FIRE2_BUTTON);
- SendMessage(joy_hwnd, CB_ADDSTRING, 0,
- (LPARAM)translate_text(IDS_ALL_BUTTONS_AS_FIRE));
- /*joystick_ui_get_autofire_buttons(joy_hwnd, device);*/
- resources_get_int("JoyFire2Button", &res_value);
- SendMessage(joy_hwnd, CB_SETCURSEL, (WPARAM)res_value, 0);
-
- resources_get_int("JoyAutofire2Speed", &res_value);
- SetDlgItemInt(hwnd, IDC_JOY_FIRE2_SPEED, res_value, FALSE);
- joy_hwnd = GetDlgItem(hwnd, IDC_JOY_FIRE2_AXIS);
- SendMessage(joy_hwnd, CB_ADDSTRING, 0,
- (LPARAM)translate_text(IDS_NUMERIC_SEE_ABOVE));
- /*joystick_ui_get_autofire_axes(joy_hwnd, device);*/
- resources_get_int("JoyAutofire2Axis", &res_value);
- SendMessage(joy_hwnd, CB_SETCURSEL, (WPARAM)res_value, 0);
- joy_hwnd = GetDlgItem(hwnd, IDC_JOY_AUTOFIRE2_BUTTON);
- SendMessage(joy_hwnd, CB_ADDSTRING, 0,
- (LPARAM)translate_text(IDS_NO_BUTTON_NO_AUTOFIRE));
- /*joystick_ui_get_autofire_buttons(joy_hwnd, device);*/
- resources_get_int("JoyAutofire2Button", &res_value);
- SendMessage(joy_hwnd, CB_SETCURSEL, (WPARAM)res_value, 0);
- EnableWindow(GetDlgItem(hwnd, IDC_JOY_FIRE2_BUTTON),
- (device >= JOYDEV_HW_BASE));
- EnableWindow(GetDlgItem(hwnd, IDC_JOY_FIRE2_SPEED),
- (device >= JOYDEV_HW_BASE) && (res_value == 0));
- EnableWindow(GetDlgItem(hwnd, IDC_JOY_FIRE2_AXIS),
- (device >= JOYDEV_HW_BASE));
- EnableWindow(GetDlgItem(hwnd, IDC_JOY_AUTOFIRE2_BUTTON),
- (device >= JOYDEV_HW_BASE));
-
EnableWindow(GetDlgItem(hwnd, IDC_JOY_CALIBRATE), 1);
}
-static void rebuild_axis_list_1(HWND hwnd, int device)
-{
- HWND joy_hwnd;
- int res_value;
-
- SendDlgItemMessage(hwnd, IDC_JOY_FIRE1_AXIS, CB_RESETCONTENT, 0, 0);
- joy_hwnd = GetDlgItem(hwnd, IDC_JOY_FIRE1_AXIS);
- SendMessage(joy_hwnd, CB_ADDSTRING, 0,
- (LPARAM)translate_text(IDS_NUMERIC_SEE_ABOVE));
- /*joystick_ui_get_autofire_axes(joy_hwnd, device);*/
- resources_get_int("JoyAutofire1Axis", &res_value);
- SendMessage(joy_hwnd, CB_SETCURSEL, (WPARAM)res_value, 0);
-}
-
-static void rebuild_axis_list_2(HWND hwnd, int device)
-{
- HWND joy_hwnd;
- int res_value;
-
- SendDlgItemMessage(hwnd, IDC_JOY_FIRE2_AXIS, CB_RESETCONTENT, 0, 0);
- joy_hwnd = GetDlgItem(hwnd, IDC_JOY_FIRE2_AXIS);
- SendMessage(joy_hwnd, CB_ADDSTRING, 0,
- (LPARAM)translate_text(IDS_NUMERIC_SEE_ABOVE));
- /*joystick_ui_get_autofire_axes(joy_hwnd, device);*/
- resources_get_int("JoyAutofire2Axis", &res_value);
- SendMessage(joy_hwnd, CB_SETCURSEL, (WPARAM)res_value, 0);
-}
-
-static void rebuild_button_list_1(HWND hwnd, int device)
-{
- HWND joy_hwnd;
- int res_value;
-
- SendDlgItemMessage(hwnd, IDC_JOY_FIRE1_BUTTON, CB_RESETCONTENT, 0, 0);
- joy_hwnd = GetDlgItem(hwnd, IDC_JOY_FIRE1_BUTTON);
- SendMessage(joy_hwnd, CB_ADDSTRING, 0,
- (LPARAM)translate_text(IDS_ALL_BUTTONS_AS_FIRE));
- /*joystick_ui_get_autofire_buttons(joy_hwnd, device);*/
- resources_get_int("JoyFire1Button", &res_value);
- SendMessage(joy_hwnd, CB_SETCURSEL, (WPARAM)res_value, 0);
-
- SendDlgItemMessage(hwnd, IDC_JOY_AUTOFIRE1_BUTTON, CB_RESETCONTENT, 0, 0);
- joy_hwnd = GetDlgItem(hwnd, IDC_JOY_AUTOFIRE1_BUTTON);
- SendMessage(joy_hwnd, CB_ADDSTRING, 0,
- (LPARAM)translate_text(IDS_NO_BUTTON_NO_AUTOFIRE));
- /*joystick_ui_get_autofire_buttons(joy_hwnd, device);*/
- resources_get_int("JoyAutofire1Button", &res_value);
- SendMessage(joy_hwnd, CB_SETCURSEL, (WPARAM)res_value, 0);
-}
-
-static void rebuild_button_list_2(HWND hwnd, int device)
-{
- HWND joy_hwnd;
- int res_value;
-
- SendDlgItemMessage(hwnd, IDC_JOY_FIRE2_BUTTON, CB_RESETCONTENT, 0, 0);
- joy_hwnd = GetDlgItem(hwnd, IDC_JOY_FIRE2_BUTTON);
- SendMessage(joy_hwnd, CB_ADDSTRING, 0,
- (LPARAM)translate_text(IDS_ALL_BUTTONS_AS_FIRE));
- /*joystick_ui_get_autofire_buttons(joy_hwnd, device);*/
- resources_get_int("JoyFire2Button", &res_value);
- SendMessage(joy_hwnd, CB_SETCURSEL, (WPARAM)res_value, 0);
-
- SendDlgItemMessage(hwnd, IDC_JOY_AUTOFIRE2_BUTTON, CB_RESETCONTENT, 0, 0);
- joy_hwnd = GetDlgItem(hwnd, IDC_JOY_AUTOFIRE2_BUTTON);
- SendMessage(joy_hwnd, CB_ADDSTRING, 0,
- (LPARAM)translate_text(IDS_NO_BUTTON_NO_AUTOFIRE));
- /*joystick_ui_get_autofire_buttons(joy_hwnd, device);*/
- resources_get_int("JoyAutofire2Button", &res_value);
- SendMessage(joy_hwnd, CB_SETCURSEL, (WPARAM)res_value, 0);
-}
-
static BOOL CALLBACK dialog_proc(HWND hwnd, UINT msg, WPARAM wparam,
LPARAM lparam)
{
@@ -478,19 +347,6 @@
IDC_JOY_DEV1), CB_GETCURSEL, 0, 0));
res_value = SendDlgItemMessage(hwnd, IDC_JOY_DEV1,
CB_GETCURSEL, 0, 0);
- if (res_value >= JOYDEV_HW_BASE) {
- rebuild_axis_list_1(hwnd, res_value);
- rebuild_button_list_1(hwnd, res_value);
- }
- axis = SendDlgItemMessage(hwnd,IDC_JOY_FIRE1_AXIS,CB_GETCURSEL,0,0);
- EnableWindow(GetDlgItem(hwnd, IDC_JOY_FIRE1_BUTTON),
- (res_value >= JOYDEV_HW_BASE));
- EnableWindow(GetDlgItem(hwnd, IDC_JOY_FIRE1_SPEED),
- (res_value >= JOYDEV_HW_BASE) && (axis == 0));
- EnableWindow(GetDlgItem(hwnd, IDC_JOY_FIRE1_AXIS),
- (res_value >= JOYDEV_HW_BASE));
- EnableWindow(GetDlgItem(hwnd, IDC_JOY_AUTOFIRE1_BUTTON),
- (res_value >= JOYDEV_HW_BASE));
}
return TRUE;
case IDC_JOY_DEV2:
@@ -500,57 +356,8 @@
IDC_JOY_DEV2), CB_GETCURSEL, 0, 0));
res_value = SendDlgItemMessage(hwnd, IDC_JOY_DEV2,
CB_GETCURSEL, 0, 0);
- if (res_value >= JOYDEV_HW_BASE) {
- rebuild_axis_list_2(hwnd, res_value);
- rebuild_button_list_2(hwnd, res_value);
- }
- axis = SendDlgItemMessage(hwnd, IDC_JOY_FIRE2_AXIS, CB_GETCURSEL, 0, 0);
- EnableWindow(GetDlgItem(hwnd, IDC_JOY_FIRE2_BUTTON),
- (res_value >= JOYDEV_HW_BASE));
- EnableWindow(GetDlgItem(hwnd, IDC_JOY_FIRE2_SPEED),
- (res_value >= JOYDEV_HW_BASE) && (axis == 0));
- EnableWindow(GetDlgItem(hwnd, IDC_JOY_FIRE2_AXIS),
- (res_value >= JOYDEV_HW_BASE));
- EnableWindow(GetDlgItem(hwnd, IDC_JOY_AUTOFIRE2_BUTTON),
- (res_value >= JOYDEV_HW_BASE));
}
return TRUE;
- case IDC_JOY_FIRE1_AXIS:
- if (HIWORD(wparam) == CBN_SELCHANGE) {
- res_value = SendDlgItemMessage(hwnd, IDC_JOY_FIRE1_AXIS,
- CB_GETCURSEL, 0, 0);
- EnableWindow(GetDlgItem(hwnd, IDC_JOY_FIRE1_SPEED),
- (res_value == 0));
- }
- return TRUE;
- case IDC_JOY_FIRE1_SPEED:
- if (HIWORD(wparam) == EN_KILLFOCUS) {
- res_value = GetDlgItemInt(hwnd, IDC_JOY_FIRE1_SPEED,NULL,
- FALSE);
- if (res_value > 32)
- SetDlgItemInt(hwnd, IDC_JOY_FIRE1_SPEED, 32, FALSE);
- if (res_value < 1)
- SetDlgItemInt(hwnd, IDC_JOY_FIRE1_SPEED, 1, FALSE);
- }
- return TRUE;
- case IDC_JOY_FIRE2_AXIS:
- if (HIWORD(wparam) == CBN_SELCHANGE) {
- res_value = SendDlgItemMessage(hwnd, IDC_JOY_FIRE2_AXIS,
- CB_GETCURSEL, 0, 0);
- EnableWindow(GetDlgItem(hwnd, IDC_JOY_FIRE2_SPEED),
- (res_value == 0));
- }
- return TRUE;
- case IDC_JOY_FIRE2_SPEED:
- if (HIWORD(wparam) == EN_KILLFOCUS) {
- res_value = GetDlgItemInt(hwnd, IDC_JOY_FIRE2_SPEED, NULL,
- FALSE);
- if (res_value > 32)
- SetDlgItemInt(hwnd, IDC_JOY_FIRE2_SPEED, 32, FALSE);
- if (res_value < 1)
- SetDlgItemInt(hwnd, IDC_JOY_FIRE2_SPEED, 1, FALSE);
- }
- return TRUE;
case IDOK:
resources_set_int("JoyDevice1",
(int)SendMessage(GetDlgItem(hwnd,
@@ -558,30 +365,6 @@
resources_set_int("JoyDevice2",
(int)SendMessage(GetDlgItem(hwnd,
IDC_JOY_DEV2), CB_GETCURSEL, 0, 0));
- resources_set_int("JoyFire1Button",
- (int)SendMessage(GetDlgItem(hwnd,
- IDC_JOY_FIRE1_BUTTON), CB_GETCURSEL, 0, 0));
- resources_set_int("JoyAutofire1Speed",
- (int)GetDlgItemInt(hwnd,
- IDC_JOY_FIRE1_SPEED, NULL, FALSE));
- resources_set_int("JoyAutofire1Axis",
- (int)SendMessage(GetDlgItem(hwnd,
- IDC_JOY_FIRE1_AXIS), CB_GETCURSEL, 0, 0));
- resources_set_int("JoyAutofire1Button",
- (int)SendMessage(GetDlgItem(hwnd,
- IDC_JOY_AUTOFIRE1_BUTTON), CB_GETCURSEL, 0, 0));
- resources_set_int("JoyFire2Button",
- (int)SendMessage(GetDlgItem(hwnd,
- IDC_JOY_FIRE2_BUTTON), CB_GETCURSEL, 0, 0));
- resources_set_int("JoyAutofire2Speed",
- (int)GetDlgItemInt(hwnd,
- IDC_JOY_FIRE2_SPEED, NULL, FALSE));
- resources_set_int("JoyAutofire2Axis",
- (int)SendMessage(GetDlgItem(hwnd,
- IDC_JOY_FIRE2_AXIS), CB_GETCURSEL, 0, 0));
- resources_set_int("JoyAutofire2Button",
- (int)SendMessage(GetDlgItem(hwnd,
- IDC_JOY_AUTOFIRE2_BUTTON), CB_GETCURSEL, 0, 0));
EndDialog(hwnd,0);
return TRUE;
case IDCANCEL:
@@ -610,63 +393,4 @@
resources_get_int("JoyDevice2", &device2);
resources_set_int("JoyDevice1", device2);
resources_set_int("JoyDevice2", device1);
- resources_get_int("JoyFire1Button", &device1);
- resources_get_int("JoyFire2Button", &device2);
- resources_set_int("JoyFire1Button", device2);
- resources_set_int("JoyFire2Button", device1);
- resources_get_int("JoyAutofire1Speed", &device1);
- resources_get_int("JoyAutofire2Speed", &device2);
- resources_set_int("JoyAutofire1Speed", device2);
- resources_set_int("JoyAutofire2Speed", device1);
- resources_get_int("JoyAutofire1Axis", &device1);
- resources_get_int("JoyAutofire2Axis", &device2);
- resources_set_int("JoyAutofire1Axis", device2);
- resources_set_int("JoyAutofire2Axis", device1);
- resources_get_int("JoyAutofire1Button", &device1);
- resources_get_int("JoyAutofire2Button", &device2);
- resources_set_int("JoyAutofire1Button", device2);
- resources_set_int("JoyAutofire2Button", device1);
-
-/* swapping the keyset definitions when swapping the joysticks is
- improper bahaviour in my opinion, if needed a swap keyset can be
- made later, for now the keyset swapping is commented out. */
-
-#if 0
- resources_get_int("KeySet1NorthWest", &device1);
- resources_get_int("KeySet2NorthWest", &device2);
- resources_set_int("KeySet1NorthWest", device2);
- resources_set_int("KeySet2NorthWest", device1);
- resources_get_int("KeySet1North", &device1);
- resources_get_int("KeySet2North", &device2);
- resources_set_int("KeySet1North", device2);
- resources_set_int("KeySet2North", device1);
- resources_get_int("KeySet1NorthEast", device1);
- resources_get_int("KeySet2NorthEast", device2);
- resources_set_int("KeySet1NorthEast", device2);
- resources_set_int("KeySet2NorthEast", device1);
- resources_get_int("KeySet1East", &device1);
- resources_get_int("KeySet2East", &device2);
- resources_set_int("KeySet1East", device2);
- resources_set_int("KeySet2East", device1);
- resources_get_int("KeySet1SouthEast", &device1);
- resources_get_int("KeySet2SouthEast", &device2);
- resources_set_int("KeySet1SouthEast", device2);
- resources_set_int("KeySet2SouthEast", device1);
- resources_get_int("KeySet1South", &device1);
- resources_get_int("KeySet2South", &device2);
- resources_set_int("KeySet1South", device2);
- resources_set_int("KeySet2South", device1);
- resources_get_int("KeySet1SouthWest", &device1);
- resources_get_int("KeySet2SouthWest", &device2);
- resources_set_int("KeySet1SouthWest", device2);
- resources_set_int("KeySet2SouthWest", device1);
- resources_get_int("KeySet1West", &device1);
- resources_get_int("KeySet2West", &device2);
- resources_set_int("KeySet1West", device2);
- resources_set_int("KeySet2West", device1);
- resources_get_int("KeySet1Fire", &device1);
- resources_get_int("KeySet2Fire", &device2);
- resources_set_int("KeySet1Fire", device2);
- resources_set_int("KeySet2Fire", device1);
-#endif
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bla...@us...> - 2008-07-22 05:53:09
|
Revision: 19069
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=19069&view=rev
Author: blackystardust
Date: 2008-07-22 05:53:17 +0000 (Tue, 22 Jul 2008)
Log Message:
-----------
Fixed alot of msvc warnings.
Modified Paths:
--------------
branches/viceplus/v2.0-x64dtv/vice/src/6510core.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/c64dtvui.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/make-msvc-bindist.bat
branches/viceplus/v2.0-x64dtv/vice/src/c64dtv/c64dtvblitter.c
branches/viceplus/v2.0-x64dtv/vice/src/c64dtv/c64dtvcpu.c
branches/viceplus/v2.0-x64dtv/vice/src/c64dtv/c64dtvdma.c
branches/viceplus/v2.0-x64dtv/vice/src/c64dtv/c64dtvmem.c
branches/viceplus/v2.0-x64dtv/vice/src/vicii/vicii-mem.c
Modified: branches/viceplus/v2.0-x64dtv/vice/src/6510core.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/6510core.c 2008-07-21 21:37:42 UTC (rev 19068)
+++ branches/viceplus/v2.0-x64dtv/vice/src/6510core.c 2008-07-22 05:53:17 UTC (rev 19069)
@@ -583,20 +583,20 @@
INC_PC(pc_inc); \
} while (0)
-#define ANC(value, pc_inc) \
- do { \
- reg_a_write = reg_a_read & (value); \
- LOCAL_SET_NZ(reg_a_read); \
- LOCAL_SET_CARRY(LOCAL_SIGN()); \
- INC_PC(pc_inc); \
+#define ANC(value, pc_inc) \
+ do { \
+ reg_a_write = (BYTE)(reg_a_read & (value)); \
+ LOCAL_SET_NZ(reg_a_read); \
+ LOCAL_SET_CARRY(LOCAL_SIGN()); \
+ INC_PC(pc_inc); \
} while (0)
-#define AND(value, clk_inc, pc_inc) \
- do { \
- reg_a_write = reg_a_read & (value); \
- LOCAL_SET_NZ(reg_a_read); \
- CLK_ADD(CLK, (clk_inc)); \
- INC_PC(pc_inc); \
+#define AND(value, clk_inc, pc_inc) \
+ do { \
+ reg_a_write = (BYTE)(reg_a_read & (value)); \
+ LOCAL_SET_NZ(reg_a_read); \
+ CLK_ADD(CLK, (clk_inc)); \
+ INC_PC(pc_inc); \
} while (0)
#define ANE(value, pc_inc) \
@@ -857,12 +857,12 @@
INC_PC(1); \
} while (0)
-#define EOR(value, clk_inc, pc_inc) \
- do { \
- reg_a_write = reg_a_read ^ (value); \
- LOCAL_SET_NZ(reg_a_read); \
- CLK_ADD(CLK, (clk_inc)); \
- INC_PC(pc_inc); \
+#define EOR(value, clk_inc, pc_inc) \
+ do { \
+ reg_a_write = (BYTE)(reg_a_read ^ (value)); \
+ LOCAL_SET_NZ(reg_a_read); \
+ CLK_ADD(CLK, (clk_inc)); \
+ INC_PC(pc_inc); \
} while (0)
#define INC(addr, clk_inc, pc_inc, load_func, store_func) \
@@ -1026,12 +1026,12 @@
INC_PC(pc_inc); \
} while (0)
-#define ORA(value, clk_inc, pc_inc) \
- do { \
- reg_a_write = reg_a_read | (value); \
- LOCAL_SET_NZ(reg_a_write); \
- CLK_ADD(CLK, (clk_inc)); \
- INC_PC(pc_inc); \
+#define ORA(value, clk_inc, pc_inc) \
+ do { \
+ reg_a_write = (BYTE)(reg_a_read | (value)); \
+ LOCAL_SET_NZ(reg_a_write); \
+ CLK_ADD(CLK, (clk_inc)); \
+ INC_PC(pc_inc); \
} while (0)
#define NOOP(clk_inc, pc_inc) \
Modified: branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/c64dtvui.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/c64dtvui.c 2008-07-21 21:37:42 UTC (rev 19068)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/c64dtvui.c 2008-07-22 05:53:17 UTC (rev 19069)
@@ -1,162 +1,163 @@
-/*
- * c64ui.c - C64-specific user interface.
- *
- * Written by
- * Andreas Boose <vic...@t-...>
- * Ettore Perazzoli <et...@co...>
- * Tibor Biczo <cr...@ax...>
- *
- * This file is part of VICE, the Versatile Commodore Emulator.
- * See README for copyright notice.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA.
- *
- */
-
-#include "vice.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <windows.h>
-
-#include "c64ui.h"
-#include "res.h"
-#include "translate.h"
-#include "ui.h"
-#include "uic64dtv.h"
-#include "uidrivec64.h"
-#include "uikeyboard.h"
-#include "uirom.h"
-#include "uirs232user.h"
-#include "uisid.h"
-#include "uivicii.h"
-#include "uivideo.h"
-
-static const unsigned int romset_dialog_resources[UIROM_TYPE_MAX] = {
- IDD_C64ROM_RESOURCE_DIALOG,
- IDD_C64ROMDRIVE_RESOURCE_DIALOG,
- 0 };
-
-
-static const ui_menu_toggle_t c64dtv_ui_menu_toggles[] = {
- { "EmuID", IDM_TOGGLE_EMUID },
- { "VICIIDoubleSize", IDM_TOGGLE_DOUBLESIZE },
- { "VICIIDoubleScan", IDM_TOGGLE_DOUBLESCAN },
- { "VICIIScale2x", IDM_TOGGLE_SCALE2X },
- { "PALEmulation", IDM_TOGGLE_FASTPAL },
- { "VICIIVideoCache", IDM_TOGGLE_VIDEOCACHE },
- { "PS2Mouse", IDM_PS2MOUSE },
- { "Mouse", IDM_MOUSE },
- { "FlashTrueFS", IDM_TOGGLE_FLASH_TRUE_FILESYSTEM },
- { NULL, 0 }
-};
-
-static const uirom_settings_t uirom_settings[] = {
- { UIROM_TYPE_MAIN, TEXT("Kernal"), "KernalName",
- IDC_C64ROM_KERNAL_FILE, IDC_C64ROM_KERNAL_BROWSE,
- IDC_C64ROM_KERNAL_RESOURCE },
- { UIROM_TYPE_MAIN, TEXT("Basic"), "BasicName",
- IDC_C64ROM_BASIC_FILE, IDC_C64ROM_BASIC_BROWSE,
- IDC_C64ROM_BASIC_RESOURCE },
- { UIROM_TYPE_MAIN, TEXT("Character"), "ChargenName",
- IDC_C64ROM_CHARGEN_FILE, IDC_C64ROM_CHARGEN_BROWSE,
- IDC_C64ROM_CHARGEN_RESOURCE },
- { UIROM_TYPE_DRIVE, TEXT("1541"), "DosName1541",
- IDC_DRIVEROM_1541_FILE, IDC_DRIVEROM_1541_BROWSE,
- IDC_DRIVEROM_1541_RESOURCE },
- { UIROM_TYPE_DRIVE, TEXT("1541-II"), "DosName1541ii",
- IDC_DRIVEROM_1541II_FILE, IDC_DRIVEROM_1541II_BROWSE,
- IDC_DRIVEROM_1541II_RESOURCE },
- { UIROM_TYPE_DRIVE, TEXT("1570"), "DosName1570",
- IDC_DRIVEROM_1570_FILE, IDC_DRIVEROM_1570_BROWSE,
- IDC_DRIVEROM_1570_RESOURCE },
- { UIROM_TYPE_DRIVE, TEXT("1571"), "DosName1571",
- IDC_DRIVEROM_1571_FILE, IDC_DRIVEROM_1571_BROWSE,
- IDC_DRIVEROM_1571_RESOURCE },
- { UIROM_TYPE_DRIVE, TEXT("1581"), "DosName1581",
- IDC_DRIVEROM_1581_FILE, IDC_DRIVEROM_1581_BROWSE,
- IDC_DRIVEROM_1581_RESOURCE },
- { 0, NULL, NULL, 0, 0, 0 }
-};
-
-#define C64DTVUI_KBD_NUM_MAP 3
-
-static const uikeyboard_mapping_entry_t mapping_entry[C64DTVUI_KBD_NUM_MAP] = {
- { IDC_C64KBD_MAPPING_SELECT_SYM, IDC_C64KBD_MAPPING_SYM,
- IDC_C64KBD_MAPPING_SYM_BROWSE, "KeymapSymFile" },
- { IDC_C64KBD_MAPPING_SELECT_POS, IDC_C64KBD_MAPPING_POS,
- IDC_C64KBD_MAPPING_POS_BROWSE, "KeymapPosFile" },
- { IDC_C64KBD_MAPPING_SELECT_SYMDE, IDC_C64KBD_MAPPING_SYMDE,
- IDC_C64KBD_MAPPING_SYMDE_BROWSE, "KeymapSymDeFile" }
-};
-
-static uikeyboard_config_t uikeyboard_config =
- { IDD_C64KBD_MAPPING_SETTINGS_DIALOG, C64DTVUI_KBD_NUM_MAP, mapping_entry,
- IDC_C64KBD_MAPPING_DUMP };
-
-
-static void c64dtv_ui_specific(WPARAM wparam, HWND hwnd)
-{
- switch (wparam) {
- case IDM_VICII_SETTINGS:
- ui_vicii_settings_dialog(hwnd);
- break;
- case IDM_SID_SETTINGS:
- ui_sid_settings_dialog(hwnd);
- break;
- case IDM_ROM_SETTINGS:
- uirom_settings_dialog(hwnd, translate_res(IDD_C64ROM_SETTINGS_DIALOG),
- translate_res(IDD_C64DRIVEROM_SETTINGS_DIALOG),
- romset_dialog_resources, uirom_settings);
- break;
- case IDM_VIDEO_SETTINGS:
- ui_video_settings_dialog(hwnd, UI_VIDEO_CHIP_VICII, UI_VIDEO_CHIP_NONE);
- break;
- case IDM_DRIVE_SETTINGS:
- uidrivec64_settings_dialog(hwnd);
- break;
- case IDM_RS232USER_SETTINGS:
- ui_rs232user_settings_dialog(hwnd);
- break;
- case IDM_KEYBOARD_SETTINGS:
- uikeyboard_settings_dialog(hwnd, &uikeyboard_config);
- break;
- case IDM_ATTACH_DTV_FLASH:
- ui_c64dtv_attach_flash_dialog(hwnd);
- break;
- case IDM_DETACH_DTV_FLASH:
- resources_set_string("c64dtvromfilename", "");
- break;
- case IDM_CREATE_DTV_FLASH:
- ui_c64dtv_create_flash_dialog(hwnd);
- break;
- case IDM_C64DTV_SETTINGS:
- ui_c64dtv_settings_dialog(hwnd);
- break;
- }
-}
-
-int c64dtvui_init(void)
-{
- ui_register_machine_specific(c64dtv_ui_specific);
- ui_register_menu_toggles(c64dtv_ui_menu_toggles);
-
- return 0;
-}
-
-void c64dtvui_shutdown(void)
-{
-}
+/*
+ * c64ui.c - C64-specific user interface.
+ *
+ * Written by
+ * Andreas Boose <vic...@t-...>
+ * Ettore Perazzoli <et...@co...>
+ * Tibor Biczo <cr...@ax...>
+ *
+ * This file is part of VICE, the Versatile Commodore Emulator.
+ * See README for copyright notice.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ * 02111-1307 USA.
+ *
+ */
+
+#include "vice.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <windows.h>
+
+#include "c64ui.h"
+#include "res.h"
+#include "resources.h"
+#include "translate.h"
+#include "ui.h"
+#include "uic64dtv.h"
+#include "uidrivec64.h"
+#include "uikeyboard.h"
+#include "uirom.h"
+#include "uirs232user.h"
+#include "uisid.h"
+#include "uivicii.h"
+#include "uivideo.h"
+
+static const unsigned int romset_dialog_resources[UIROM_TYPE_MAX] = {
+ IDD_C64ROM_RESOURCE_DIALOG,
+ IDD_C64ROMDRIVE_RESOURCE_DIALOG,
+ 0 };
+
+
+static const ui_menu_toggle_t c64dtv_ui_menu_toggles[] = {
+ { "EmuID", IDM_TOGGLE_EMUID },
+ { "VICIIDoubleSize", IDM_TOGGLE_DOUBLESIZE },
+ { "VICIIDoubleScan", IDM_TOGGLE_DOUBLESCAN },
+ { "VICIIScale2x", IDM_TOGGLE_SCALE2X },
+ { "PALEmulation", IDM_TOGGLE_FASTPAL },
+ { "VICIIVideoCache", IDM_TOGGLE_VIDEOCACHE },
+ { "PS2Mouse", IDM_PS2MOUSE },
+ { "Mouse", IDM_MOUSE },
+ { "FlashTrueFS", IDM_TOGGLE_FLASH_TRUE_FILESYSTEM },
+ { NULL, 0 }
+};
+
+static const uirom_settings_t uirom_settings[] = {
+ { UIROM_TYPE_MAIN, TEXT("Kernal"), "KernalName",
+ IDC_C64ROM_KERNAL_FILE, IDC_C64ROM_KERNAL_BROWSE,
+ IDC_C64ROM_KERNAL_RESOURCE },
+ { UIROM_TYPE_MAIN, TEXT("Basic"), "BasicName",
+ IDC_C64ROM_BASIC_FILE, IDC_C64ROM_BASIC_BROWSE,
+ IDC_C64ROM_BASIC_RESOURCE },
+ { UIROM_TYPE_MAIN, TEXT("Character"), "ChargenName",
+ IDC_C64ROM_CHARGEN_FILE, IDC_C64ROM_CHARGEN_BROWSE,
+ IDC_C64ROM_CHARGEN_RESOURCE },
+ { UIROM_TYPE_DRIVE, TEXT("1541"), "DosName1541",
+ IDC_DRIVEROM_1541_FILE, IDC_DRIVEROM_1541_BROWSE,
+ IDC_DRIVEROM_1541_RESOURCE },
+ { UIROM_TYPE_DRIVE, TEXT("1541-II"), "DosName1541ii",
+ IDC_DRIVEROM_1541II_FILE, IDC_DRIVEROM_1541II_BROWSE,
+ IDC_DRIVEROM_1541II_RESOURCE },
+ { UIROM_TYPE_DRIVE, TEXT("1570"), "DosName1570",
+ IDC_DRIVEROM_1570_FILE, IDC_DRIVEROM_1570_BROWSE,
+ IDC_DRIVEROM_1570_RESOURCE },
+ { UIROM_TYPE_DRIVE, TEXT("1571"), "DosName1571",
+ IDC_DRIVEROM_1571_FILE, IDC_DRIVEROM_1571_BROWSE,
+ IDC_DRIVEROM_1571_RESOURCE },
+ { UIROM_TYPE_DRIVE, TEXT("1581"), "DosName1581",
+ IDC_DRIVEROM_1581_FILE, IDC_DRIVEROM_1581_BROWSE,
+ IDC_DRIVEROM_1581_RESOURCE },
+ { 0, NULL, NULL, 0, 0, 0 }
+};
+
+#define C64DTVUI_KBD_NUM_MAP 3
+
+static const uikeyboard_mapping_entry_t mapping_entry[C64DTVUI_KBD_NUM_MAP] = {
+ { IDC_C64KBD_MAPPING_SELECT_SYM, IDC_C64KBD_MAPPING_SYM,
+ IDC_C64KBD_MAPPING_SYM_BROWSE, "KeymapSymFile" },
+ { IDC_C64KBD_MAPPING_SELECT_POS, IDC_C64KBD_MAPPING_POS,
+ IDC_C64KBD_MAPPING_POS_BROWSE, "KeymapPosFile" },
+ { IDC_C64KBD_MAPPING_SELECT_SYMDE, IDC_C64KBD_MAPPING_SYMDE,
+ IDC_C64KBD_MAPPING_SYMDE_BROWSE, "KeymapSymDeFile" }
+};
+
+static uikeyboard_config_t uikeyboard_config =
+ { IDD_C64KBD_MAPPING_SETTINGS_DIALOG, C64DTVUI_KBD_NUM_MAP, mapping_entry,
+ IDC_C64KBD_MAPPING_DUMP };
+
+
+static void c64dtv_ui_specific(WPARAM wparam, HWND hwnd)
+{
+ switch (wparam) {
+ case IDM_VICII_SETTINGS:
+ ui_vicii_settings_dialog(hwnd);
+ break;
+ case IDM_SID_SETTINGS:
+ ui_sid_settings_dialog(hwnd);
+ break;
+ case IDM_ROM_SETTINGS:
+ uirom_settings_dialog(hwnd, translate_res(IDD_C64ROM_SETTINGS_DIALOG),
+ translate_res(IDD_C64DRIVEROM_SETTINGS_DIALOG),
+ romset_dialog_resources, uirom_settings);
+ break;
+ case IDM_VIDEO_SETTINGS:
+ ui_video_settings_dialog(hwnd, UI_VIDEO_CHIP_VICII, UI_VIDEO_CHIP_NONE);
+ break;
+ case IDM_DRIVE_SETTINGS:
+ uidrivec64_settings_dialog(hwnd);
+ break;
+ case IDM_RS232USER_SETTINGS:
+ ui_rs232user_settings_dialog(hwnd);
+ break;
+ case IDM_KEYBOARD_SETTINGS:
+ uikeyboard_settings_dialog(hwnd, &uikeyboard_config);
+ break;
+ case IDM_ATTACH_DTV_FLASH:
+ ui_c64dtv_attach_flash_dialog(hwnd);
+ break;
+ case IDM_DETACH_DTV_FLASH:
+ resources_set_string("c64dtvromfilename", "");
+ break;
+ case IDM_CREATE_DTV_FLASH:
+ ui_c64dtv_create_flash_dialog(hwnd);
+ break;
+ case IDM_C64DTV_SETTINGS:
+ ui_c64dtv_settings_dialog(hwnd);
+ break;
+ }
+}
+
+int c64dtvui_init(void)
+{
+ ui_register_machine_specific(c64dtv_ui_specific);
+ ui_register_menu_toggles(c64dtv_ui_menu_toggles);
+
+ return 0;
+}
+
+void c64dtvui_shutdown(void)
+{
+}
Modified: branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/make-msvc-bindist.bat
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/make-msvc-bindist.bat 2008-07-21 21:37:42 UTC (rev 19068)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/make-msvc-bindist.bat 2008-07-22 05:53:17 UTC (rev 19069)
@@ -1,6 +1,7 @@
@echo off
set VICEDIR=WinVICE-2.0
if not exist ..\..\..\data\x64.exe goto missingmsvc
+if not exist ..\..\..\data\x64dtv.exe goto missingmsvc
if not exist ..\..\..\data\x128.exe goto missingmsvc
if not exist ..\..\..\data\xcbm2.exe goto missingmsvc
if not exist ..\..\..\data\xpet.exe goto missingmsvc
@@ -13,6 +14,7 @@
if exist %VICEDIR% goto removedir
mkdir %VICEDIR%
copy ..\..\..\data\x64.exe %VICEDIR%
+copy ..\..\..\data\x64dtv.exe %VICEDIR%
copy ..\..\..\data\x128.exe %VICEDIR%
copy ..\..\..\data\xvic.exe %VICEDIR%
copy ..\..\..\data\xpet.exe %VICEDIR%
@@ -36,6 +38,14 @@
copy ..\..\..\data\C64\*.vrs %VICEDIR%\C64
copy ..\..\..\data\C64\kernal %VICEDIR%\C64
copy ..\..\..\data\C64\win_*.v* %VICEDIR%\C64
+mkdir %VICEDIR%\C64DTV
+copy ..\..\..\data\C64\basic %VICEDIR%\C64DTV
+copy ..\..\..\data\C64\*.vpl %VICEDIR%\C64DTV
+copy ..\..\..\data\C64\c64mem.sym %VICEDIR%\C64DTV
+copy ..\..\..\data\C64\chargen %VICEDIR%\C64DTV
+copy ..\..\..\data\C64\*.vrs %VICEDIR%\C64DTV
+copy ..\..\..\data\C64\kernal %VICEDIR%\C64DTV
+copy ..\..\..\data\C64\win_*.v* %VICEDIR%\C64DTV
mkdir %VICEDIR%\CBM-II
copy ..\..\..\data\CBM-II\*.vpl %VICEDIR%\CBM-II
copy ..\..\..\data\CBM-II\basic.* %VICEDIR%\CBM-II
Modified: branches/viceplus/v2.0-x64dtv/vice/src/c64dtv/c64dtvblitter.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/c64dtv/c64dtvblitter.c 2008-07-21 21:37:42 UTC (rev 19068)
+++ branches/viceplus/v2.0-x64dtv/vice/src/c64dtv/c64dtvblitter.c 2008-07-22 05:53:17 UTC (rev 19069)
@@ -485,7 +485,7 @@
addr &= 0x3f;
- if (addr & 0x20) c64dtv_blitter_store(addr & 0x1f, value);
+ if (addr & 0x20) c64dtv_blitter_store((WORD)(addr & 0x1f), value);
else c64dtv_dma_store(addr, value);
}
Modified: branches/viceplus/v2.0-x64dtv/vice/src/c64dtv/c64dtvcpu.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/c64dtv/c64dtvcpu.c 2008-07-21 21:37:42 UTC (rev 19068)
+++ branches/viceplus/v2.0-x64dtv/vice/src/c64dtv/c64dtvcpu.c 2008-07-22 05:53:17 UTC (rev 19069)
@@ -248,18 +248,18 @@
/* let the DTV segment mapper (register 12-15) do its work */
#define STORE(addr, value) \
- mem_store(addr, value)
+ mem_store((WORD)(addr), (BYTE)(value))
#define LOAD(addr) \
- mem_read(addr)
+ mem_read((WORD)(addr))
/* Route zero page operations through register 10 (zeropage mapper) */
#define STORE_ZERO(addr, value) \
- mem_store((((WORD) dtv_registers[10]) << 8) + ((addr) & 0xff), value)
+ mem_store((WORD)((((WORD) dtv_registers[10]) << 8) + ((addr) & 0xff)), (BYTE)(value))
#define LOAD_ZERO(addr) \
- mem_read((((WORD) dtv_registers[10]) << 8) + ((addr) & 0xff))
+ mem_read((WORD)(((WORD) dtv_registers[10]) << 8) + ((WORD)((addr) & 0xff)))
/* Route stack operations through register 11 (stack mapper) */
Modified: branches/viceplus/v2.0-x64dtv/vice/src/c64dtv/c64dtvdma.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/c64dtv/c64dtvdma.c 2008-07-21 21:37:42 UTC (rev 19068)
+++ branches/viceplus/v2.0-x64dtv/vice/src/c64dtv/c64dtvdma.c 2008-07-22 05:53:17 UTC (rev 19069)
@@ -140,7 +140,7 @@
break;
case 0x80: /* RAM+registers */
if ( (offs >= 0xd000) && (offs < 0xe000) )
- data = _mem_read_tab_ptr[offs >> 8](offs);
+ data = _mem_read_tab_ptr[offs >> 8]((WORD)offs);
else
data = mem_ram[offs];
break;
@@ -186,7 +186,7 @@
break;
case 0x80: /* RAM+registers */
if ( (offs>=0xd000) && (offs<0xe000) )
- _mem_write_tab_ptr[offs >> 8](offs, data);
+ _mem_write_tab_ptr[offs >> 8]((WORD)offs, data);
else
mem_ram[offs] = data;
break;
Modified: branches/viceplus/v2.0-x64dtv/vice/src/c64dtv/c64dtvmem.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/c64dtv/c64dtvmem.c 2008-07-21 21:37:42 UTC (rev 19068)
+++ branches/viceplus/v2.0-x64dtv/vice/src/c64dtv/c64dtvmem.c 2008-07-22 05:53:17 UTC (rev 19069)
@@ -621,7 +621,7 @@
#endif
/* disable dummy write if skip cycle */
if(dtv_registers[9] & 1) maincpu_rmw_flag = 0;
- _mem_write_tab_ptr[paddr >> 8](paddr, value);
+ _mem_write_tab_ptr[paddr >> 8]((WORD)paddr, value);
} else {
#ifdef FEATURE_CPUMEMHISTORY
monitor_memmap_store(paddr, MEMMAP_RAM_W);
@@ -659,7 +659,7 @@
}
memmap_state &= ~(MEMMAP_STATE_OPCODE);
#endif
- return _mem_read_tab_ptr[paddr >> 8](paddr);
+ return _mem_read_tab_ptr[paddr >> 8]((WORD)paddr);
} else {
#ifdef FEATURE_CPUMEMHISTORY
monitor_memmap_store(paddr, (memmap_state&MEMMAP_STATE_OPCODE)?MEMMAP_RAM_X:(memmap_state&MEMMAP_STATE_INSTR)?0:MEMMAP_RAM_R);
Modified: branches/viceplus/v2.0-x64dtv/vice/src/vicii/vicii-mem.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/vicii/vicii-mem.c 2008-07-21 21:37:42 UTC (rev 19068)
+++ branches/viceplus/v2.0-x64dtv/vice/src/vicii/vicii-mem.c 2008-07-22 05:53:17 UTC (rev 19069)
@@ -1016,11 +1016,11 @@
vicii.raster.geometry->gfx_position.x = vicii.screen_leftborderwidth;
}
- d020_store(vicii.regs[0x20]);
- d021_store(vicii.regs[0x21]);
- ext_background_store(0x22,vicii.regs[0x22]);
- ext_background_store(0x23,vicii.regs[0x23]);
- ext_background_store(0x24,vicii.regs[0x24]);
+ d020_store((BYTE)vicii.regs[0x20]);
+ d021_store((BYTE)vicii.regs[0x21]);
+ ext_background_store(0x22,(BYTE)vicii.regs[0x22]);
+ ext_background_store(0x23,(BYTE)vicii.regs[0x23]);
+ ext_background_store(0x24,(BYTE)vicii.regs[0x24]);
vicii_update_video_mode(cycle);
vicii_update_memory_ptrs(cycle);
@@ -1180,21 +1180,21 @@
if (!vicii.extended_enable) return;
if (vicii.dtvpalette[addr&0xf]==value) return;
vicii.dtvpalette[addr&0xf]=value;
- d020_store(vicii.regs[0x20]);
- d021_store(vicii.regs[0x21]);
- ext_background_store(0x22,vicii.regs[0x22]);
- ext_background_store(0x23,vicii.regs[0x23]);
- ext_background_store(0x24,vicii.regs[0x24]);
- d025_store(vicii.regs[0x25]);
- d026_store(vicii.regs[0x26]);
- sprite_color_store(0x27,vicii.regs[0x27]);
- sprite_color_store(0x28,vicii.regs[0x28]);
- sprite_color_store(0x29,vicii.regs[0x29]);
- sprite_color_store(0x2a,vicii.regs[0x2a]);
- sprite_color_store(0x2b,vicii.regs[0x2b]);
- sprite_color_store(0x2c,vicii.regs[0x2c]);
- sprite_color_store(0x2d,vicii.regs[0x2d]);
- sprite_color_store(0x2e,vicii.regs[0x2e]);
+ d020_store((BYTE)vicii.regs[0x20]);
+ d021_store((BYTE)vicii.regs[0x21]);
+ ext_background_store(0x22,(BYTE)vicii.regs[0x22]);
+ ext_background_store(0x23,(BYTE)vicii.regs[0x23]);
+ ext_background_store(0x24,(BYTE)vicii.regs[0x24]);
+ d025_store((BYTE)vicii.regs[0x25]);
+ d026_store((BYTE)vicii.regs[0x26]);
+ sprite_color_store(0x27,(BYTE)vicii.regs[0x27]);
+ sprite_color_store(0x28,(BYTE)vicii.regs[0x28]);
+ sprite_color_store(0x29,(BYTE)vicii.regs[0x29]);
+ sprite_color_store(0x2a,(BYTE)vicii.regs[0x2a]);
+ sprite_color_store(0x2b,(BYTE)vicii.regs[0x2b]);
+ sprite_color_store(0x2c,(BYTE)vicii.regs[0x2c]);
+ sprite_color_store(0x2d,(BYTE)vicii.regs[0x2d]);
+ sprite_color_store(0x2e,(BYTE)vicii.regs[0x2e]);
if (vicii.raster.cache_enabled) vicii.raster.dont_cache = 1;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ama...@us...> - 2008-07-21 21:37:33
|
Revision: 19068
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=19068&view=rev
Author: amatthies
Date: 2008-07-21 21:37:42 +0000 (Mon, 21 Jul 2008)
Log Message:
-----------
Removed c64cart dependency from x64dtv.
Modified Paths:
--------------
branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/vice.dsw
Modified: branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/vice.dsw
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/vice.dsw 2008-07-21 21:17:47 UTC (rev 19067)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/vice.dsw 2008-07-21 21:37:42 UTC (rev 19068)
@@ -1113,9 +1113,6 @@
Project_Dep_Name monitor
End Project Dependency
Begin Project Dependency
- Project_Dep_Name c64cart
- End Project Dependency
- Begin Project Dependency
Project_Dep_Name diskimage
End Project Dependency
Begin Project Dependency
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ama...@us...> - 2008-07-21 21:17:42
|
Revision: 19067
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=19067&view=rev
Author: amatthies
Date: 2008-07-21 21:17:47 +0000 (Mon, 21 Jul 2008)
Log Message:
-----------
Fixed path.
Modified Paths:
--------------
branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/c64dtvstubs.dsp
Modified: branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/c64dtvstubs.dsp
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/c64dtvstubs.dsp 2008-07-21 20:59:16 UTC (rev 19066)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/c64dtvstubs.dsp 2008-07-21 21:17:47 UTC (rev 19067)
@@ -37,8 +37,8 @@
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "libs\c64dtv\Release"
-# PROP Intermediate_Dir "libs\c64dtv\Release"
+# PROP Output_Dir "libs\c64dtvstubs\Release"
+# PROP Intermediate_Dir "libs\c64dtvstubs\Release"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
# ADD CPP /nologo /W3 /GX /O2 /I ".\msvc" /I ".\\" /I "..\..\\" /I "..\..\drive" /I "..\..\tape" /I "..\..\sid" /I "..\..\vicii" /I "..\..\c64" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
@@ -60,8 +60,8 @@
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "libs\c64dtv\Debug"
-# PROP Intermediate_Dir "libs\c64dtv\Debug"
+# PROP Output_Dir "libs\c64dtvstubs\Debug"
+# PROP Intermediate_Dir "libs\c64dtvstubs\Debug"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
# ADD CPP /nologo /W3 /GX /Z7 /Od /I ".\msvc" /I ".\\" /I "..\..\\" /I "..\..\drive" /I "..\..\tape" /I "..\..\sid" /I "..\..\vicii" /I "..\..\c64" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bla...@us...> - 2008-07-21 20:59:09
|
Revision: 19066
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=19066&view=rev
Author: blackystardust
Date: 2008-07-21 20:59:16 +0000 (Mon, 21 Jul 2008)
Log Message:
-----------
Added amiga UI for x64dtv.
Modified Paths:
--------------
branches/viceplus/v2.0-x64dtv/vice/src/arch/amigaos/Makefile.am
branches/viceplus/v2.0-x64dtv/vice/src/arch/amigaos/intl.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/amigaos/intl.txt
branches/viceplus/v2.0-x64dtv/vice/src/arch/amigaos/make-bindist.sh
branches/viceplus/v2.0-x64dtv/vice/src/arch/amigaos/uires.h
Added Paths:
-----------
branches/viceplus/v2.0-x64dtv/vice/src/arch/amigaos/c64dtvui.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/amigaos/c64dtvuires.h
branches/viceplus/v2.0-x64dtv/vice/src/arch/amigaos/mui/uic64dtv.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/amigaos/mui/uic64dtv.h
branches/viceplus/v2.0-x64dtv/vice/src/arch/amigaos/x64dtvns.c
Modified: branches/viceplus/v2.0-x64dtv/vice/src/arch/amigaos/Makefile.am
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/amigaos/Makefile.am 2008-07-21 20:44:51 UTC (rev 19065)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/amigaos/Makefile.am 2008-07-21 20:59:16 UTC (rev 19066)
@@ -1,9 +1,11 @@
# Makefile.am for the AMIGAOS version of `libarch.a'.
-bin_PROGRAMS = x64ns x128ns xvicns xplus4ns xcbm2ns xpetns
+bin_PROGRAMS = x64ns x64dtvns x128ns xvicns xplus4ns xcbm2ns xpetns
x64ns_SOURCES = x64ns.c
+x64dtvns_SOURCES = x64dtvns.c
+
x128ns_SOURCES = x128ns.c
xvicns_SOURCES = xvicns.c
@@ -19,6 +21,7 @@
-I$(top_builddir)/src \
-I$(top_srcdir)/src/drive \
-I$(top_srcdir)/src/c64 \
+ -I$(top_srcdir)/src/c64dtv \
-I$(top_srcdir)/src/c128 \
-I$(top_srcdir)/src/vic20 \
-I$(top_srcdir)/src/pet \
@@ -41,6 +44,8 @@
c128uires.h \
c64ui.c \
c64uires.h \
+ c64dtvui.c \
+ c64dtvuires.h \
catweaselmkiii.c \
cbm2ui.c \
cbm2uires.h \
@@ -108,6 +113,8 @@
mui/uiacia.h \
mui/uic64_256k.c \
mui/uic64_256k.h \
+ mui/uic64dtv.c \
+ mui/uic64dtv.h \
mui/uic128settings.c \
mui/uic128settings.h \
mui/uicbm2settings.c \
Added: branches/viceplus/v2.0-x64dtv/vice/src/arch/amigaos/c64dtvui.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/amigaos/c64dtvui.c (rev 0)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/amigaos/c64dtvui.c 2008-07-21 20:59:16 UTC (rev 19066)
@@ -0,0 +1,103 @@
+/*
+ * c64dtvui.c
+ *
+ * Written by
+ * Marco van den Heuvel <bla...@ya...>
+ *
+ * This file is part of VICE, the Versatile Commodore Emulator.
+ * See README for copyright notice.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ * 02111-1307 USA.
+ *
+ */
+
+#include "vice.h"
+
+#define UI_C64DTV
+#define UI_MENU_NAME c64dtv_ui_translation_menu
+#define UI_TRANSLATED_MENU_NAME c64dtv_ui_menu
+
+#include "private.h"
+#include "c64ui.h"
+#include "c64dtvuires.h"
+
+#include "mui/uic64dtv.h"
+#include "mui/uidrivec64vic20.h"
+#include "mui/uiromc64vic20settings.h"
+#include "mui/uisid.h"
+#include "mui/uivicii.h"
+#include "mui/uivideoc64plus4vic20.h"
+
+static const ui_menu_toggle_t c64dtv_ui_menu_toggles[] = {
+ { "VICIIDoubleSize", IDM_TOGGLE_DOUBLESIZE },
+ { "VICIIDoubleScan", IDM_TOGGLE_DOUBLESCAN },
+ { "VICIIScale2x", IDM_TOGGLE_SCALE2X },
+ { "PALEmulation", IDM_TOGGLE_FASTPAL },
+ { "VICIIVideoCache", IDM_TOGGLE_VIDEOCACHE },
+ { "Mouse", IDM_MOUSE },
+ { "ps2mouse", IDM_PS2_MOUSE },
+ { "EmuID", IDM_TOGGLE_EMUID },
+ { NULL, 0 }
+};
+
+static int c64dtv_ui_specific(video_canvas_t *canvas, int idm)
+{
+ uic64cart_proc(canvas, idm);
+
+ switch (idm) {
+ case IDM_C64DTV_SETTINGS:
+ ui_c64dtv_settings_dialog(canvas);
+ break;
+ case IDM_VICII_SETTINGS:
+ ui_vicii_settings_dialog();
+ break;
+ case IDM_SID_SETTINGS:
+ ui_sid_settings_dialog();
+ break;
+ case IDM_COMPUTER_ROM_SETTINGS:
+ ui_c64vic20_computer_rom_settings_dialog(canvas);
+ break;
+ case IDM_DRIVE_ROM_SETTINGS:
+ ui_c64vic20_drive_rom_settings_dialog(canvas);
+ break;
+ case IDM_VIDEO_SETTINGS:
+ ui_video_c64plus4vic20_settings_dialog(canvas, "VICIIExternalPalette", "VICIIPaletteFile");
+ break;
+ case IDM_DRIVE_SETTINGS:
+ uidrivec64vic20_settings_dialog();
+ break;
+ case IDM_KEYBOARD_SETTINGS:
+// uikeyboard_settings_dialog(hwnd, &uikeyboard_config);
+ break;
+ }
+
+ return 0;
+}
+
+int c64dtvui_init(void)
+{
+ ui_register_menu_translation_layout(c64dtv_ui_translation_menu);
+ ui_register_menu_layout(c64dtv_ui_menu);
+ ui_register_machine_specific(c64dtv_ui_specific);
+ ui_register_menu_toggles(c64dtv_ui_menu_toggles);
+// ui_register_res_values(const ui_res_value_list_t *valuelist);
+
+ return 0;
+}
+
+void c64dtvui_shutdown(void)
+{
+}
Property changes on: branches/viceplus/v2.0-x64dtv/vice/src/arch/amigaos/c64dtvui.c
___________________________________________________________________
Added: svn:executable
+ *
Added: branches/viceplus/v2.0-x64dtv/vice/src/arch/amigaos/c64dtvuires.h
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/amigaos/c64dtvuires.h (rev 0)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/amigaos/c64dtvuires.h 2008-07-21 20:59:16 UTC (rev 19066)
@@ -0,0 +1,194 @@
+/*
+ * c64dtvuires.h
+ *
+ * Written by
+ * Marco van den Heuvel <bla...@ya...>
+ *
+ * This file is part of VICE, the Versatile Commodore Emulator.
+ * See README for copyright notice.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ * 02111-1307 USA.
+ *
+ */
+
+#ifndef _C64UIRES_H_
+#define _C64UIRES_H_
+
+#include "uires.h"
+#include "intl.h"
+
+static struct TranslateNewMenu UI_MENU_NAME[] = {
+ TITLE(IDMS_FILE, NULL)
+#ifndef AMIGA_AROS
+ ITEM(IDMS_AUTOSTART_IMAGE, NULL, IDM_AUTOSTART)
+ ITEMSEPARATOR()
+#endif
+ ITEM(IDMS_ATTACH_DISK_IMAGE, NULL, NULL)
+ SUB(IDMS_DRIVE_8, "8", IDM_ATTACH_8)
+ SUB(IDMS_DRIVE_9, "9", IDM_ATTACH_9)
+ SUB(IDMS_DRIVE_10, "0", IDM_ATTACH_10)
+ SUB(IDMS_DRIVE_11, "1", IDM_ATTACH_11)
+ ITEM(IDMS_DETACH_DISK_IMAGE, NULL, NULL)
+ SUB(IDMS_DRIVE_8, NULL, IDM_DETACH_8)
+ SUB(IDMS_DRIVE_9, NULL, IDM_DETACH_9)
+ SUB(IDMS_DRIVE_10, NULL, IDM_DETACH_10)
+ SUB(IDMS_DRIVE_11, NULL, IDM_DETACH_11)
+ SUBSEPARATOR()
+ SUB(IDMS_ALL, "A", IDM_DETACH_ALL)
+ ITEM(IDMS_FLIP_LIST, NULL, NULL)
+ SUB(IDMS_ADD_CURRENT_IMAGE, "I", IDM_FLIP_ADD)
+ SUB(IDMS_REMOVE_CURRENT_IMAGE, "K", IDM_FLIP_REMOVE)
+ SUB(IDMS_ATTACH_NEXT_IMAGE, "N", IDM_FLIP_NEXT)
+ SUB(IDMS_ATTACH_PREVIOUS_IMAGE, "B", IDM_FLIP_PREVIOUS)
+ SUBSEPARATOR()
+ SUB(IDMS_LOAD_FLIP_LIST, NULL, IDM_FLIP_LOAD)
+ SUB(IDMS_SAVE_FLIP_LIST, NULL, IDM_FLIP_SAVE)
+ ITEMSEPARATOR()
+ ITEMTOGGLE(IDMS_PAUSE, NULL, IDM_PAUSE)
+ ITEM(IDMS_MONITOR, "M", IDM_MONITOR)
+ ITEM(IDMS_RESET, NULL, NULL)
+ SUB(IDMS_HARD, NULL, IDM_RESET_HARD)
+ SUB(IDMS_SOFT, "R", IDM_RESET_SOFT)
+ SUBSEPARATOR()
+ SUB(IDMS_DRIVE_8, NULL, IDM_RESET_DRIVE8)
+ SUB(IDMS_DRIVE_9, NULL, IDM_RESET_DRIVE9)
+ SUB(IDMS_DRIVE_10, NULL, IDM_RESET_DRIVE10)
+ SUB(IDMS_DRIVE_11, NULL, IDM_RESET_DRIVE11)
+ ITEMSEPARATOR()
+ ITEM(IDMS_EXIT, "X", IDM_EXIT)
+ TITLE(IDMS_EDIT, NULL)
+ ITEM(IDMS_COPY, NULL, IDM_COPY)
+ ITEM(IDMS_PASTE, NULL, IDM_PASTE)
+ TITLE(IDMS_SNAPSHOT, NULL)
+ ITEM(IDMS_LOAD_SNAPSHOT_IMAGE, NULL, IDM_SNAPSHOT_LOAD)
+ ITEM(IDMS_SAVE_SNAPSHOT_IMAGE, NULL, IDM_SNAPSHOT_SAVE)
+ ITEMSEPARATOR()
+ ITEM(IDMS_START_STOP_RECORDING, NULL, IDM_EVENT_TOGGLE_RECORD)
+ ITEM(IDMS_START_STOP_PLAYBACK, NULL, IDM_EVENT_TOGGLE_PLAYBACK)
+ ITEM(IDMS_SET_MILESTONE, "G", IDM_EVENT_SETMILESTONE)
+ ITEM(IDMS_RETURN_TO_MILESTONE, "H", IDM_EVENT_RESETMILESTONE)
+ ITEM(IDMS_RECORDING_START_MODE, NULL, NULL)
+ SUBTOGGLE(IDMS_SAVE_NEW_SNAPSHOT, NULL, IDM_EVENT_START_MODE_SAVE)
+ SUBTOGGLE(IDMS_LOAD_EXISTING_SNAPSHOT, NULL, IDM_EVENT_START_MODE_LOAD)
+ SUBTOGGLE(IDMS_START_WITH_RESET, NULL, IDM_EVENT_START_MODE_RESET)
+ SUBTOGGLE(IDMS_OVERWRITE_PLAYBACK, NULL, IDM_EVENT_START_MODE_PLAYBACK)
+ ITEM(IDMS_SELECT_HISTORY_DIR, NULL, IDM_EVENT_DIRECTORY)
+ ITEMSEPARATOR()
+ ITEM(IDMS_SAVE_STOP_MEDIA_FILE, "C", IDM_MEDIAFILE)
+ ITEMSEPARATOR()
+ ITEM(IDMS_START_SOUND_RECORD, NULL, IDM_SOUND_RECORD_START)
+ ITEM(IDMS_STOP_SOUND_RECORD, NULL, IDM_SOUND_RECORD_STOP)
+ ITEMSEPARATOR()
+ ITEM(IDMS_NETPLAY, NULL, IDM_NETWORK_SETTINGS)
+ TITLE(IDMS_OPTIONS, NULL)
+ ITEM(IDMS_REFRESH_RATE, NULL, NULL)
+ SUBTOGGLE(IDMS_AUTO, NULL, IDM_REFRESH_RATE_AUTO)
+ SUBTOGGLE(IDMS_1_1, NULL, IDM_REFRESH_RATE_1)
+ SUBTOGGLE(IDMS_1_2, NULL, IDM_REFRESH_RATE_2)
+ SUBTOGGLE(IDMS_1_3, NULL, IDM_REFRESH_RATE_3)
+ SUBTOGGLE(IDMS_1_4, NULL, IDM_REFRESH_RATE_4)
+ SUBTOGGLE(IDMS_1_5, NULL, IDM_REFRESH_RATE_5)
+ SUBTOGGLE(IDMS_1_6, NULL, IDM_REFRESH_RATE_6)
+ SUBTOGGLE(IDMS_1_7, NULL, IDM_REFRESH_RATE_7)
+ SUBTOGGLE(IDMS_1_8, NULL, IDM_REFRESH_RATE_8)
+ SUBTOGGLE(IDMS_1_9, NULL, IDM_REFRESH_RATE_9)
+ SUBTOGGLE(IDMS_1_10, NULL, IDM_REFRESH_RATE_10)
+ ITEM(IDMS_MAXIMUM_SPEED, NULL, NULL)
+ SUBTOGGLE(IDMS_200_PERCENT, NULL, IDM_MAXIMUM_SPEED_200)
+ SUBTOGGLE(IDMS_100_PERCENT, NULL, IDM_MAXIMUM_SPEED_100)
+ SUBTOGGLE(IDMS_50_PERCENT, NULL, IDM_MAXIMUM_SPEED_50)
+ SUBTOGGLE(IDMS_20_PERCENT, NULL, IDM_MAXIMUM_SPEED_20)
+ SUBTOGGLE(IDMS_10_PERCENT, NULL, IDM_MAXIMUM_SPEED_10)
+ SUBTOGGLE(IDMS_NO_LIMIT, NULL, IDM_MAXIMUM_SPEED_NO_LIMIT)
+ SUBSEPARATOR()
+ SUBTOGGLE(IDMS_CUSTOM, NULL, IDM_MAXIMUM_SPEED_CUSTOM)
+ ITEMTOGGLE(IDMS_WARP_MODE, "W", IDM_TOGGLE_WARP_MODE)
+ ITEMSEPARATOR()
+ ITEMTOGGLE(IDMS_FULLSCREEN, "D", IDM_TOGGLE_FULLSCREEN)
+ ITEMTOGGLE(IDMS_FULLSCREEN_STATUSBAR, NULL, IDM_TOGGLE_STATUSBAR)
+ ITEMSEPARATOR()
+ ITEMTOGGLE(IDMS_VIDEO_CACHE, NULL, IDM_TOGGLE_VIDEOCACHE)
+ ITEMTOGGLE(IDMS_DOUBLE_SIZE, NULL, IDM_TOGGLE_DOUBLESIZE)
+ ITEMTOGGLE(IDMS_DOUBLE_SCAN, NULL, IDM_TOGGLE_DOUBLESCAN)
+ ITEMTOGGLE(IDS_PAL_EMULATION, NULL, IDM_TOGGLE_FASTPAL)
+ ITEMTOGGLE(IDMS_SCALE2X, NULL, IDM_TOGGLE_SCALE2X)
+#if defined(HAVE_PROTO_CYBERGRAPHICS_H) && defined(HAVE_XVIDEO)
+ ITEMTOGGLE(IDMS_VIDEO_OVERLAY, NULL, IDM_TOGGLE_OVERLAY)
+#endif
+ ITEMSEPARATOR()
+ ITEM(IDMS_SWAP_JOYSTICKS, "J", IDM_SWAP_JOYSTICK)
+ ITEMSEPARATOR()
+ ITEMTOGGLE(IDMS_SOUND_PLAYBACK, NULL, IDM_TOGGLE_SOUND)
+ ITEMSEPARATOR()
+ ITEMTOGGLE(IDMS_TRUE_DRIVE_EMU, NULL, IDM_TOGGLE_DRIVE_TRUE_EMULATION)
+ ITEMTOGGLE(IDMS_VIRTUAL_DEVICE_TRAPS, NULL, IDM_TOGGLE_VIRTUAL_DEVICES)
+ ITEMSEPARATOR()
+ ITEM(IDMS_VIDEO_STANDARD, NULL, NULL)
+ SUBTOGGLE(IDMS_PAL_G, NULL, IDM_SYNC_FACTOR_PAL)
+ SUBTOGGLE(IDMS_NTSC_M, NULL, IDM_SYNC_FACTOR_NTSC)
+ ITEMSEPARATOR()
+ ITEMTOGGLE(IDMS_EMU_ID, NULL, IDM_TOGGLE_EMUID)
+ ITEMTOGGLE(IDMS_PS2_MOUSE, NULL, IDM_PS2_MOUSE)
+ ITEMTOGGLE(IDMS_GRAB_MOUSE, "Q", IDM_MOUSE)
+ TITLE(IDMS_SETTINGS, NULL)
+ ITEM(IDMS_VIDEO_SETTINGS, NULL, IDM_VIDEO_SETTINGS)
+ ITEM(IDMS_PERIPHERAL_SETTINGS, NULL,IDM_DEVICEMANAGER)
+ ITEM(IDMS_DRIVE_SETTINGS, NULL, IDM_DRIVE_SETTINGS)
+ ITEM(IDMS_VICII_SETTINGS, NULL, IDM_VICII_SETTINGS)
+#ifdef AMIGA_OS4
+ ITEM(IDMS_JOYSTICK_SETTINGS, NULL, IDM_JOY_SETTINGS)
+#else
+ ITEM(IDMS_JOYSTICK_SETTINGS, NULL, NULL)
+ SUB(IDMS_JOYSTICK_DEVICE_SELECT, NULL, IDM_JOY_DEVICE_SELECTION)
+ SUB(IDMS_JOYSTICK_FIRE_SELECT, NULL, IDM_JOY_FIRE_SELECTION)
+#endif
+ ITEM(IDMS_KEYBOARD_SETTINGS, NULL, IDM_KEYBOARD_SETTINGS)
+ ITEM(IDMS_SOUND_SETTINGS, NULL, IDM_SOUND_SETTINGS)
+ ITEM(IDMS_SID_SETTINGS, NULL, IDM_SID_SETTINGS)
+ ITEM(IDMS_COMPUTER_ROM_SETTINGS, NULL, IDM_COMPUTER_ROM_SETTINGS)
+ ITEM(IDMS_DRIVE_ROM_SETTINGS, NULL, IDM_DRIVE_ROM_SETTINGS)
+ ITEM(IDMS_RAM_SETTINGS, NULL, IDM_RAM_SETTINGS)
+ ITEM(IDMS_C64DTV_SETTINGS, NULL, IDM_C64DTV_SETTINGS)
+ ITEMSEPARATOR()
+ ITEM(IDMS_SAVE_CURRENT_SETTINGS, NULL, IDM_SETTINGS_SAVE)
+ ITEM(IDMS_LOAD_SAVED_SETTINGS, NULL, IDM_SETTINGS_LOAD)
+ ITEM(IDMS_SET_DEFAULT_SETTINGS, NULL, IDM_SETTINGS_DEFAULT)
+ ITEMSEPARATOR()
+ ITEMTOGGLE(IDMS_SAVE_SETTING_ON_EXIT, NULL, IDM_TOGGLE_SAVE_SETTINGS_ON_EXIT)
+ ITEMTOGGLE(IDMS_CONFIRM_ON_EXIT, NULL, IDM_TOGGLE_CONFIRM_ON_EXIT)
+ TITLE(IDMS_LANGUAGE, NULL)
+ ITEM(IDMS_LANGUAGE_ENGLISH, NULL, IDM_LANGUAGE_ENGLISH)
+ ITEM(IDMS_LANGUAGE_GERMAN, NULL, IDM_LANGUAGE_GERMAN)
+ ITEM(IDMS_LANGUAGE_FRENCH, NULL, IDM_LANGUAGE_FRENCH)
+ ITEM(IDMS_LANGUAGE_HUNGARIAN, NULL, IDM_LANGUAGE_HUNGARIAN)
+ ITEM(IDMS_LANGUAGE_ITALIAN, NULL, IDM_LANGUAGE_ITALIAN)
+ ITEM(IDMS_LANGUAGE_DUTCH, NULL, IDM_LANGUAGE_DUTCH)
+ ITEM(IDMS_LANGUAGE_POLISH, NULL, IDM_LANGUAGE_POLISH)
+ ITEM(IDMS_LANGUAGE_SWEDISH, NULL, IDM_LANGUAGE_SWEDISH)
+ TITLE(IDMS_HELP, NULL)
+ ITEM(IDMS_ABOUT, NULL, IDM_ABOUT)
+ ITEMSEPARATOR()
+ ITEM(IDMS_COMMAND_LINE_OPTIONS, NULL, IDM_CMDLINE)
+ ITEMSEPARATOR()
+ ITEM(IDMS_CONTRIBUTORS, NULL, IDM_CONTRIBUTORS)
+ ITEM(IDMS_LICENSE, NULL, IDM_LICENSE)
+ ITEM(IDMS_NO_WARRANTY, NULL, IDM_WARRANTY)
+ END()
+};
+
+static struct NewMenu UI_TRANSLATED_MENU_NAME[sizeof(UI_MENU_NAME)/sizeof(UI_MENU_NAME[0])];
+
+#endif /* _C64UIRES_H_ */
Property changes on: branches/viceplus/v2.0-x64dtv/vice/src/arch/amigaos/c64dtvuires.h
___________________________________________________________________
Added: svn:executable
+ *
Modified: branches/viceplus/v2.0-x64dtv/vice/src/arch/amigaos/intl.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/amigaos/intl.c 2008-07-21 20:44:51 UTC (rev 19065)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/amigaos/intl.c 2008-07-21 20:59:16 UTC (rev 19066)
@@ -1299,6 +1299,15 @@
/* pl */ {IDMS_GRAB_MOUSE_PL, ""}, /* fuzzy */
/* sv */ {IDMS_GRAB_MOUSE_SV, "F\xE5nga mush\xE4ndelser"},
+/* en */ {IDMS_PS2_MOUSE, "PS/2 mouse emulation"},
+/* de */ {IDMS_PS2_MOUSE_DE, ""}, /* fuzzy */
+/* fr */ {IDMS_PS2_MOUSE_FR, ""}, /* fuzzy */
+/* hu */ {IDMS_PS2_MOUSE_HU, ""}, /* fuzzy */
+/* it */ {IDMS_PS2_MOUSE_IT, ""}, /* fuzzy */
+/* nl */ {IDMS_PS2_MOUSE_NL, "PS/2 muis emulatie"},
+/* pl */ {IDMS_PS2_MOUSE_PL, ""}, /* fuzzy */
+/* sv */ {IDMS_PS2_MOUSE_SV, ""}, /* fuzzy */
+
/* en */ {IDMS_SETTINGS, "Settings"},
/* de */ {IDMS_SETTINGS_DE, "Einstellungen"},
/* fr */ {IDMS_SETTINGS_FR, "Param\xE8tres"},
@@ -1650,6 +1659,15 @@
/* pl */ {IDMS_SIDCART_SETTINGS_PL, ""}, /* fuzzy */
/* sv */ {IDMS_SIDCART_SETTINGS_SV, "SID-modulinst\xE4llningar..."},
+/* en */ {IDMS_C64DTV_SETTINGS, "C64DTV settings..."},
+/* de */ {IDMS_C64DTV_SETTINGS_DE, ""}, /* fuzzy */
+/* fr */ {IDMS_C64DTV_SETTINGS_FR, ""}, /* fuzzy */
+/* hu */ {IDMS_C64DTV_SETTINGS_HU, ""}, /* fuzzy */
+/* it */ {IDMS_C64DTV_SETTINGS_IT, ""}, /* fuzzy */
+/* nl */ {IDMS_C64DTV_SETTINGS_NL, "C64DTV instellingen"},
+/* pl */ {IDMS_C64DTV_SETTINGS_PL, ""}, /* fuzzy */
+/* sv */ {IDMS_C64DTV_SETTINGS_SV, ""}, /* fuzzy */
+
/* en */ {IDMS_RS232_USERPORT_SETTINGS, "RS232 userport settings..."},
/* de */ {IDMS_RS232_USERPORT_SETTINGS_DE, "RS232 Userport Einstellungen..."},
/* fr */ {IDMS_RS232_USERPORT_SETTINGS_FR, "Param\xE8tres RS232 userport..."},
@@ -2861,6 +2879,69 @@
/* pl */ {IDS_256K_SETTINGS_PL, ""}, /* fuzzy */
/* sv */ {IDS_256K_SETTINGS_SV, "256K-inst\xE4llningar"},
+/* en */ {IDS_C64DTV_ROM_FILENAME_SELECT, "Select file for C64DTV ROM"},
+/* de */ {IDS_C64DTV_ROM_FILENAME_SELECT_DE, ""}, /* fuzzy */
+/* fr */ {IDS_C64DTV_ROM_FILENAME_SELECT_FR, ""}, /* fuzzy */
+/* hu */ {IDS_C64DTV_ROM_FILENAME_SELECT_HU, ""}, /* fuzzy */
+/* it */ {IDS_C64DTV_ROM_FILENAME_SELECT_IT, ""}, /* fuzzy */
+/* nl */ {IDS_C64DTV_ROM_FILENAME_SELECT_NL, "Selecteer bestand voor C64DTV ROM"},
+/* pl */ {IDS_C64DTV_ROM_FILENAME_SELECT_PL, ""}, /* fuzzy */
+/* sv */ {IDS_C64DTV_ROM_FILENAME_SELECT_SV, ""}, /* fuzzy */
+
+/* en */ {IDS_C64DTV_ROM_FILENAME, "C64DTV ROM file"},
+/* de */ {IDS_C64DTV_ROM_FILENAME_DE, ""}, /* fuzzy */
+/* fr */ {IDS_C64DTV_ROM_FILENAME_FR, ""}, /* fuzzy */
+/* hu */ {IDS_C64DTV_ROM_FILENAME_HU, ""}, /* fuzzy */
+/* it */ {IDS_C64DTV_ROM_FILENAME_IT, ""}, /* fuzzy */
+/* nl */ {IDS_C64DTV_ROM_FILENAME_NL, "C64DTV ROM bestand"},
+/* pl */ {IDS_C64DTV_ROM_FILENAME_PL, ""}, /* fuzzy */
+/* sv */ {IDS_C64DTV_ROM_FILENAME_SV, ""}, /* fuzzy */
+
+/* en */ {IDS_C64DTV_REVISION, "C64DTV revision"},
+/* de */ {IDS_C64DTV_REVISION_DE, ""}, /* fuzzy */
+/* fr */ {IDS_C64DTV_REVISION_FR, ""}, /* fuzzy */
+/* hu */ {IDS_C64DTV_REVISION_HU, ""}, /* fuzzy */
+/* it */ {IDS_C64DTV_REVISION_IT, ""}, /* fuzzy */
+/* nl */ {IDS_C64DTV_REVISION_NL, "C64DTV revisie"},
+/* pl */ {IDS_C64DTV_REVISION_PL, ""}, /* fuzzy */
+/* sv */ {IDS_C64DTV_REVISION_SV, ""}, /* fuzzy */
+
+/* en */ {IDS_C64DTV_WRITE_ENABLE, "Writes to C64DTV ROM"},
+/* de */ {IDS_C64DTV_WRITE_ENABLE_DE, ""}, /* fuzzy */
+/* fr */ {IDS_C64DTV_WRITE_ENABLE_FR, ""}, /* fuzzy */
+/* hu */ {IDS_C64DTV_WRITE_ENABLE_HU, ""}, /* fuzzy */
+/* it */ {IDS_C64DTV_WRITE_ENABLE_IT, ""}, /* fuzzy */
+/* nl */ {IDS_C64DTV_WRITE_ENABLE_NL, "Schrijven naar C64DTV ROM"},
+/* pl */ {IDS_C64DTV_WRITE_ENABLE_PL, ""}, /* fuzzy */
+/* sv */ {IDS_C64DTV_WRITE_ENABLE_SV, ""}, /* fuzzy */
+
+/* en */ {IDS_C64DTV_HUMMER_JOY_ENABLE, "Hummer Userport joystick"},
+/* de */ {IDS_C64DTV_HUMMER_JOY_ENABLE_DE, ""}, /* fuzzy */
+/* fr */ {IDS_C64DTV_HUMMER_JOY_ENABLE_FR, ""}, /* fuzzy */
+/* hu */ {IDS_C64DTV_HUMMER_JOY_ENABLE_HU, ""}, /* fuzzy */
+/* it */ {IDS_C64DTV_HUMMER_JOY_ENABLE_IT, ""}, /* fuzzy */
+/* nl */ {IDS_C64DTV_HUMMER_JOY_ENABLE_NL, "Hummer Userport joystick"},
+/* pl */ {IDS_C64DTV_HUMMER_JOY_ENABLE_PL, ""}, /* fuzzy */
+/* sv */ {IDS_C64DTV_HUMMER_JOY_ENABLE_SV, ""}, /* fuzzy */
+
+/* en */ {IDS_C64DTV_HUMMER_JOY_PORT, "Joystick port mapped to Hummer Userport"},
+/* de */ {IDS_C64DTV_HUMMER_JOY_PORT_DE, ""}, /* fuzzy */
+/* fr */ {IDS_C64DTV_HUMMER_JOY_PORT_FR, ""}, /* fuzzy */
+/* hu */ {IDS_C64DTV_HUMMER_JOY_PORT_HU, ""}, /* fuzzy */
+/* it */ {IDS_C64DTV_HUMMER_JOY_PORT_IT, ""}, /* fuzzy */
+/* nl */ {IDS_C64DTV_HUMMER_JOY_PORT_NL, "Joystick omgeleidt naar Hummer Userport"},
+/* pl */ {IDS_C64DTV_HUMMER_JOY_PORT_PL, ""}, /* fuzzy */
+/* sv */ {IDS_C64DTV_HUMMER_JOY_PORT_SV, ""}, /* fuzzy */
+
+/* en */ {IDS_C64DTV_SETTINGS, "C64DTV Settings"},
+/* de */ {IDS_C64DTV_SETTINGS_DE, ""}, /* fuzzy */
+/* fr */ {IDS_C64DTV_SETTINGS_FR, ""}, /* fuzzy */
+/* hu */ {IDS_C64DTV_SETTINGS_HU, ""}, /* fuzzy */
+/* it */ {IDS_C64DTV_SETTINGS_IT, ""}, /* fuzzy */
+/* nl */ {IDS_C64DTV_SETTINGS_NL, "C64DTV Instellingen"},
+/* pl */ {IDS_C64DTV_SETTINGS_PL, ""}, /* fuzzy */
+/* sv */ {IDS_C64DTV_SETTINGS_SV, ""}, /* fuzzy */
+
/* en */ {IDS_MODEL_LINE, "model line"},
/* de */ {IDS_MODEL_LINE_DE, "modell linie"},
/* fr */ {IDS_MODEL_LINE_FR, "ligne du modele"},
Modified: branches/viceplus/v2.0-x64dtv/vice/src/arch/amigaos/intl.txt
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/amigaos/intl.txt 2008-07-21 20:44:51 UTC (rev 19065)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/amigaos/intl.txt 2008-07-21 20:59:16 UTC (rev 19066)
@@ -262,6 +262,8 @@
IDMS_GRAB_MOUSE
+IDMS_PS2_MOUSE
+
IDMS_SETTINGS
IDMS_VIDEO_SETTINGS
@@ -336,6 +338,8 @@
IDMS_SIDCART_SETTINGS
+IDMS_C64DTV_SETTINGS
+
IDMS_RS232_USERPORT_SETTINGS
IDMS_SAVE_CURRENT_SETTINGS
@@ -610,6 +614,20 @@
IDS_256K_SETTINGS
+IDS_C64DTV_ROM_FILENAME_SELECT
+
+IDS_C64DTV_ROM_FILENAME
+
+IDS_C64DTV_REVISION
+
+IDS_C64DTV_WRITE_ENABLE
+
+IDS_C64DTV_HUMMER_JOY_ENABLE
+
+IDS_C64DTV_HUMMER_JOY_PORT
+
+IDS_C64DTV_SETTINGS
+
IDS_MODEL_LINE
IDS_RAM_SIZE
Modified: branches/viceplus/v2.0-x64dtv/vice/src/arch/amigaos/make-bindist.sh
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/amigaos/make-bindist.sh 2008-07-21 20:44:51 UTC (rev 19065)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/amigaos/make-bindist.sh 2008-07-21 20:59:16 UTC (rev 19066)
@@ -14,7 +14,7 @@
TOPSCRDIR=$6
EXEEXT=$7
-if [ ! -e src/x64$EXEEXT -o ! -e src/x128$EXEEXT -o ! -e src/xvic$EXEEXT -o ! -e src/xpet$EXEEXT -o ! -e src/xplus4$EXEEXT -o ! -e src/xcbm2$EXEEXT -o ! -e src/c1541$EXEEXT -o ! -e src/petcat$EXEEXT -o ! -e src/cartconv$EXEEXT ]
+if [ ! -e src/x64$EXEEXT -o ! -e src/x64dtv$EXEEXT -o ! -e src/x128$EXEEXT -o ! -e src/xvic$EXEEXT -o ! -e src/xpet$EXEEXT -o ! -e src/xplus4$EXEEXT -o ! -e src/xcbm2$EXEEXT -o ! -e src/c1541$EXEEXT -o ! -e src/petcat$EXEEXT -o ! -e src/cartconv$EXEEXT ]
then
echo Error: executable file\(s\) not found, do a \"make all\" first
exit 1
@@ -52,6 +52,7 @@
mkdir VICE-$AMIGAFLAVOR
if test x"$HOSTSYSTEM" != "xaros"; then
$STRIP src/x64$EXEEXT
+ $STRIP src/x64dtv$EXEEXT
$STRIP src/x128$EXEEXT
$STRIP src/xvic$EXEEXT
$STRIP src/xpet$EXEEXT
@@ -61,6 +62,7 @@
$STRIP src/petcat$EXEEXT
$STRIP src/cartconv$EXEEXT
$STRIP src/arch/amigaos/x64ns$EXEEXT
+ $STRIP src/arch/amigaos/x64dtvns$EXEEXT
$STRIP src/arch/amigaos/x128ns$EXEEXT
$STRIP src/arch/amigaos/xvicns$EXEEXT
$STRIP src/arch/amigaos/xpetns$EXEEXT
@@ -68,6 +70,7 @@
$STRIP src/arch/amigaos/xcbm2ns$EXEEXT
else
$STRIP --strip-unneeded --remove-section .comment src/x64$EXEEXT
+ $STRIP --strip-unneeded --remove-section .comment src/x64dtv$EXEEXT
$STRIP --strip-unneeded --remove-section .comment src/x128$EXEEXT
$STRIP --strip-unneeded --remove-section .comment src/xvic$EXEEXT
$STRIP --strip-unneeded --remove-section .comment src/xpet$EXEEXT
@@ -77,6 +80,7 @@
$STRIP --strip-unneeded --remove-section .comment src/petcat$EXEEXT
$STRIP --strip-unneeded --remove-section .comment src/cartconv$EXEEXT
$STRIP --strip-unneeded --remove-section .comment src/arch/amigaos/x64ns$EXEEXT
+ $STRIP --strip-unneeded --remove-section .comment src/arch/amigaos/x64dtvns$EXEEXT
$STRIP --strip-unneeded --remove-section .comment src/arch/amigaos/x128ns$EXEEXT
$STRIP --strip-unneeded --remove-section .comment src/arch/amigaos/xvicns$EXEEXT
$STRIP --strip-unneeded --remove-section .comment src/arch/amigaos/xpetns$EXEEXT
@@ -85,6 +89,7 @@
fi
if test x"$HOSTSYSTEM" = "xmorphos"; then
cp src/x64$EXEEXT VICE-$AMIGAFLAVOR/x64
+ cp src/x64dtv$EXEEXT VICE-$AMIGAFLAVOR/x64dtv
cp src/x128$EXEEXT VICE-$AMIGAFLAVOR/x128
cp src/xvic$EXEEXT VICE-$AMIGAFLAVOR/xvic
cp src/xpet$EXEEXT VICE-$AMIGAFLAVOR/xpet
@@ -94,6 +99,7 @@
cp src/petcat$EXEEXT VICE-$AMIGAFLAVOR/petcat
cp src/cartconv$EXEEXT VICE-$AMIGAFLAVOR/cartconv
cp src/arch/amigaos/x64ns$EXEEXT VICE-$AMIGAFLAVOR/x64\ \(no\ sound\)
+ cp src/arch/amigaos/x64dtvns$EXEEXT VICE-$AMIGAFLAVOR/x64dtv\ \(no\ sound\)
cp src/arch/amigaos/x128ns$EXEEXT VICE-$AMIGAFLAVOR/x128\ \(no\ sound\)
cp src/arch/amigaos/xvicns$EXEEXT VICE-$AMIGAFLAVOR/xvic\ \(no\ sound\)
cp src/arch/amigaos/xpetns$EXEEXT VICE-$AMIGAFLAVOR/xpet\ \(no\ sound\)
@@ -101,6 +107,7 @@
cp src/arch/amigaos/xcbm2ns$EXEEXT VICE-$AMIGAFLAVOR/xcbm2\ \(no\ sound\)
else
cp src/x64$EXEEXT VICE-$AMIGAFLAVOR/x64.exe
+ cp src/x64dtv$EXEEXT VICE-$AMIGAFLAVOR/x64dtv.exe
cp src/x128$EXEEXT VICE-$AMIGAFLAVOR/x128.exe
cp src/xvic$EXEEXT VICE-$AMIGAFLAVOR/xvic.exe
cp src/xpet$EXEEXT VICE-$AMIGAFLAVOR/xpet.exe
@@ -110,20 +117,21 @@
cp src/petcat$EXEEXT VICE-$AMIGAFLAVOR/petcat.exe
cp src/cartconv$EXEEXT VICE-$AMIGAFLAVOR/cartconv.exe
cp src/arch/amigaos/x64ns$EXEEXT VICE-$AMIGAFLAVOR/x64\ \(no\ sound\).exe
+ cp src/arch/amigaos/x64dtvns$EXEEXT VICE-$AMIGAFLAVOR/x64dtv\ \(no\ sound\).exe
cp src/arch/amigaos/x128ns$EXEEXT VICE-$AMIGAFLAVOR/x128\ \(no\ sound\).exe
cp src/arch/amigaos/xvicns$EXEEXT VICE-$AMIGAFLAVOR/xvic\ \(no\ sound\).exe
cp src/arch/amigaos/xpetns$EXEEXT VICE-$AMIGAFLAVOR/xpet\ \(no\ sound\).exe
cp src/arch/amigaos/xplus4ns$EXEEXT VICE-$AMIGAFLAVOR/xplus4\ \(no\ sound\).exe
cp src/arch/amigaos/xcbm2ns$EXEEXT VICE-$AMIGAFLAVOR/xcbm2\ \(no\ sound\).exe
fi
-cp -a $TOPSCRDIR/data/C128 $TOPSCRDIR/data/C64 $TOPSCRDIR/data/CBM-II $TOPSCRDIR/data/DRIVES VICE-$AMIGAFLAVOR
+cp -a $TOPSCRDIR/data/C128 $TOPSCRDIR/data/C64 $TOPSCRDIR/data/C64DTV $TOPSCRDIR/data/CBM-II $TOPSCRDIR/data/DRIVES VICE-$AMIGAFLAVOR
cp -a $TOPSCRDIR/data/PET $TOPSCRDIR/data/PLUS4 $TOPSCRDIR/data/PRINTER $TOPSCRDIR/data/VIC20 VICE-$AMIGAFLAVOR
cp -a $TOPSCRDIR/data/fonts VICE-$AMIGAFLAVOR
cp -a $TOPSCRDIR/doc/html VICE-$AMIGAFLAVOR
cp $TOPSCRDIR/FEEDBACK $TOPSCRDIR/README $TOPSCRDIR/doc/cartconv.txt VICE-$AMIGAFLAVOR
cp $TOPSCRDIR/src/arch/amigaos/README.AMIGA VICE-$AMIGAFLAVOR
if test x"$HOSTSYSTEM" = "xwarpos"; then
- for i in cartconv.exe c1541.exe petcat.exe x64.exe x128.exe xcbm2.exe \
+ for i in cartconv.exe c1541.exe petcat.exe x64.exe x64dtv.exe x128.exe xcbm2.exe \
xpet.exe xplus4.exe xvic.exe
do
elf2exe VICE-$AMIGAFLAVOR/$i VICE-$AMIGAFLAVOR/$i.new
@@ -134,6 +142,8 @@
cp $TOPSCRDIR/src/arch/amigaos/info-files/morphos/VICE.info VICE-$AMIGAFLAVOR.info
cp $TOPSCRDIR/src/arch/amigaos/info-files/morphos/x*.info VICE-$AMIGAFLAVOR
cp VICE-$AMIGAFLAVOR/x64.info VICE-$AMIGAFLAVOR/x64\ \(no\ sound\).info
+ cp VICE-$AMIGAFLAVOR/x64.info VICE-$AMIGAFLAVOR/x64dtv.info
+ cp VICE-$AMIGAFLAVOR/x64.info VICE-$AMIGAFLAVOR/x64dtv\ \(no\ sound\).info
cp VICE-$AMIGAFLAVOR/x128.info VICE-$AMIGAFLAVOR/x128\ \(no\ sound\).info
cp VICE-$AMIGAFLAVOR/xvic.info VICE-$AMIGAFLAVOR/xvic\ \(no\ sound\).info
cp VICE-$AMIGAFLAVOR/xpet.info VICE-$AMIGAFLAVOR/xpet\ \(no\ sound\).info
@@ -143,6 +153,8 @@
cp $TOPSCRDIR/src/arch/amigaos/info-files/VICE.info VICE-$AMIGAFLAVOR.info
cp $TOPSCRDIR/src/arch/amigaos/info-files/*.exe.info VICE-$AMIGAFLAVOR
cp VICE-$AMIGAFLAVOR/x64.exe.info VICE-$AMIGAFLAVOR/x64\ \(no\ sound\).exe.info
+ cp VICE-$AMIGAFLAVOR/x64.exe.info VICE-$AMIGAFLAVOR/x64dtv.exe.info
+ cp VICE-$AMIGAFLAVOR/x64.exe.info VICE-$AMIGAFLAVOR/x64dtv\ \(no\ sound\).exe.info
cp VICE-$AMIGAFLAVOR/x128.exe.info VICE-$AMIGAFLAVOR/x128\ \(no\ sound\).exe.info
cp VICE-$AMIGAFLAVOR/xvic.exe.info VICE-$AMIGAFLAVOR/xvic\ \(no\ sound\).exe.info
cp VICE-$AMIGAFLAVOR/xpet.exe.info VICE-$AMIGAFLAVOR/xpet\ \(no\ sound\).exe.info
Added: branches/viceplus/v2.0-x64dtv/vice/src/arch/amigaos/mui/uic64dtv.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/amigaos/mui/uic64dtv.c (rev 0)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/amigaos/mui/uic64dtv.c 2008-07-21 20:59:16 UTC (rev 19066)
@@ -0,0 +1,156 @@
+/*
+ * uic64dtv.c
+ *
+ * Written by
+ * Marco van den Heuvel <bla...@ya...>
+ *
+ * This file is part of VICE, the Versatile Commodore Emulator.
+ * See README for copyright notice.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ * 02111-1307 USA.
+ *
+ */
+
+#include "vice.h"
+#ifdef AMIGA_M68K
+#define _INLINE_MUIMASTER_H
+#endif
+#include "mui.h"
+
+#include "uic64dtv.h"
+#include "intl.h"
+#include "translate.h"
+
+static video_canvas_t *c64dtv_canvas;
+
+static int ui_c64dtv_enable_translate[] = {
+ IDMS_DISABLED,
+ IDS_ENABLED,
+ 0
+};
+
+static char *ui_c64dtv_enable[countof(ui_c64dtv_enable_translate)];
+
+
+static const int ui_c64dtv_enable_values[] = {
+ 0,
+ 1,
+ -1
+};
+
+static char *ui_c64dtv_revision[] = {
+ "DTV2",
+ "DTV3",
+ NULL
+};
+
+static const int ui_c64dtv_revision_values[] = {
+ 2,
+ 3,
+ -1
+};
+
+static char *ui_c64dtv_hummer_joy_port[] = {
+ "Joy1",
+ "Joy2",
+ NULL
+};
+
+static const int ui_c64dtv_hummer_joy_port_values[] = {
+ 1,
+ 2,
+ -1
+};
+
+static ui_to_from_t ui_to_from[] = {
+ { NULL, MUI_TYPE_FILENAME, "c64dtvromfilename", NULL, NULL },
+ { NULL, MUI_TYPE_CYCLE, "DtvRevision", ui_c64dtv_revision, ui_c64dtv_revision_values },
+ { NULL, MUI_TYPE_CYCLE, "c64dtvromrw", ui_c64dtv_enable, ui_c64dtv_enable_values },
+ { NULL, MUI_TYPE_CYCLE, "HummerUserportJoy", ui_c64dtv_enable, ui_c64dtv_enable_values },
+ { NULL, MUI_TYPE_CYCLE, "HummerUserportJoyPort", ui_c64dtv_hummer_joy_port, ui_c64dtv_hummer_joy_port_values },
+ UI_END /* mandatory */
+};
+
+static ULONG Browse( struct Hook *hook, Object *obj, APTR arg )
+{
+ char *fname=NULL;
+
+ fname=BrowseFile(translate_text(IDS_C64DTV_ROM_FILENAME_SELECT), "#?", c64dtv_canvas);
+
+ if (fname!=NULL)
+ set(ui_to_from[0].object, MUIA_String_Contents, fname);
+
+ return 0;
+}
+
+static APTR build_gui(void)
+{
+ APTR app, ui, ok, browse_button, cancel;
+
+#ifdef AMIGA_MORPHOS
+ static const struct Hook BrowseFileHook = { { NULL,NULL },(VOID *)HookEntry,(VOID *)Browse, NULL};
+#else
+ static const struct Hook BrowseFileHook = { { NULL,NULL },(VOID *)Browse,NULL,NULL };
+#endif
+
+ app = mui_get_app();
+
+ ui = GroupObject,
+ FILENAME(ui_to_from[0].object, translate_text(IDS_C64DTV_ROM_FILENAME), browse_button)
+ CYCLE(ui_to_from[1].object, translate_text(IDS_C64DTV_REVISION), ui_c64dtv_revision)
+ CYCLE(ui_to_from[2].object, translate_text(IDS_C64DTV_WRITE_ENABLE), ui_c64dtv_enable)
+ CYCLE(ui_to_from[3].object, translate_text(IDS_C64DTV_HUMMER_JOY_ENABLE), ui_c64dtv_enable)
+ CYCLE(ui_to_from[4].object, translate_text(IDS_C64DTV_HUMMER_JOY_PORT), ui_c64dtv_hummer_joy_port)
+
+ OK_CANCEL_BUTTON
+ End;
+
+ if (ui != NULL) {
+ DoMethod(cancel,
+ MUIM_Notify, MUIA_Pressed, FALSE,
+ app, 2, MUIM_Application_ReturnID, MUIV_Application_ReturnID_Quit);
+
+ DoMethod(ok, MUIM_Notify, MUIA_Pressed, FALSE,
+ app, 2, MUIM_Application_ReturnID, BTN_OK);
+
+ DoMethod(browse_button, MUIM_Notify, MUIA_Pressed, FALSE,
+ app, 2, MUIM_CallHook, &BrowseFileHook);
+ }
+
+ return ui;
+}
+
+void ui_c64dtv_settings_dialog(video_canvas_t *canvas)
+{
+ APTR window;
+
+ c64dtv_canvas=canvas;
+ intl_convert_mui_table(ui_c64dtv_enable_translate, ui_c64dtv_enable);
+
+ window = mui_make_simple_window(build_gui(), translate_text(IDS_C64DTV_SETTINGS));
+
+ if (window != NULL) {
+ mui_add_window(window);
+ ui_get_to(ui_to_from);
+ set(window, MUIA_Window_Open, TRUE);
+ if (mui_run() == BTN_OK) {
+ ui_get_from(ui_to_from);
+ }
+ set(window, MUIA_Window_Open, FALSE);
+ mui_rem_window(window);
+ MUI_DisposeObject(window);
+ }
+}
Property changes on: branches/viceplus/v2.0-x64dtv/vice/src/arch/amigaos/mui/uic64dtv.c
___________________________________________________________________
Added: svn:executable
+ *
Added: branches/viceplus/v2.0-x64dtv/vice/src/arch/amigaos/mui/uic64dtv.h
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/amigaos/mui/uic64dtv.h (rev 0)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/amigaos/mui/uic64dtv.h 2008-07-21 20:59:16 UTC (rev 19066)
@@ -0,0 +1,32 @@
+/*
+ * uic64dtv.h
+ *
+ * Written by
+ * Marco van den Heuvel <bla...@ya...>
+ *
+ * This file is part of VICE, the Versatile Commodore Emulator.
+ * See README for copyright notice.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ * 02111-1307 USA.
+ *
+ */
+
+#ifndef _UIC64DTV_H
+#define _UIC64DTV_H
+
+extern void ui_c64dtv_settings_dialog(video_canvas_t *canvas);
+
+#endif
Property changes on: branches/viceplus/v2.0-x64dtv/vice/src/arch/amigaos/mui/uic64dtv.h
___________________________________________________________________
Added: svn:executable
+ *
Modified: branches/viceplus/v2.0-x64dtv/vice/src/arch/amigaos/uires.h
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/amigaos/uires.h 2008-07-21 20:44:51 UTC (rev 19065)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/amigaos/uires.h 2008-07-21 20:59:16 UTC (rev 19066)
@@ -92,6 +92,7 @@
IDM_SYNC_FACTOR_NTSCOLD,
IDM_TOGGLE_EMUID,
IDM_MOUSE,
+ IDM_PS2_MOUSE,
IDM_VIDEO_SETTINGS, IDM_DEVICEMANAGER, IDM_DRIVE_SETTINGS,
IDM_DATASETTE_SETTINGS, IDM_VICII_SETTINGS, IDM_JOY_SETTINGS,
@@ -105,6 +106,7 @@
IDM_PLUS4_SETTINGS, IDM_TFE_SETTINGS, IDM_ACIA_SETTINGS,
IDM_RS232USER_SETTINGS, IDM_NETWORK_SETTINGS, IDM_PETREU_SETTINGS,
IDM_MMC64_SETTINGS, IDM_SIDCART_SETTINGS, IDM_DIGIMAX_SETTINGS,
+ IDM_C64DTV_SETTINGS,
IDM_SETTINGS_SAVE, IDM_SETTINGS_LOAD, IDM_SETTINGS_DEFAULT,
IDM_TOGGLE_SAVE_SETTINGS_ON_EXIT, IDM_TOGGLE_CONFIRM_ON_EXIT,
Added: branches/viceplus/v2.0-x64dtv/vice/src/arch/amigaos/x64dtvns.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/amigaos/x64dtvns.c (rev 0)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/amigaos/x64dtvns.c 2008-07-21 20:59:16 UTC (rev 19066)
@@ -0,0 +1,33 @@
+/*
+ * x64dtvns.c - No Sound x64dtv launcher.
+ *
+ * Written by
+ * Marco van den Heuvel <bla...@ya...>
+ *
+ * This file is part of VICE, the Versatile Commodore Emulator.
+ * See README for copyright notice.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ * 02111-1307 USA.
+ *
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+
+int main(void)
+{
+ return system("x64dtv.exe -sounddev dummy");
+}
Property changes on: branches/viceplus/v2.0-x64dtv/vice/src/arch/amigaos/x64dtvns.c
___________________________________________________________________
Added: svn:executable
+ *
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ama...@us...> - 2008-07-21 20:44:44
|
Revision: 19065
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=19065&view=rev
Author: amatthies
Date: 2008-07-21 20:44:51 +0000 (Mon, 21 Jul 2008)
Log Message:
-----------
Updated MSVC project files to compile x64dtv.
Modified Paths:
--------------
branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/Makefile.am
branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/arch.dsp
branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/monitor.dsp
branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/vice.dsw
branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/vicii.dsp
Added Paths:
-----------
branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/c64c64dtv.dsp
branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/c64dtv.dsp
branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/c64dtvstubs.dsp
branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/viciidtv.dsp
branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/x64dtv.dsp
Modified: branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/Makefile.am
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/Makefile.am 2008-07-21 16:34:58 UTC (rev 19064)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/Makefile.am 2008-07-21 20:44:51 UTC (rev 19065)
@@ -318,6 +318,9 @@
c128.dsp \
c1541.dsp \
c64.dsp \
+ c64c64dtv.dsp \
+ c64dtv.dsp \
+ c64dtvstubs.dsp \
c64c128.dsp \
c64cart.dsp \
c64exp.dsp \
@@ -365,9 +368,11 @@
vdrive.dsp \
vic20.dsp \
vicii.dsp \
+ viciidtv.dsp \
video.dsp \
x128.dsp \
x64.dsp \
+ x64dtv.dsp \
xcbm2.dsp \
xpet.dsp \
xplus4.dsp \
Modified: branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/arch.dsp
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/arch.dsp 2008-07-21 16:34:58 UTC (rev 19064)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/arch.dsp 2008-07-21 20:44:51 UTC (rev 19065)
@@ -41,7 +41,7 @@
# PROP Intermediate_Dir "libs\arch\Release"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I ".\msvc" /I ".\\" /I "..\..\\" /I "..\..\drive" /I "..\..\vdrive" /I "..\..\c64" /I "..\..\c128" /I "..\..\vic20" /I "..\..\pet" /I "..\..\cbm2" /I "..\..\raster" /I "..\..\monitor" /I "..\..\lib\libffmpeg" /I "..\..\plus4" /I "..\..\sid" /I ".\msvc\wpcap" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I ".\msvc" /I ".\\" /I "..\..\\" /I "..\..\drive" /I "..\..\vdrive" /I "..\..\c64" /I "..\..\c64dtv" /I "..\..\c128" /I "..\..\vic20" /I "..\..\pet" /I "..\..\cbm2" /I "..\..\raster" /I "..\..\monitor" /I "..\..\lib\libffmpeg" /I "..\..\plus4" /I "..\..\sid" /I ".\msvc\wpcap" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
# ADD BASE RSC /l 0x409
# ADD RSC /l 0x409
BSC32=bscmake.exe
@@ -64,7 +64,7 @@
# PROP Intermediate_Dir "libs\arch\Debug"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /Z7 /Od /I ".\msvc" /I ".\\" /I "..\..\\" /I "..\..\drive" /I "..\..\vdrive" /I "..\..\c64" /I "..\..\c128" /I "..\..\vic20" /I "..\..\pet" /I "..\..\cbm2" /I "..\..\raster" /I "..\..\monitor" /I "..\..\lib\libffmpeg" /I "..\..\plus4" /I "..\..\sid" /I ".\msvc\wpcap" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /Z7 /Od /I ".\msvc" /I ".\\" /I "..\..\\" /I "..\..\drive" /I "..\..\vdrive" /I "..\..\c64" /I "..\..\c64dtv" /I "..\..\c128" /I "..\..\vic20" /I "..\..\pet" /I "..\..\cbm2" /I "..\..\raster" /I "..\..\monitor" /I "..\..\lib\libffmpeg" /I "..\..\plus4" /I "..\..\sid" /I ".\msvc\wpcap" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
# ADD BASE RSC /l 0x409
# ADD RSC /l 0x409
BSC32=bscmake.exe
@@ -98,6 +98,10 @@
# End Source File
# Begin Source File
+SOURCE=.\c64dtvui.c
+# End Source File
+# Begin Source File
+
SOURCE=.\catweaselmkiii.c
# End Source File
# Begin Source File
@@ -243,6 +247,10 @@
# End Source File
# Begin Source File
+SOURCE=.\uic64dtv.c
+# End Source File
+# Begin Source File
+
SOURCE=.\uicart.c
# End Source File
# Begin Source File
Added: branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/c64c64dtv.dsp
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/c64c64dtv.dsp (rev 0)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/c64c64dtv.dsp 2008-07-21 20:44:51 UTC (rev 19065)
@@ -0,0 +1,128 @@
+# Microsoft Developer Studio Project File - Name="c64c64dtv" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=c64c64dtv - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "c64c64dtv.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "c64c64dtv.mak" CFG="c64c64dtv - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "c64c64dtv - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "c64c64dtv - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "c64c64dtv - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "libs\c64c64dtv\Release"
+# PROP Intermediate_Dir "libs\c64c64dtv\Release"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I ".\msvc" /I ".\\" /I "..\..\\" /I "..\..\drive" /I "..\..\tape" /I "..\..\sid" /I "..\..\vicii" /I "..\..\raster" /I "..\..\monitor" /I "..\..\rs232drv" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF "$(CFG)" == "c64c64dtv - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "libs\c64c64dtv\Debug"
+# PROP Intermediate_Dir "libs\c64c64dtv\Debug"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /Z7 /Od /I ".\msvc" /I ".\\" /I "..\..\\" /I "..\..\drive" /I "..\..\tape" /I "..\..\sid" /I "..\..\vicii" /I "..\..\raster" /I "..\..\monitor" /I "..\..\rs232drv" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ENDIF
+
+# Begin Target
+
+# Name "c64c64dtv - Win32 Release"
+# Name "c64c64dtv - Win32 Debug"
+# Begin Source File
+
+SOURCE=..\..\c64\c64bus.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\c64\c64drive.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\c64\c64fastiec.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\c64\c64keyboard.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\c64\c64parallel.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\c64\c64printer.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\c64\c64rom.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\c64\c64romset.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\c64\c64rsuser.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\c64\c64video.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\c64\patchrom.c
+# End Source File
+# End Target
+# End Project
Added: branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/c64dtv.dsp
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/c64dtv.dsp (rev 0)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/c64dtv.dsp 2008-07-21 20:44:51 UTC (rev 19065)
@@ -0,0 +1,160 @@
+# Microsoft Developer Studio Project File - Name="c64dtv" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=c64dtv - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "c64dtv.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "c64dtv.mak" CFG="c64dtv - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "c64dtv - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "c64dtv - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "c64dtv - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "libs\c64dtv\Release"
+# PROP Intermediate_Dir "libs\c64dtv\Release"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I ".\msvc" /I ".\\" /I "..\..\\" /I "..\..\drive" /I "..\..\tape" /I "..\..\sid" /I "..\..\vicii" /I "..\..\c64" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF "$(CFG)" == "c64dtv - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "libs\c64dtv\Debug"
+# PROP Intermediate_Dir "libs\c64dtv\Debug"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /Z7 /Od /I ".\msvc" /I ".\\" /I "..\..\\" /I "..\..\drive" /I "..\..\tape" /I "..\..\sid" /I "..\..\vicii" /I "..\..\c64" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ENDIF
+
+# Begin Target
+
+# Name "c64dtv - Win32 Release"
+# Name "c64dtv - Win32 Debug"
+# Begin Source File
+
+SOURCE="..\..\c64dtv\c64dtvmemsnapshot.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\c64dtv\c64dtvmem.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\c64dtv\c64dtvmemrom.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\c64dtv\c64dtvcpu.c"
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\c64dtv\c64dtvblitter.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\c64dtv\c64dtvdma.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\c64dtv\c64dtvflash.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\c64dtv\c64dtv-cmdline-options.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\c64dtv\c64dtv-resources.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\c64dtv\c64dtv-snapshot.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\c64dtv\c64dtv.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\c64dtv\c64dtvcia1.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\c64dtv\c64dtvcia2.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\c64dtv\c64dtviec.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\c64dtv\c64dtvmeminit.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\c64dtv\c64dtvpla.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\c64dtv\c64dtvsound.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\c64dtv\flash-trap.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\c64dtv\hummeradc.c
+# End Source File
+# End Target
+# End Project
Added: branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/c64dtvstubs.dsp
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/c64dtvstubs.dsp (rev 0)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/c64dtvstubs.dsp 2008-07-21 20:44:51 UTC (rev 19065)
@@ -0,0 +1,92 @@
+# Microsoft Developer Studio Project File - Name="c64dtvstubs" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=c64dtvstubs - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "c64dtvstubs.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "c64dtvstubs.mak" CFG="c64dtvstubs - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "c64dtvstubs - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "c64dtvstubs - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "c64dtvstubs - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "libs\c64dtv\Release"
+# PROP Intermediate_Dir "libs\c64dtv\Release"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I ".\msvc" /I ".\\" /I "..\..\\" /I "..\..\drive" /I "..\..\tape" /I "..\..\sid" /I "..\..\vicii" /I "..\..\c64" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF "$(CFG)" == "c64dtvstubs - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "libs\c64dtv\Debug"
+# PROP Intermediate_Dir "libs\c64dtv\Debug"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /Z7 /Od /I ".\msvc" /I ".\\" /I "..\..\\" /I "..\..\drive" /I "..\..\tape" /I "..\..\sid" /I "..\..\vicii" /I "..\..\c64" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ENDIF
+
+# Begin Target
+
+# Name "c64dtvstubs - Win32 Release"
+# Name "c64dtvstubs - Win32 Debug"
+# Begin Source File
+
+SOURCE="..\..\c64dtv\c64dtvcart.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\c64dtv\c64dtvtfe.c"
+# End Source File
+# End Target
+# End Project
Modified: branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/monitor.dsp
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/monitor.dsp 2008-07-21 16:34:58 UTC (rev 19064)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/monitor.dsp 2008-07-21 20:44:51 UTC (rev 19065)
@@ -86,6 +86,10 @@
# End Source File
# Begin Source File
+SOURCE=..\..\monitor\asm6502dtv.c
+# End Source File
+# Begin Source File
+
SOURCE=..\..\monitor\asmz80.c
# End Source File
# Begin Source File
@@ -142,6 +146,10 @@
# End Source File
# Begin Source File
+SOURCE=..\..\monitor\mon_register6502dtv.c
+# End Source File
+# Begin Source File
+
SOURCE=..\..\monitor\mon_registerz80.c
# End Source File
# Begin Source File
Modified: branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/vice.dsw
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/vice.dsw 2008-07-21 16:34:58 UTC (rev 19064)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/vice.dsw 2008-07-21 20:44:51 UTC (rev 19065)
@@ -15,6 +15,9 @@
Project_Dep_Name x64
End Project Dependency
Begin Project Dependency
+ Project_Dep_Name x64dtv
+ End Project Dependency
+ Begin Project Dependency
Project_Dep_Name x128
End Project Dependency
Begin Project Dependency
@@ -165,6 +168,21 @@
###############################################################################
+Project: "c64c64dtv"=".\c64c64dtv.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+ Begin Project Dependency
+ Project_Dep_Name base
+ End Project Dependency
+}}}
+
+###############################################################################
+
Project: "c64cart"=".\c64cart.dsp" - Package Owner=<4>
Package=<5>
@@ -180,6 +198,36 @@
###############################################################################
+Project: "c64dtv"=".\c64dtv.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+ Begin Project Dependency
+ Project_Dep_Name base
+ End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "c64dtvstubs"=".\c64dtvstubs.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+ Begin Project Dependency
+ Project_Dep_Name base
+ End Project Dependency
+}}}
+
+###############################################################################
+
Project: "c64exp"=".\c64exp.dsp" - Package Owner=<4>
Package=<5>
@@ -727,6 +775,21 @@
End Project Dependency
}}}
+##############################################################################
+
+Project: "viciidtv"=".\viciidtv.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+ Begin Project Dependency
+ Project_Dep_Name base
+ End Project Dependency
+}}}
+
###############################################################################
Project: "video"=".\video.dsp" - Package Owner=<4>
@@ -963,6 +1026,117 @@
###############################################################################
+Project: "x64dtv"=".\x64dtv.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+ Begin Project Dependency
+ Project_Dep_Name arch
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name base
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name c64c64dtv
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name c64dtv
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name c64dtvstubs
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name drive
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name fileio
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name fsdevice
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name gfxoutputdrv
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name iec
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name c64exp
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name iecieee
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name ieee
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name parallel
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name png
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name printerdrv
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name resid
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name rs232drv
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name serial
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name sid
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name sounddrv
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name viciidtv
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name raster
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name vdrive
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name video
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name monitor
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name c64cart
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name diskimage
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name tape
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name imagecontents
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name core
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name iecbus
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name zlib
+ End Project Dependency
+}}}
+
+###############################################################################
+
Project: "xcbm2"=".\xcbm2.dsp" - Package Owner=<4>
Package=<5>
Modified: branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/vicii.dsp
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/vicii.dsp 2008-07-21 16:34:58 UTC (rev 19064)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/vicii.dsp 2008-07-21 20:44:51 UTC (rev 19065)
@@ -41,7 +41,7 @@
# PROP Intermediate_Dir "libs\vicii\Release"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I ".\msvc" /I ".\\" /I "..\..\\" /I "..\..\c64" /I "..\..\raster" /I "..\..\video" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I ".\msvc" /I ".\\" /I "..\..\\" /I "..\..\c64" /I "..\..\c64dtv" /I "..\..\raster" /I "..\..\video" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
# ADD BASE RSC /l 0x409
# ADD RSC /l 0x409
BSC32=bscmake.exe
@@ -64,7 +64,7 @@
# PROP Intermediate_Dir "libs\vicii\Debug"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /Z7 /Od /I ".\msvc" /I ".\\" /I "..\..\\" /I "..\..\c64" /I "..\..\raster" /I "..\..\video" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /Z7 /Od /I ".\msvc" /I ".\\" /I "..\..\\" /I "..\..\c64" /I "..\..\c64dtv" /I "..\..\raster" /I "..\..\video" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
# ADD BASE RSC /l 0x409
# ADD RSC /l 0x409
BSC32=bscmake.exe
@@ -130,6 +130,10 @@
# End Source File
# Begin Source File
+SOURCE="..\..\vicii\vicii-stubs.c"
+# End Source File
+# Begin Source File
+
SOURCE="..\..\vicii\vicii-timing.c"
# End Source File
# Begin Source File
Added: branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/viciidtv.dsp
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/viciidtv.dsp (rev 0)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/viciidtv.dsp 2008-07-21 20:44:51 UTC (rev 19065)
@@ -0,0 +1,136 @@
+# Microsoft Developer Studio Project File - Name="viciidtv" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=viciidtv - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "viciidtv.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "viciidtv.mak" CFG="viciidtv - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "viciidtv - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "viciidtv - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "viciidtv - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "libs\viciidtv\Release"
+# PROP Intermediate_Dir "libs\viciidtv\Release"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I ".\msvc" /I ".\\" /I "..\..\\" /I "..\..\c64" /I "..\..\c64dtv" /I "..\..\raster" /I "..\..\video" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF "$(CFG)" == "viciidtv - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "libs\viciidtv\Debug"
+# PROP Intermediate_Dir "libs\viciidtv\Debug"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /Z7 /Od /I ".\msvc" /I ".\\" /I "..\..\\" /I "..\..\c64" /I "..\..\c64dtv" /I "..\..\raster" /I "..\..\video" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ENDIF
+
+# Begin Target
+
+# Name "viciidtv - Win32 Release"
+# Name "viciidtv - Win32 Debug"
+# Begin Source File
+
+SOURCE="..\..\vicii\vicii-badline.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\vicii\vicii-cmdline-options.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\vicii\viciidtv-color.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\vicii\viciidtv-draw.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\vicii\vicii-fetch.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\vicii\vicii-irq.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\vicii\vicii-mem.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\vicii\vicii-phi1.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\vicii\vicii-resources.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\vicii\viciidtv-snapshot.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\vicii\vicii-sprites.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\vicii\vicii-timing.c"
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\vicii\vicii.c
+# End Source File
+# End Target
+# End Project
Added: branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/x64dtv.dsp
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/x64dtv.dsp (rev 0)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/x64dtv.dsp 2008-07-21 20:44:51 UTC (rev 19065)
@@ -0,0 +1,138 @@
+# Microsoft Developer Studio Project File - Name="x64dtv" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Application" 0x0101
+
+CFG=x64dtv - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "x64dtv.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "x64dtv.mak" CFG="x64dtv - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "x64dtv - Win32 Release" (based on "Win32 (x86) Application")
+!MESSAGE "x64dtv - Win32 Debug" (based on "Win32 (x86) Application")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "x64dtv - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\..\data"
+# PROP Intermediate_Dir "libs\x64dtv\Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I ".\msvc" /I ".\\" /I "..\..\\" /I "..\..\drive" /I "..\..\vdrive" /I "..\..\monitor" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /i ".\MSVC" /i ".\\" /i "..\..\\" /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /subsystem:windows /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib comdlg32.lib advapi32.lib shell32.lib comctl32.lib winmm.lib ddraw.lib dsound.lib dinput.lib dxguid.lib wsock32.lib version.lib /nologo /subsystem:windows /machine:I386
+
+!ELSEIF "$(CFG)" == "x64dtv - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\..\data"
+# PROP Intermediate_Dir "libs\x64dtv\Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /Z7 /Od /I ".\msvc" /I ".\\" /I "..\..\\" /I "..\..\drive" /I "..\..\vdrive" /I "..\..\monitor" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /i ".\MSVC" /i ".\\" /i "..\..\\" /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 dxguid.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib advapi32.lib shell32.lib comctl32.lib winmm.lib ddraw.lib dsound.lib dinput.lib wsock32.lib version.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
+
+!ENDIF
+
+# Begin Target
+
+# Name "x64dtv - Win32 Release"
+# Name "x64dtv - Win32 Debug"
+# Begin Source File
+
+SOURCE=..\..\main.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\ps2mouse.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\resc64dtv.rc
+
+!IF "$(CFG)" == "x64dtv - Win32 Release"
+
+# PROP Ignore_Default_Tool 1
+USERDEP__RESC6="resc64dtv.rc" "res.rc" "resdrivec64.rc" "ressid.rc" "resvicii.rc"
+# Begin Custom Build
+InputPath=.\resc64dtv.rc
+
+"resc64dtvcat.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy /b resc64dtv.rc + res.rc + resdrivec64.rc + ressid.rc + resvicii.rc resc64dtvcat.rc /b
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "x64dtv - Win32 Debug"
+
+# PROP Ignore_Default_Tool 1
+USERDEP__RESC6="resc64dtv.rc" "res.rc" "resdrivec64.rc" "ressid.rc" "resvicii.rc"
+# Begin Custom Build
+InputPath=.\resc64dtv.rc
+
+"resc64dtvcat.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy /b resc64dtv.rc + res.rc + resdrivec64.rc + ressid.rc + resvicii.rc resc64dtvcat.rc /b
+
+# End Custom Build
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\resc64dtvcat.rc
+# End Source File
+# Begin Source File
+
+SOURCE=.\vice.manifest
+# End Source File
+# End Target
+# End Project
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bla...@us...> - 2008-07-21 16:34:50
|
Revision: 19064
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=19064&view=rev
Author: blackystardust
Date: 2008-07-21 16:34:58 +0000 (Mon, 21 Jul 2008)
Log Message:
-----------
Added win32 x64dtv UI.
Modified Paths:
--------------
branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/Makefile.am
branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/intl.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/make-bindist.sh
branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/resc64dtv.rc
branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/resdialogs.txt
branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/resmenu.txt
branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/ui.c
Added Paths:
-----------
branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/c64dtvui.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/uic64dtv.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/uic64dtv.h
Modified: branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/Makefile.am
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/Makefile.am 2008-07-21 16:33:00 UTC (rev 19063)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/Makefile.am 2008-07-21 16:34:58 UTC (rev 19064)
@@ -17,6 +17,7 @@
-I$(top_srcdir)/src/vdrive \
-I$(top_srcdir)/src/monitor \
-I$(top_srcdir)/src/c64 \
+ -I$(top_srcdir)/src/c64dtv \
-I$(top_srcdir)/src/c128 \
-I$(top_srcdir)/src/vic20 \
-I$(top_srcdir)/src/pet \
@@ -34,6 +35,7 @@
blockdev.c \
c128ui.c \
c64ui.c \
+ c64dtvui.c \
catweaselmkiii.c \
cbm2ui.c \
console.c \
@@ -61,6 +63,7 @@
resacia.rc \
resc128.rc \
resc64.rc \
+ resc64dtv.rc \
resc64_256k.rc \
rescbm2.rc \
rescommon.h \
@@ -107,6 +110,8 @@
uic64_256k.h \
uic64cart.c \
uic64cart.h \
+ uic64dtv.c \
+ uic64dtv.h \
uicart.c \
uicart.h \
uicbm2set.c \
@@ -208,7 +213,7 @@
winmain.h
libarch_a_DEPENDENCIES = \
- resc128.o resc64.o rescbm2.o respet.o resplus4.o resvic20.o
+ resc128.o resc64.o resc64dtv.o rescbm2.o respet.o resplus4.o resvic20.o
EXTRA_DIST = \
evc/config.h \
@@ -425,6 +430,17 @@
$(WINDRES) -i resc64.res -o $@
rm -f resc64.res resc64cat.rc
+resc64dtv.o : $(srcdir)/resc64dtv.rc $(srcdir)/res.rc res.h $(srcdir)/ressid.rc \
+ $(srcdir)/resvicii.rc $(srcdir)/resdrivec64.rc
+ cat >resc64dtvcat.rc $(srcdir)/resc64dtv.rc $(srcdir)/res.rc \
+ $(srcdir)/resdrivec64.rc $(srcdir)/ressid.rc $(srcdir)/resvicii.rc
+ $(WRC) -i resc64dtvcat.rc -o resc64dtv.res \
+ --include-dir $(top_builddir)/src \
+ --include-dir $(top_srcdir)/src/arch/win32 \
+ --include-dir $(top_srcdir)/src
+ $(WINDRES) -i resc64dtv.res -o $@
+ rm -f resc64dtv.res resc64catdtv.rc
+
rescbm2.o : $(srcdir)/rescbm2.rc $(srcdir)/res.rc res.h $(srcdir)/resacia.rc \
$(srcdir)/ressid.rc $(srcdir)/resdrivepetcbm2.rc $(srcdir)/resvicii.rc
cat >rescbm2cat.rc $(srcdir)/rescbm2.rc $(srcdir)/res.rc \
Added: branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/c64dtvui.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/c64dtvui.c (rev 0)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/c64dtvui.c 2008-07-21 16:34:58 UTC (rev 19064)
@@ -0,0 +1,162 @@
+/*
+ * c64ui.c - C64-specific user interface.
+ *
+ * Written by
+ * Andreas Boose <vic...@t-...>
+ * Ettore Perazzoli <et...@co...>
+ * Tibor Biczo <cr...@ax...>
+ *
+ * This file is part of VICE, the Versatile Commodore Emulator.
+ * See README for copyright notice.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ * 02111-1307 USA.
+ *
+ */
+
+#include "vice.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <windows.h>
+
+#include "c64ui.h"
+#include "res.h"
+#include "translate.h"
+#include "ui.h"
+#include "uic64dtv.h"
+#include "uidrivec64.h"
+#include "uikeyboard.h"
+#include "uirom.h"
+#include "uirs232user.h"
+#include "uisid.h"
+#include "uivicii.h"
+#include "uivideo.h"
+
+static const unsigned int romset_dialog_resources[UIROM_TYPE_MAX] = {
+ IDD_C64ROM_RESOURCE_DIALOG,
+ IDD_C64ROMDRIVE_RESOURCE_DIALOG,
+ 0 };
+
+
+static const ui_menu_toggle_t c64dtv_ui_menu_toggles[] = {
+ { "EmuID", IDM_TOGGLE_EMUID },
+ { "VICIIDoubleSize", IDM_TOGGLE_DOUBLESIZE },
+ { "VICIIDoubleScan", IDM_TOGGLE_DOUBLESCAN },
+ { "VICIIScale2x", IDM_TOGGLE_SCALE2X },
+ { "PALEmulation", IDM_TOGGLE_FASTPAL },
+ { "VICIIVideoCache", IDM_TOGGLE_VIDEOCACHE },
+ { "PS2Mouse", IDM_PS2MOUSE },
+ { "Mouse", IDM_MOUSE },
+ { "FlashTrueFS", IDM_TOGGLE_FLASH_TRUE_FILESYSTEM },
+ { NULL, 0 }
+};
+
+static const uirom_settings_t uirom_settings[] = {
+ { UIROM_TYPE_MAIN, TEXT("Kernal"), "KernalName",
+ IDC_C64ROM_KERNAL_FILE, IDC_C64ROM_KERNAL_BROWSE,
+ IDC_C64ROM_KERNAL_RESOURCE },
+ { UIROM_TYPE_MAIN, TEXT("Basic"), "BasicName",
+ IDC_C64ROM_BASIC_FILE, IDC_C64ROM_BASIC_BROWSE,
+ IDC_C64ROM_BASIC_RESOURCE },
+ { UIROM_TYPE_MAIN, TEXT("Character"), "ChargenName",
+ IDC_C64ROM_CHARGEN_FILE, IDC_C64ROM_CHARGEN_BROWSE,
+ IDC_C64ROM_CHARGEN_RESOURCE },
+ { UIROM_TYPE_DRIVE, TEXT("1541"), "DosName1541",
+ IDC_DRIVEROM_1541_FILE, IDC_DRIVEROM_1541_BROWSE,
+ IDC_DRIVEROM_1541_RESOURCE },
+ { UIROM_TYPE_DRIVE, TEXT("1541-II"), "DosName1541ii",
+ IDC_DRIVEROM_1541II_FILE, IDC_DRIVEROM_1541II_BROWSE,
+ IDC_DRIVEROM_1541II_RESOURCE },
+ { UIROM_TYPE_DRIVE, TEXT("1570"), "DosName1570",
+ IDC_DRIVEROM_1570_FILE, IDC_DRIVEROM_1570_BROWSE,
+ IDC_DRIVEROM_1570_RESOURCE },
+ { UIROM_TYPE_DRIVE, TEXT("1571"), "DosName1571",
+ IDC_DRIVEROM_1571_FILE, IDC_DRIVEROM_1571_BROWSE,
+ IDC_DRIVEROM_1571_RESOURCE },
+ { UIROM_TYPE_DRIVE, TEXT("1581"), "DosName1581",
+ IDC_DRIVEROM_1581_FILE, IDC_DRIVEROM_1581_BROWSE,
+ IDC_DRIVEROM_1581_RESOURCE },
+ { 0, NULL, NULL, 0, 0, 0 }
+};
+
+#define C64DTVUI_KBD_NUM_MAP 3
+
+static const uikeyboard_mapping_entry_t mapping_entry[C64DTVUI_KBD_NUM_MAP] = {
+ { IDC_C64KBD_MAPPING_SELECT_SYM, IDC_C64KBD_MAPPING_SYM,
+ IDC_C64KBD_MAPPING_SYM_BROWSE, "KeymapSymFile" },
+ { IDC_C64KBD_MAPPING_SELECT_POS, IDC_C64KBD_MAPPING_POS,
+ IDC_C64KBD_MAPPING_POS_BROWSE, "KeymapPosFile" },
+ { IDC_C64KBD_MAPPING_SELECT_SYMDE, IDC_C64KBD_MAPPING_SYMDE,
+ IDC_C64KBD_MAPPING_SYMDE_BROWSE, "KeymapSymDeFile" }
+};
+
+static uikeyboard_config_t uikeyboard_config =
+ { IDD_C64KBD_MAPPING_SETTINGS_DIALOG, C64DTVUI_KBD_NUM_MAP, mapping_entry,
+ IDC_C64KBD_MAPPING_DUMP };
+
+
+static void c64dtv_ui_specific(WPARAM wparam, HWND hwnd)
+{
+ switch (wparam) {
+ case IDM_VICII_SETTINGS:
+ ui_vicii_settings_dialog(hwnd);
+ break;
+ case IDM_SID_SETTINGS:
+ ui_sid_settings_dialog(hwnd);
+ break;
+ case IDM_ROM_SETTINGS:
+ uirom_settings_dialog(hwnd, translate_res(IDD_C64ROM_SETTINGS_DIALOG),
+ translate_res(IDD_C64DRIVEROM_SETTINGS_DIALOG),
+ romset_dialog_resources, uirom_settings);
+ break;
+ case IDM_VIDEO_SETTINGS:
+ ui_video_settings_dialog(hwnd, UI_VIDEO_CHIP_VICII, UI_VIDEO_CHIP_NONE);
+ break;
+ case IDM_DRIVE_SETTINGS:
+ uidrivec64_settings_dialog(hwnd);
+ break;
+ case IDM_RS232USER_SETTINGS:
+ ui_rs232user_settings_dialog(hwnd);
+ break;
+ case IDM_KEYBOARD_SETTINGS:
+ uikeyboard_settings_dialog(hwnd, &uikeyboard_config);
+ break;
+ case IDM_ATTACH_DTV_FLASH:
+ ui_c64dtv_attach_flash_dialog(hwnd);
+ break;
+ case IDM_DETACH_DTV_FLASH:
+ resources_set_string("c64dtvromfilename", "");
+ break;
+ case IDM_CREATE_DTV_FLASH:
+ ui_c64dtv_create_flash_dialog(hwnd);
+ break;
+ case IDM_C64DTV_SETTINGS:
+ ui_c64dtv_settings_dialog(hwnd);
+ break;
+ }
+}
+
+int c64dtvui_init(void)
+{
+ ui_register_machine_specific(c64dtv_ui_specific);
+ ui_register_menu_toggles(c64dtv_ui_menu_toggles);
+
+ return 0;
+}
+
+void c64dtvui_shutdown(void)
+{
+}
Property changes on: branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/c64dtvui.c
___________________________________________________________________
Added: svn:executable
+ *
Modified: branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/intl.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/intl.c 2008-07-21 16:33:00 UTC (rev 19063)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/intl.c 2008-07-21 16:34:58 UTC (rev 19064)
@@ -105,6 +105,36 @@
/* ------------------------------ DIALOG RESOURCES ------------------------------ */
+/* resc64dtv.rc */
+/* en */ {IDD_C64DTV_SETTINGS_DIALOG,
+/* de */ IDD_C64DTV_SETTINGS_DIALOG_DE, /* fuzzy, size */
+/* fr */ IDD_C64DTV_SETTINGS_DIALOG_FR, /* fuzzy, size */
+/* hu */ IDD_C64DTV_SETTINGS_DIALOG_HU, /* fuzzy, size */
+/* it */ IDD_C64DTV_SETTINGS_DIALOG_IT, /* fuzzy, size */
+/* nl */ IDD_C64DTV_SETTINGS_DIALOG_NL,
+/* pl */ IDD_C64DTV_SETTINGS_DIALOG_PL, /* fuzzy, size */
+/* sv */ IDD_C64DTV_SETTINGS_DIALOG_SV}, /* fuzzy, size */
+
+/* resc64dtv.rc */
+/* en */ {IDD_C64DTV_ATTACH_FLASH_IMAGE_DIALOG,
+/* de */ IDD_C64DTV_ATTACH_FLASH_IMAGE_DIALOG_DE, /* fuzzy, size */
+/* fr */ IDD_C64DTV_ATTACH_FLASH_IMAGE_DIALOG_FR, /* fuzzy, size */
+/* hu */ IDD_C64DTV_ATTACH_FLASH_IMAGE_DIALOG_HU, /* fuzzy, size */
+/* it */ IDD_C64DTV_ATTACH_FLASH_IMAGE_DIALOG_IT, /* fuzzy, size */
+/* nl */ IDD_C64DTV_ATTACH_FLASH_IMAGE_DIALOG_NL,
+/* pl */ IDD_C64DTV_ATTACH_FLASH_IMAGE_DIALOG_PL, /* fuzzy, size */
+/* sv */ IDD_C64DTV_ATTACH_FLASH_IMAGE_DIALOG_SV}, /* fuzzy, size */
+
+/* resc64dtv.rc */
+/* en */ {IDD_C64DTV_CREATE_FLASH_IMAGE_DIALOG,
+/* de */ IDD_C64DTV_CREATE_FLASH_IMAGE_DIALOG_DE, /* fuzzy, size */
+/* fr */ IDD_C64DTV_CREATE_FLASH_IMAGE_DIALOG_FR, /* fuzzy, size */
+/* hu */ IDD_C64DTV_CREATE_FLASH_IMAGE_DIALOG_HU, /* fuzzy, size */
+/* it */ IDD_C64DTV_CREATE_FLASH_IMAGE_DIALOG_IT, /* fuzzy, size */
+/* nl */ IDD_C64DTV_CREATE_FLASH_IMAGE_DIALOG_NL,
+/* pl */ IDD_C64DTV_CREATE_FLASH_IMAGE_DIALOG_PL, /* fuzzy, size */
+/* sv */ IDD_C64DTV_CREATE_FLASH_IMAGE_DIALOG_SV}, /* fuzzy, size */
+
/* resc128.rc */
/* en */ {IDD_C128ROM_SETTINGS_DIALOG,
/* de */ IDD_C128ROM_SETTINGS_DIALOG_DE, /* size */
@@ -837,6 +867,16 @@
/* pl */ IDR_MENUC64_PL, /* fuzzy */
/* sv */ IDR_MENUC64_SV},
+/* resc64dtv.rc */
+/* en */ {IDR_MENUC64DTV,
+/* de */ IDR_MENUC64DTV_DE,
+/* fr */ IDR_MENUC64DTV_FR,
+/* hu */ IDR_MENUC64DTV_HU,
+/* it */ IDR_MENUC64DTV_IT,
+/* nl */ IDR_MENUC64DTV_NL,
+/* pl */ IDR_MENUC64DTV_PL, /* fuzzy */
+/* sv */ IDR_MENUC64DTV_SV},
+
/* rescbm2.rc */
/* en */ {IDR_MENUCBM2,
/* de */ IDR_MENUCBM2_DE,
Modified: branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/make-bindist.sh
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/make-bindist.sh 2008-07-21 16:33:00 UTC (rev 19063)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/make-bindist.sh 2008-07-21 16:34:58 UTC (rev 19064)
@@ -11,7 +11,7 @@
ZIPKIND=$3
TOPSRCDIR=$4
-if [ ! -e src/x64.exe -o ! -e src/x128.exe -o ! -e src/xvic.exe -o ! -e src/xpet.exe -o ! -e src/xplus4.exe -o ! -e src/xcbm2.exe -o ! -e src/c1541.exe -o ! -e src/petcat.exe -o ! -e src/cartconv.exe ]
+if [ ! -e src/x64.exe -o ! -e src/x64dtv.exe -o ! -e src/x128.exe -o ! -e src/xvic.exe -o ! -e src/xpet.exe -o ! -e src/xplus4.exe -o ! -e src/xcbm2.exe -o ! -e src/c1541.exe -o ! -e src/petcat.exe -o ! -e src/cartconv.exe ]
then
echo Error: executable file\(s\) not found, do a \"make\" first
exit 1
@@ -21,6 +21,7 @@
rm -f -r WinVICE-$VICEVERSION
mkdir WinVICE-$VICEVERSION
$STRIP src/x64.exe
+$STRIP src/x64dtv.exe
$STRIP src/x128.exe
$STRIP src/xvic.exe
$STRIP src/xpet.exe
@@ -29,11 +30,14 @@
$STRIP src/c1541.exe
$STRIP src/petcat.exe
$STRIP src/cartconv.exe
-cp src/x64.exe src/x128.exe src/xvic.exe WinVICE-$VICEVERSION
+cp src/x64.exe src/x64dtv.exe src/x128.exe src/xvic.exe WinVICE-$VICEVERSION
cp src/xpet.exe src/xplus4.exe src/xcbm2.exe WinVICE-$VICEVERSION
cp src/c1541.exe src/petcat.exe src/cartconv.exe WinVICE-$VICEVERSION
-cp -a $TOPSRCDIR/data/C128 $TOPSRCDIR/data/C64 $TOPSRCDIR/data/CBM-II $TOPSRCDIR/data/DRIVES WinVICE-$VICEVERSION
-cp -a $TOPSRCDIR/data/PET $TOPSRCDIR/data/PLUS4 $TOPSRCDIR/data/PRINTER $TOPSRCDIR/data/VIC20 WinVICE-$VICEVERSION
+cp -a $TOPSRCDIR/data/C128 $TOPSRCDIR/data/C64 WinVICE-$VICEVERSION
+cp -a $TOPSRCDIR/data/C64DTV $TOPSRCDIR/data/CBM-II WinVICE-$VICEVERSION
+cp -a $TOPSRCDIR/data/DRIVES $TOPSRCDIR/data/PET WinVICE-$VICEVERSION
+cp -a $TOPSRCDIR/data/PLUS4 $TOPSRCDIR/data/PRINTER WinVICE-$VICEVERSION
+cp -a $TOPSRCDIR/data/VIC20 WinVICE-$VICEVERSION
cp -a $TOPSRCDIR/data/fonts WinVICE-$VICEVERSION
cp -a $TOPSRCDIR/doc/html WinVICE-$VICEVERSION
cp $TOPSRCDIR/FEEDBACK $TOPSRCDIR/README WinVICE-$VICEVERSION
Modified: branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/resc64dtv.rc
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/resc64dtv.rc 2008-07-21 16:33:00 UTC (rev 19063)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/resc64dtv.rc 2008-07-21 16:34:58 UTC (rev 19064)
@@ -1,3130 +1,3236 @@
-// C64 specific resources.
-//
-
-#include "config.h"
-#include "debug.h"
-#include "config.h"
-#include "res.h"
-#include "rescommon.h"
-
-#pragma code_page(28591)
-
-#define FILE_DESCRIPTION "VicePlus C64DTV Emulator"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Menu
-//
-
-// original and default ENGLISH version of menu
-
-IDR_MENUC64DTV MENU DISCARDABLE
-BEGIN
- POPUP "&File"
- BEGIN
- MENUITEM "&Autostart disk image...", IDM_AUTOSTART
- MENUITEM SEPARATOR
- POPUP "Attach &disk image"
- BEGIN
- MENUITEM "Drive &8\tAlt+8", IDM_ATTACH_8
- MENUITEM "Drive &9\tAlt+9", IDM_ATTACH_9
- MENUITEM "Drive 1&0\tAlt+0", IDM_ATTACH_10
- MENUITEM "Drive &11\tAlt+1", IDM_ATTACH_11
- END
- POPUP "D&etach disk image"
- BEGIN
- MENUITEM "Drive &8", IDM_DETACH_8
- MENUITEM "Drive &9", IDM_DETACH_9
- MENUITEM "Drive 1&0", IDM_DETACH_10
- MENUITEM "Drive &11", IDM_DETACH_11
- MENUITEM SEPARATOR
- MENUITEM "&All\tAlt+A", IDM_DETACH_ALL
- END
- POPUP "DTV flash &rom image"
- BEGIN
- MENUITEM "Attach &flash rom image", IDM_ATTACH_DTV_FLASH
- MENUITEM "&Detach flash rom image", IDM_DETACH_DTV_FLASH
- MENUITEM "&Create new flash rom image", IDM_CREATE_DTV_FLASH
- END
- POPUP "&Flip list"
- BEGIN
- MENUITEM "&Add current image\tAlt+I", IDM_FLIP_ADD
- MENUITEM "&Remove current image\tAlt+K", IDM_FLIP_REMOVE
- MENUITEM "Attach &next image\tAlt+N", IDM_FLIP_NEXT
- MENUITEM "Attach &previous image\tAlt+B", IDM_FLIP_PREVIOUS
- MENUITEM SEPARATOR
- MENUITEM "&Load flip list", IDM_FLIP_LOAD
- MENUITEM "&Save flip list", IDM_FLIP_SAVE
- END
- MENUITEM SEPARATOR
- MENUITEM "&Pause\tAlt+Pause", IDM_PAUSE, CHECKED
- MENUITEM "&Monitor\tAlt+M", IDM_MONITOR
- POPUP "&Reset"
- BEGIN
- MENUITEM "&Hard\tCtrl+Alt+R", IDM_RESET_HARD
- MENUITEM "&Soft\tAlt+R", IDM_RESET_SOFT
- MENUITEM SEPARATOR
- MENUITEM "Drive #&8", IDM_RESET_DRIVE8
- MENUITEM "Drive #&9", IDM_RESET_DRIVE9
- MENUITEM "Drive #1&0", IDM_RESET_DRIVE10
- MENUITEM "Drive #&11", IDM_RESET_DRIVE11
- END
-#ifdef DEBUG
- POPUP "&Debug"
- BEGIN
- POPUP "M&ode"
- BEGIN
- MENUITEM "&Normal", IDM_DEBUG_MODE_NORMAL
- MENUITEM "&Small", IDM_DEBUG_MODE_SMALL
- MENUITEM "&History", IDM_DEBUG_MODE_HISTORY
- MENUITEM "&History Autoplay", IDM_DEBUG_MODE_AUTOPLAY
- END
- MENUITEM "&Main CPU Trace\tAlt+F10", IDM_TOGGLE_MAINCPU_TRACE, CHECKED
- MENUITEM "Drive&0 CPU Trace\tAlt+F11", IDM_TOGGLE_DRIVE0CPU_TRACE, CHECKED
- MENUITEM "Drive&1 CPU Trace\tAlt+F12", IDM_TOGGLE_DRIVE1CPU_TRACE, CHECKED
- END
-#endif
- MENUITEM SEPARATOR
- MENUITEM "E&xit\tAlt+X", IDM_EXIT
- END
- POPUP "Sna&pshot"
- BEGIN
- MENUITEM "Load snapshot &image...", IDM_SNAPSHOT_LOAD
- MENUITEM "Save sna&pshot image...", IDM_SNAPSHOT_SAVE
- MENUITEM "&Load quicksnapshot image\tAlt+L", IDM_LOADQUICK
- MENUITEM "&Save quicksnapshot image\tAlt+S", IDM_SAVEQUICK
- MENUITEM SEPARATOR
- MENUITEM "Start/Stop &Recording History", IDM_EVENT_TOGGLE_RECORD
- MENUITEM "Start/Stop Pl&ayback History", IDM_EVENT_TOGGLE_PLAYBACK
- MENUITEM "Set Recording Milestone\tAlt+G", IDM_EVENT_SETMILESTONE
- MENUITEM "Return to Milestone\tAlt+H", IDM_EVENT_RESETMILESTONE
- POPUP "Recording start mode"
- BEGIN
- MENUITEM "&Save new snapshot", IDM_EVENT_START_MODE_SAVE
- MENUITEM "&Load existing snapshot", IDM_EVENT_START_MODE_LOAD
- MENUITEM "Start with &reset", IDM_EVENT_START_MODE_RESET
- MENUITEM "Overwrite &Playback", IDM_EVENT_START_MODE_PLAYBACK
- END
- MENUITEM "Select History files/directory", IDM_EVENT_DIRECTORY
- MENUITEM SEPARATOR
- MENUITEM "Save/stop media file...\tAlt+C", IDM_MEDIAFILE
- MENUITEM SEPARATOR
- MENUITEM "Record Sound...", IDM_SOUND_RECORD_START
- MENUITEM "Stop Sound Recording", IDM_SOUND_RECORD_STOP
- MENUITEM SEPARATOR
- MENUITEM "Netplay (experimental)...", IDM_NETWORK_SETTINGS
- END
- POPUP "&Options"
- BEGIN
- POPUP "&Refresh rate"
- BEGIN
- MENUITEM "&Auto", IDM_REFRESH_RATE_AUTO
- MENUITEM "1/&1", IDM_REFRESH_RATE_1
- MENUITEM "1/&2", IDM_REFRESH_RATE_2
- MENUITEM "1/&3", IDM_REFRESH_RATE_3
- MENUITEM "1/&4", IDM_REFRESH_RATE_4
- MENUITEM "1/&5", IDM_REFRESH_RATE_5
- MENUITEM "1/&6", IDM_REFRESH_RATE_6
- MENUITEM "1/&7", IDM_REFRESH_RATE_7
- MENUITEM "1/&8", IDM_REFRESH_RATE_8
- MENUITEM "1/&9", IDM_REFRESH_RATE_9
- MENUITEM "1/1&0", IDM_REFRESH_RATE_10
-#if 0
- MENUITEM SEPARATOR
- MENUITEM "&Custom", IDM_REFRESH_RATE_CUSTOM
-#endif
- END
- POPUP "&Maximum Speed"
- BEGIN
- MENUITEM "&200%", IDM_MAXIMUM_SPEED_200
- MENUITEM "&100%", IDM_MAXIMUM_SPEED_100
- MENUITEM "&50%", IDM_MAXIMUM_SPEED_50
- MENUITEM "&20%", IDM_MAXIMUM_SPEED_20
- MENUITEM "1&0%", IDM_MAXIMUM_SPEED_10
- MENUITEM "No &limit", IDM_MAXIMUM_SPEED_NO_LIMIT
- MENUITEM SEPARATOR
- MENUITEM "&Custom", IDM_MAXIMUM_SPEED_CUSTOM
- END
- MENUITEM "&Warp mode\tAlt+W", IDM_TOGGLE_WARP_MODE, CHECKED
- MENUITEM SEPARATOR
- MENUITEM "Fullscreen\tAlt+D", IDM_TOGGLE_FULLSCREEN
- MENUITEM "Always on Top", IDM_TOGGLE_ALWAYSONTOP
- MENUITEM SEPARATOR
- MENUITEM "Video &cache", IDM_TOGGLE_VIDEOCACHE, CHECKED
- MENUITEM "&Double size", IDM_TOGGLE_DOUBLESIZE, CHECKED
- MENUITEM "Dou&ble scan", IDM_TOGGLE_DOUBLESCAN, CHECKED
- MENUITEM "PAL Emulation", IDM_TOGGLE_FASTPAL, CHECKED
- MENUITEM "Scale2x", IDM_TOGGLE_SCALE2X, CHECKED
- MENUITEM SEPARATOR
- MENUITEM "Swap &Joystick\tAlt+J", IDM_SWAP_JOYSTICK
- MENUITEM SEPARATOR
- MENUITEM "&Sound playback", IDM_TOGGLE_SOUND, CHECKED
- MENUITEM SEPARATOR
- MENUITEM "&True drive emulation", IDM_TOGGLE_DRIVE_TRUE_EMULATION, CHECKED
- MENUITEM "&True flash filesystem", IDM_TOGGLE_FLASH_TRUE_FILESYSTEM, CHECKED
- MENUITEM "&Virtual device traps", IDM_TOGGLE_VIRTUAL_DEVICES
- MENUITEM SEPARATOR
- POPUP "Vide&o standard"
- BEGIN
- MENUITEM "&PAL-G", IDM_SYNC_FACTOR_PAL
- MENUITEM "&NTSC-M", IDM_SYNC_FACTOR_NTSC
- END
- MENUITEM SEPARATOR
- MENUITEM "Emulator &Identification", IDM_TOGGLE_EMUID
- MENUITEM "&PS/2 mouse emulation", IDM_PS2MOUSE
- MENUITEM "&Grab mouse events\tAlt+Q", IDM_MOUSE
- END
- POPUP "S&ettings"
- BEGIN
- MENUITEM "&Video settings...", IDM_VIDEO_SETTINGS
- MENUITEM "&Peripheral settings...",IDM_DEVICEMANAGER
- MENUITEM "&Drive settings...", IDM_DRIVE_SETTINGS
- MENUITEM "VIC-II settings...", IDM_VICII_SETTINGS
- MENUITEM "&Joystick settings...", IDM_JOY_SETTINGS
- MENUITEM "&Keyboard settings...", IDM_KEYBOARD_SETTINGS
- MENUITEM "S&ound settings...", IDM_SOUND_SETTINGS
- MENUITEM "S&ID settings...", IDM_SID_SETTINGS
- MENUITEM "&ROM settings...", IDM_ROM_SETTINGS
- MENUITEM "RA&M settings...", IDM_RAM_SETTINGS
- MENUITEM "&C64DTV settings...", IDM_C64DTV_SETTINGS
- MENUITEM SEPARATOR
- MENUITEM "&Save current settings", IDM_SETTINGS_SAVE
- MENUITEM "&Load saved settings", IDM_SETTINGS_LOAD
- MENUITEM "Set de&fault settings", IDM_SETTINGS_DEFAULT
- MENUITEM SEPARATOR
- MENUITEM "Save settings on e&xit", IDM_TOGGLE_SAVE_SETTINGS_ON_EXIT
- MENUITEM "&Confirm on exit", IDM_TOGGLE_CONFIRM_ON_EXIT
- END
- POPUP "&Language"
- BEGIN
- MENUITEM "&English", IDM_LANG_EN
- MENUITEM "&German", IDM_LANG_DE
- MENUITEM "&French", IDM_LANG_FR
- MENUITEM "&Hungarian", IDM_LANG_HU
- MENUITEM "&Italian", IDM_LANG_IT
- MENUITEM "&Dutch", IDM_LANG_NL
- MENUITEM "&Polish", IDM_LANG_PL
- MENUITEM "&Swedish", IDM_LANG_SV
- END
- POPUP "&Help"
- BEGIN
-// MENUITEM "H&elp", IDM_HELP
-// MENUITEM SEPARATOR
- MENUITEM "&About...", IDM_ABOUT
- MENUITEM SEPARATOR
- MENUITEM "Command line &options", IDM_CMDLINE
- MENUITEM SEPARATOR
- MENUITEM "&Contributors", IDM_CONTRIBUTORS
- MENUITEM "&License", IDM_LICENSE
- MENUITEM "No &warranty", IDM_WARRANTY
- END
-END
-
-
-// GERMAN version of menu
-
-IDR_MENUC64DTV_DE MENU DISCARDABLE
-BEGIN
- POPUP "&Datei"
- BEGIN
- MENUITEM "&Autostart Disk Image...", IDM_AUTOSTART
- MENUITEM SEPARATOR
- POPUP "&Disk Image einlegen"
- BEGIN
- MENUITEM "Laufwerk &8\tAlt+8", IDM_ATTACH_8
- MENUITEM "Laufwerk &9\tAlt+9", IDM_ATTACH_9
- MENUITEM "Laufwerk 1&0\tAlt+0", IDM_ATTACH_10
- MENUITEM "Laufwerk &11\tAlt+1", IDM_ATTACH_11
- END
- POPUP "Disk Image &entfernen"
- BEGIN
- MENUITEM "Laufwerk &8", IDM_DETACH_8
- MENUITEM "Laufwerk &9", IDM_DETACH_9
- MENUITEM "Laufwerk 1&0", IDM_DETACH_10
- MENUITEM "Laufwerk &11", IDM_DETACH_11
- MENUITEM SEPARATOR
- MENUITEM "&Alle\tAlt+A", IDM_DETACH_ALL
- END
- POPUP "&Flipliste"
- BEGIN
- MENUITEM "&Aktuelles Image hinzuf\xFCgen\tAlt+I", IDM_FLIP_ADD
- MENUITEM "Aktuelles Image entfe&rnen\tAlt+K", IDM_FLIP_REMOVE
- MENUITEM "N\xE4chstes Image\tAlt+N", IDM_FLIP_NEXT
- MENUITEM "Voriges Image\tAlt+B", IDM_FLIP_PREVIOUS
- MENUITEM SEPARATOR
- MENUITEM "Fliplist Datei &Laden", IDM_FLIP_LOAD
- MENUITEM "Fliplist Datei &Speichern", IDM_FLIP_SAVE
- END
- MENUITEM SEPARATOR
- MENUITEM "&Pause\tAlt+Pause", IDM_PAUSE, CHECKED
- MENUITEM "&Monitor\tAlt+M", IDM_MONITOR
- POPUP "&Reset"
- BEGIN
- MENUITEM "&Hart\tCtrl+Alt+R", IDM_RESET_HARD
- MENUITEM "&Soft\tAlt+R", IDM_RESET_SOFT
- MENUITEM SEPARATOR
- MENUITEM "Laufwerk #&8", IDM_RESET_DRIVE8
- MENUITEM "Laufwerk #&9", IDM_RESET_DRIVE9
- MENUITEM "Laufwerk #1&0", IDM_RESET_DRIVE10
- MENUITEM "Laufwerk #&11", IDM_RESET_DRIVE11
- END
-#ifdef DEBUG
- POPUP "&Debug"
- BEGIN
- POPUP "M&odus"
- BEGIN
- MENUITEM "&Normal", IDM_DEBUG_MODE_NORMAL
- MENUITEM "&Klein", IDM_DEBUG_MODE_SMALL
- MENUITEM "&History", IDM_DEBUG_MODE_HISTORY
- MENUITEM "&History Automatische Wiedergabe", IDM_DEBUG_MODE_AUTOPLAY
- END
- MENUITEM "&Main CPU Trace\tAlt+F10", IDM_TOGGLE_MAINCPU_TRACE, CHECKED
- MENUITEM "Laufwerk&0 CPU Trace\tAlt+F11", IDM_TOGGLE_DRIVE0CPU_TRACE, CHECKED
- MENUITEM "Laufwerk&1 CPU Trace\tAlt+F12", IDM_TOGGLE_DRIVE1CPU_TRACE, CHECKED
- END
-#endif
- MENUITEM SEPARATOR
- MENUITEM "E&xit\tAlt+X", IDM_EXIT
- END
- POPUP "Sna&pshot"
- BEGIN
- MENUITEM "Snapshot &Image Laden...", IDM_SNAPSHOT_LOAD
- MENUITEM "Sna&pshot Image Speichern...", IDM_SNAPSHOT_SAVE
- MENUITEM "Schnell&laden von Snapshot Image\tAlt+L", IDM_LOADQUICK
- MENUITEM "&Schnellspeichern von Snapshot\tAlt+S", IDM_SAVEQUICK
- MENUITEM SEPARATOR
- MENUITEM "Sta&rt/Stop Aufnahme History", IDM_EVENT_TOGGLE_RECORD
- MENUITEM "St&art/Stop Wiedergabe History", IDM_EVENT_TOGGLE_PLAYBACK
- MENUITEM "Setze Aufnahme Meilenstein\tAlt+G", IDM_EVENT_SETMILESTONE
- MENUITEM "R\xFCckkehr zum Meilenstein\tAlt+H", IDM_EVENT_RESETMILESTONE
- POPUP "Aufnahme Start Modus"
- BEGIN
- MENUITEM "&Speichere neuen Snapshot", IDM_EVENT_START_MODE_SAVE
- MENUITEM "&Lade existierenden Snapshot", IDM_EVENT_START_MODE_LOAD
- MENUITEM "Mit &Reset starten", IDM_EVENT_START_MODE_RESET
- MENUITEM "Laufende Aufnahme \xFCberschreiben", IDM_EVENT_START_MODE_PLAYBACK
- END
- MENUITEM "Verzeichnis f\xFCr Event Aufnahme", IDM_EVENT_DIRECTORY
- MENUITEM SEPARATOR
- MENUITEM "Speichern/stop media Datei...\tAlt+C", IDM_MEDIAFILE
- MENUITEM SEPARATOR
- MENUITEM "Aufnahme...", IDM_SOUND_RECORD_START
- MENUITEM "Aufnahme Stop", IDM_SOUND_RECORD_STOP
- MENUITEM SEPARATOR
- MENUITEM "Netplay (experimentell)...", IDM_NETWORK_SETTINGS
- END
- POPUP "&Optionen"
- BEGIN
- POPUP "Wiederhol&rate"
- BEGIN
- MENUITEM "&Automatisch", IDM_REFRESH_RATE_AUTO
- MENUITEM "1/&1", IDM_REFRESH_RATE_1
- MENUITEM "1/&2", IDM_REFRESH_RATE_2
- MENUITEM "1/&3", IDM_REFRESH_RATE_3
- MENUITEM "1/&4", IDM_REFRESH_RATE_4
- MENUITEM "1/&5", IDM_REFRESH_RATE_5
- MENUITEM "1/&6", IDM_REFRESH_RATE_6
- MENUITEM "1/&7", IDM_REFRESH_RATE_7
- MENUITEM "1/&8", IDM_REFRESH_RATE_8
- MENUITEM "1/&9", IDM_REFRESH_RATE_9
- MENUITEM "1/1&0", IDM_REFRESH_RATE_10
-#if 0
- MENUITEM SEPARATOR
- MENUITEM "&Benutzerdefiniert", IDM_REFRESH_RATE_CUSTOM
-#endif
- END
- POPUP "&Maximale Geschwindigkeit"
- BEGIN
- MENUITEM "&200%", IDM_MAXIMUM_SPEED_200
- MENUITEM "&100%", IDM_MAXIMUM_SPEED_100
- MENUITEM "&50%", IDM_MAXIMUM_SPEED_50
- MENUITEM "&20%", IDM_MAXIMUM_SPEED_20
- MENUITEM "1&0%", IDM_MAXIMUM_SPEED_10
- MENUITEM "Kein &Limit", IDM_MAXIMUM_SPEED_NO_LIMIT
- MENUITEM SEPARATOR
- MENUITEM "&Benutzerdefiniert", IDM_MAXIMUM_SPEED_CUSTOM
- END
- MENUITEM "&Warp modus\tAlt+W", IDM_TOGGLE_WARP_MODE, CHECKED
- MENUITEM SEPARATOR
- MENUITEM "Vollbild\tAlt+D", IDM_TOGGLE_FULLSCREEN
- MENUITEM "Immer im Vordergrund", IDM_TOGGLE_ALWAYSONTOP
- MENUITEM SEPARATOR
- MENUITEM "Video &cache", IDM_TOGGLE_VIDEOCACHE, CHECKED
- MENUITEM "&Doppelte Gr\xF6\xDFe", IDM_TOGGLE_DOUBLESIZE, CHECKED
- MENUITEM "Do&ppelt Scan", IDM_TOGGLE_DOUBLESCAN, CHECKED
- MENUITEM "PAL Emulation", IDM_TOGGLE_FASTPAL, CHECKED
- MENUITEM "Scale2x", IDM_TOGGLE_SCALE2X, CHECKED
- MENUITEM SEPARATOR
- MENUITEM "Joystick ports austauschen\tAlt+J", IDM_SWAP_JOYSTICK
- MENUITEM SEPARATOR
- MENUITEM "&Sound Einschalten", IDM_TOGGLE_SOUND, CHECKED
- MENUITEM SEPARATOR
- MENUITEM "&Pr\xE4zise Floppy Emulation", IDM_TOGGLE_DRIVE_TRUE_EMULATION, CHECKED
- MENUITEM "&True flash filesystem", IDM_TOGGLE_FLASH_TRUE_FILESYSTEM, CHECKED
- MENUITEM "&Virtuelle Ger\xE4te Traps", IDM_TOGGLE_VIRTUAL_DEVICES
- MENUITEM SEPARATOR
- POPUP "Vide&o standard"
- BEGIN
- MENUITEM "&PAL-G", IDM_SYNC_FACTOR_PAL
- MENUITEM "&NTSC-M", IDM_SYNC_FACTOR_NTSC
- END
- MENUITEM SEPARATOR
- MENUITEM "Emulator &Identifikation", IDM_TOGGLE_EMUID
- MENUITEM "&PS/2 mouse emulation", IDM_PS2MOUSE
- MENUITEM "&Grab mouse events\tAlt+Q", IDM_MOUSE
- END
- POPUP "&Einstellungen"
- BEGIN
- MENUITEM "&Video Einstellungen...", IDM_VIDEO_SETTINGS
- MENUITEM "&Peripherie Einstellungen...",IDM_DEVICEMANAGER
- MENUITEM "&Floppy Einstellungen...", IDM_DRIVE_SETTINGS
- MENUITEM "VIC-II Einstellungen...", IDM_VICII_SETTINGS
- MENUITEM "&Joystick Einstellungen...", IDM_JOY_SETTINGS
- MENUITEM "&Tastatur Einstellungen...", IDM_KEYBOARD_SETTINGS
- MENUITEM "S&ound Einstellungen...", IDM_SOUND_SETTINGS
- MENUITEM "S&ID Einstellungen...", IDM_SID_SETTINGS
- MENUITEM "&ROM Einstellungen...", IDM_ROM_SETTINGS
- MENUITEM "RA&M Einstellungen...", IDM_RAM_SETTINGS
- MENUITEM "&C64DTV settings...", IDM_C64DTV_SETTINGS
- MENUITEM SEPARATOR
- MENUITEM "Einstellungen &speichern", IDM_SETTINGS_SAVE
- MENUITEM "Einstellungen &Laden", IDM_SETTINGS_LOAD
- MENUITEM "&Wiederherstellen Standard Einstellungen", IDM_SETTINGS_DEFAULT
- MENUITEM SEPARATOR
- MENUITEM "Einstellungen beim Beenden speichern", IDM_TOGGLE_SAVE_SETTINGS_ON_EXIT
- MENUITEM "&Best\xE4tigung beim Beenden", IDM_TOGGLE_CONFIRM_ON_EXIT
- END
- POPUP "Sprache"
- BEGIN
- MENUITEM "&Englisch", IDM_LANG_EN
- MENUITEM "&Deutsch", IDM_LANG_DE
- MENUITEM "&Franz\xF6sisch", IDM_LANG_FR
- MENUITEM "&Ungarisch", IDM_LANG_HU
- MENUITEM "&Italienisch", IDM_LANG_IT
- MENUITEM "&Holl\xE4ndisch", IDM_LANG_NL
- MENUITEM "&Polnisch", IDM_LANG_PL
- MENUITEM "&Schwedisch", IDM_LANG_SV
- END
- POPUP "&Hilfe"
- BEGIN
-// MENUITEM "H&elp", IDM_HELP
-// MENUITEM SEPARATOR
- MENUITEM "&\xDCber VICEplus...", IDM_ABOUT
- MENUITEM SEPARATOR
- MENUITEM "Kommandozeilen &Optionen", IDM_CMDLINE
- MENUITEM SEPARATOR
- MENUITEM "VICEplus Hackers", IDM_CONTRIBUTORS
- MENUITEM "&Lizenz", IDM_LICENSE
- MENUITEM "Keine &Garantie!", IDM_WARRANTY
- END
-END
-
-
-// FRENCH version of menu
-
-IDR_MENUC64DTV_FR MENU DISCARDABLE
-BEGIN
- POPUP "&Fichier"
- BEGIN
- MENUITEM "D\xE9marrage &automatique d'une image lecteur...", IDM_AUTOSTART
- MENUITEM SEPARATOR
- POPUP "Ins\xE9rer une image de &disque"
- BEGIN
- MENUITEM "Lecteur #&8\tAlt+8", IDM_ATTACH_8
- MENUITEM "Lecteur #&9\tAlt+9", IDM_ATTACH_9
- MENUITEM "Lecteur #1&0\tAlt+0", IDM_ATTACH_10
- MENUITEM "Lecteur #&11\tAlt+1", IDM_ATTACH_11
- END
- POPUP "&Retirer une image de disque"
- BEGIN
- MENUITEM "Lecteur #&8", IDM_DETACH_8
- MENUITEM "Lecteur #&9", IDM_DETACH_9
- MENUITEM "Lecteur #1&0", IDM_DETACH_10
- MENUITEM "Lecteur #&11", IDM_DETACH_11
- MENUITEM SEPARATOR
- MENUITEM "&Tout\tAlt+A", IDM_DETACH_ALL
- END
- POPUP "&Groupement de disques"
- BEGIN
- MENUITEM "&Ajouter l'image de disque courante\tAlt+I", IDM_FLIP_ADD
- MENUITEM "&Retirer l'image de disque courante\tAlt+K", IDM_FLIP_REMOVE
- MENUITEM "Ins\xE9rer la &prochaine image\tAlt+N", IDM_FLIP_NEXT
- MENUITEM "Ins\xE9rer l'image p&r\xE9c\xE9dente\tAlt+B", IDM_FLIP_PREVIOUS
- MENUITEM SEPARATOR
- MENUITEM "&Charger un groupement de disques", IDM_FLIP_LOAD
- MENUITEM "&Enregistrer le groupement de disques", IDM_FLIP_SAVE
- END
- MENUITEM SEPARATOR
- MENUITEM "&Pause\tAlt+Pause", IDM_PAUSE, CHECKED
- MENUITEM "&Tracer\tAlt+M", IDM_MONITOR
- POPUP "&R\xE9initialiser"
- BEGIN
- MENUITEM "&Physiquement\tCtrl+Alt+R", IDM_RESET_HARD
- MENUITEM "&Logiciellement\tAlt+R", IDM_RESET_SOFT
- MENUITEM SEPARATOR
- MENUITEM "Lecteur #&8", IDM_RESET_DRIVE8
- MENUITEM "Lecteur #&9", IDM_RESET_DRIVE9
- MENUITEM "Lecteur #1&0", IDM_RESET_DRIVE10
- MENUITEM "Lecteur #&11", IDM_RESET_DRIVE11
- END
-#ifdef DEBUG
- POPUP "&Debug"
- BEGIN
- POPUP "M&ode"
- BEGIN
- MENUITEM "&Normal", IDM_DEBUG_MODE_NORMAL
- MENUITEM "&Petit", IDM_DEBUG_MODE_SMALL
- MENUITEM "&Historique", IDM_DEBUG_MODE_HISTORY
- MENUITEM "H&istorique automatique", IDM_DEBUG_MODE_AUTOPLAY
- END
- MENUITEM "Tracer CPU &Principal\tAlt+F10", IDM_TOGGLE_MAINCPU_TRACE, CHECKED
- MENUITEM "Tracer CPU Drive&0\tAlt+F11", IDM_TOGGLE_DRIVE0CPU_TRACE, CHECKED
- MENUITEM "Tracer CPU Drive&1\tAlt+F12", IDM_TOGGLE_DRIVE1CPU_TRACE, CHECKED
- END
-#endif
- MENUITEM SEPARATOR
- MENUITEM "&Quitter\tAlt+X", IDM_EXIT
- END
- POPUP "&Sauvegarde"
- BEGIN
- MENUITEM "C&harger une sauvegarde....", IDM_SNAPSHOT_LOAD
- MENUITEM "E&nregistrer une sauvegarde...", IDM_SNAPSHOT_SAVE
- MENUITEM "&Charger la sauvegarde rapide\tAlt+L", IDM_LOADQUICK
- MENUITEM "&Enregistrer la sauvegarde rapide\tAlt+S", IDM_SAVEQUICK
- MENUITEM SEPARATOR
- MENUITEM "D\xE9marrer/Arr\xEAter l'historique de l'enre&gistrement", IDM_EVENT_TOGGLE_RECORD
- MENUITEM "D\xE9marrer/Arr\xEAter l'historique de la &lecture", IDM_EVENT_TOGGLE_PLAYBACK
- MENUITEM "Lever le Signet d'enregistrement\tAlt+G", IDM_EVENT_SETMILESTONE
- MENUITEM "Retourner au Signet d'enregistrement\tAlt+H", IDM_EVENT_RESETMILESTONE
- POPUP "Mode de d\xE9part d'enregistrement"
- BEGIN
- MENUITEM "&Enregistrer une nouvelle sauvegarde", IDM_EVENT_START_MODE_SAVE
- MENUITEM "&Charger une sauvegarde", IDM_EVENT_START_MODE_LOAD
- MENUITEM "&R\xE9initialiser au d\xE9marrage", IDM_EVENT_START_MODE_RESET
- MENUITEM "\xC9&craser la lecture actuelle", IDM_EVENT_START_MODE_PLAYBACK
- END
- MENUITEM "S\xE9lectionnez le r\xE9pertoire des captures", IDM_EVENT_DIRECTORY
- MENUITEM SEPARATOR
- MENUITEM "Enregistrer/Arr\xEAter fichier m\xE9dia...\tAlt+C", IDM_MEDIAFILE
- MENUITEM SEPARATOR
- MENUITEM "Record Sound...", IDM_SOUND_RECORD_START
- MENUITEM "Stop Sound Recording", IDM_SOUND_RECORD_STOP
- MENUITEM SEPARATOR
- MENUITEM "Netplay (experimental)...", IDM_NETWORK_SETTINGS
- END
- POPUP "&Options"
- BEGIN
- POPUP "Taux de &rafra\xEEchissement"
- BEGIN
- MENUITEM "&Automatique", IDM_REFRESH_RATE_AUTO
- MENUITEM "1/&1", IDM_REFRESH_RATE_1
- MENUITEM "1/&2", IDM_REFRESH_RATE_2
- MENUITEM "1/&3", IDM_REFRESH_RATE_3
- MENUITEM "1/&4", IDM_REFRESH_RATE_4
- MENUITEM "1/&5", IDM_REFRESH_RATE_5
- MENUITEM "1/&6", IDM_REFRESH_RATE_6
- MENUITEM "1/&7", IDM_REFRESH_RATE_7
- MENUITEM "1/&8", IDM_REFRESH_RATE_8
- MENUITEM "1/&9", IDM_REFRESH_RATE_9
- MENUITEM "1/1&0", IDM_REFRESH_RATE_10
-#if 0
- MENUITEM SEPARATOR
- MENUITEM "&Custom", IDM_REFRESH_RATE_CUSTOM
-#endif
- END
- POPUP "Vitesse &Maximale"
- BEGIN
- MENUITEM "&200%", IDM_MAXIMUM_SPEED_200
- MENUITEM "&100%", IDM_MAXIMUM_SPEED_100
- MENUITEM "&50%", IDM_MAXIMUM_SPEED_50
- MENUITEM "&20%", IDM_MAXIMUM_SPEED_20
- MENUITEM "1&0%", IDM_MAXIMUM_SPEED_10
- MENUITEM "Aucune &limite", IDM_MAXIMUM_SPEED_NO_LIMIT
- MENUITEM SEPARATOR
- MENUITEM "&Personnalis\xE9", IDM_MAXIMUM_SPEED_CUSTOM
- END
- MENUITEM "&Mode turbo\tAlt+W", IDM_TOGGLE_WARP_MODE, CHECKED
- MENUITEM SEPARATOR
- MENUITEM "P\xE9riph\xE9rique plein \xE9cran\tAlt+D", IDM_TOGGLE_FULLSCREEN
- MENUITEM "Always on Top", IDM_TOGGLE_ALWAYSONTOP
- MENUITEM SEPARATOR
- MENUITEM "&Cache vid\xE9o", IDM_TOGGLE_VIDEOCACHE, CHECKED
- MENUITEM "&Taille double", IDM_TOGGLE_DOUBLESIZE, CHECKED
- MENUITEM "Dou&ble scan", IDM_TOGGLE_DOUBLESCAN, CHECKED
- MENUITEM "\xC9mulation PAL", IDM_TOGGLE_FASTPAL, CHECKED
- MENUITEM "Scale2x", IDM_TOGGLE_SCALE2X, CHECKED
- MENUITEM SEPARATOR
- MENUITEM "Interchanger les joysticks\tAlt+J", IDM_SWAP_JOYSTICK
- MENUITEM SEPARATOR
- MENUITEM "Lecture &audio", IDM_TOGGLE_SOUND, CHECKED
- MENUITEM SEPARATOR
- MENUITEM "Activer l'\xE9mulation &r\xE9elle des lecteurs", IDM_TOGGLE_DRIVE_TRUE_EMULATION, CHECKED
- MENUITEM "&True flash filesystem", IDM_TOGGLE_FLASH_TRUE_FILESYSTEM, CHECKED
- MENUITEM "Activer les p\xE9riph\xE9riques &virtuels", IDM_TOGGLE_VIRTUAL_DEVICES
- MENUITEM SEPARATOR
- POPUP "Standar&d vid\xE9o"
- BEGIN
- MENUITEM "&PAL-G", IDM_SYNC_FACTOR_PAL
- MENUITEM "&NTSC-M", IDM_SYNC_FACTOR_NTSC
- END
- MENUITEM SEPARATOR
- MENUITEM "&Identification de l'\xE9mulateur", IDM_TOGGLE_EMUID
- MENUITEM "&PS/2 mouse emulation", IDM_PS2MOUSE
- MENUITEM "&Grab mouse events\tAlt+Q", IDM_MOUSE
- END
- POPUP "&Param\xE8tres"
- BEGIN
- MENUITEM "Param\xE8tres vid\xE9o...", IDM_VIDEO_SETTINGS
- MENUITEM "Param\xE8tres des p\xE9riph\xE9riques...",IDM_DEVICEMANAGER
- MENUITEM "Param\xE8tres des lecteurs...", IDM_DRIVE_SETTINGS
- MENUITEM "Param\xE8tres VIC-II...", IDM_VICII_SETTINGS
- MENUITEM "Param\xE8tres des joysticks...", IDM_JOY_SETTINGS
- MENUITEM "Param\xE8tres du clavier...", IDM_KEYBOARD_SETTINGS
- MENUITEM "Param\xE8tres son...", IDM_SOUND_SETTINGS
- MENUITEM "Param\xE8tres SID...", IDM_SID_SETTINGS
- MENUITEM "Param\xE8tres ROM...", IDM_ROM_SETTINGS
- MENUITEM "Param\xE8tres de la RAM...", IDM_RAM_SETTINGS
- MENUITEM "&C64DTV settings...", IDM_C64DTV_SETTINGS
- MENUITEM SEPARATOR
- MENUITEM "&Enregistrer les param\xE8tres courants", IDM_SETTINGS_SAVE
- MENUITEM "&Charger les param\xE8tres", IDM_SETTINGS_LOAD
- MENUITEM "R\xE9tablir les param\xE8tres par d\xE9&faut", IDM_SETTINGS_DEFAULT
- MENUITEM SEPARATOR
- MENUITEM "Enregistrer les pa&ram\xE8tres \xE0 la sortie", IDM_TOGGLE_SAVE_SETTINGS_ON_EXIT
- MENUITEM "&Confirmation \xE0 la sortie", IDM_TOGGLE_CONFIRM_ON_EXIT
- END
- POPUP "&Langage"
- BEGIN
- MENUITEM "&Anglais", IDM_LANG_EN
- MENUITEM "&Allemand", IDM_LANG_DE
- MENUITEM "&Fran\xE7ais", IDM_LANG_FR
- MENUITEM "&Hungarian", IDM_LANG_HU
- MENUITEM "&Italien", IDM_LANG_IT
- MENUITEM "&Hollandais", IDM_LANG_NL
- MENUITEM "&Polonais", IDM_LANG_PL
- MENUITEM "&Su\xE9dois", IDM_LANG_SV
- END
- POPUP "&Aide"
- BEGIN
-// MENUITEM "H&elp", IDM_HELP
-// MENUITEM SEPARATOR
- MENUITEM "\xC0 &Propos...", IDM_ABOUT
- MENUITEM SEPARATOR
- MENUITEM "&Options de ligne de commande", IDM_CMDLINE
- MENUITEM SEPARATOR
- MENUITEM "&Contributeurs", IDM_CONTRIBUTORS
- MENUITEM "&License", IDM_LICENSE
- MENUITEM "Aucune &garantie!", IDM_WARRANTY
- END
-END
-
-
-// HUNGARIAN version of menu
-
-#pragma code_page(28592)
-IDR_MENUC64DTV_HU MENU DISCARDABLE
-BEGIN
- POPUP "&F\xE1jl"
- BEGIN
- MENUITEM "Lemez/szalag k\xE9pm\xE1s &automatikus ind\xEDt\xE1sa...", IDM_AUTOSTART
- MENUITEM SEPARATOR
- POPUP "Lemezk\xE9pm\xE1s csatol\xE1sa"
- BEGIN
- MENUITEM "#&8-as lemezegys\xE9g\tAlt+8", IDM_ATTACH_8
- MENUITEM "#&9-as lemezegys\xE9g\tAlt+9", IDM_ATTACH_9
- MENUITEM "#1&0-es lemezegys\xE9g\tAlt+0", IDM_ATTACH_10
- MENUITEM "#1&0-es lemezegys\xE9g\tAlt+1", IDM_ATTACH_11
- END
- POPUP "Lemezk\xE9pm\xE1s &lev\xE1laszt\xE1sa"
- BEGIN
- MENUITEM "&8-as lemezegys\xE9g", IDM_DETACH_8
- MENUITEM "&9-es lemezegys\xE9g", IDM_DETACH_9
- MENUITEM "#1&0-es lemezegys\xE9g", IDM_DETACH_10
- MENUITEM "#&11-es lemezegys\xE9g", IDM_DETACH_11
- MENUITEM SEPARATOR
- MENUITEM "\xD6&sszes\tAlt+A", IDM_DETACH_ALL
- END
- POPUP "Lemezl&ista"
- BEGIN
- MENUITEM "Az aktu\xE1lis k\xE9pm\xE1s ho&zz\xE1ad\xE1sa\tAlt+I", IDM_FLIP_ADD
- MENUITEM "Az aktu\xE1lis k\xE9pm\xE1s el&t\xE1vol\xEDt\xE1sa\tAlt+K", IDM_FLIP_REMOVE
- MENUITEM "&K\xF6vetkez\xF5 k\xE9pm\xE1s csatol\xE1sa\tAlt+N", IDM_FLIP_NEXT
- MENUITEM "&El\xF5z\xF5 k\xE9pm\xE1s csatol\xE1sa\tAlt+B", IDM_FLIP_PREVIOUS
- MENUITEM SEPARATOR
- MENUITEM "&Lemezlista bet\xF6lt\xE9se", IDM_FLIP_LOAD
- MENUITEM "Lemezlista ment\xE9&se", IDM_FLIP_SAVE
- END
- MENUITEM SEPARATOR
- MENUITEM "&Sz\xFCnet\tAlt+Pause", IDM_PAUSE, CHECKED
- MENUITEM "&Monitor\tAlt+M", IDM_MONITOR
- POPUP "\xDAj&raind\xEDt\xE1s"
- BEGIN
- MENUITEM "&Hideg\tCtrl+Alt+R", IDM_RESET_HARD
- MENUITEM "&Meleg\tAlt+R", IDM_RESET_SOFT
- MENUITEM SEPARATOR
- MENUITEM "#&8-as lemezegys\xE9g", IDM_RESET_DRIVE8
- MENUITEM "#&9-es lemezegys\xE9g", IDM_RESET_DRIVE9
- MENUITEM "#1&0-es lemezegys\xE9g", IDM_RESET_DRIVE10
- MENUITEM "#&11-es lemezegys\xE9g", IDM_RESET_DRIVE11
- END
-#ifdef DEBUG
- POPUP "&Nyomk\xF6vet\xE9s"
- BEGIN
- POPUP "M\xF3&d"
- BEGIN
- MENUITEM "&Norm\xE1l", IDM_DEBUG_MODE_NORMAL
- MENUITEM "&Kicsi", IDM_DEBUG_MODE_SMALL
- MENUITEM "&El\xF5zm\xE9nyek", IDM_DEBUG_MODE_HISTORY
- MENUITEM "E&l\xF5zm\xE9nyek lej\xE1tsz\xE1sa", IDM_DEBUG_MODE_AUTOPLAY
- END
- MENUITEM "&F\xF5 CPU k\xF6vet\xE9se\tAlt+F10", IDM_TOGGLE_MAINCPU_TRACE, CHECKED
- MENUITEM "&0. lemezegys\xE9g CPU k\xF6vet\xE9se\tAlt+F11", IDM_TOGGLE_DRIVE0CPU_TRACE, CHECKED
- MENUITEM "&1. lemezegys\xE9g CPU k\xF6vet\xE9se\tAlt+F12", IDM_TOGGLE_DRIVE1CPU_TRACE, CHECKED
- END
-#endif
- MENUITEM SEPARATOR
- MENUITEM "&Kil\xE9p\xE9s\tAlt+X", IDM_EXIT
- END
- POPUP "&Pillanatk\xE9p"
- BEGIN
- MENUITEM "Pillanatk\xE9p &bet\xF6lt\xE9se...", IDM_SNAPSHOT_LOAD
- MENUITEM "Pillanatk\xE9p &ment\xE9se...", IDM_SNAPSHOT_SAVE
- MENUITEM "Gyors pillanatk\xE9p b&et\xF6lt\xE9se\tAlt+L", IDM_LOADQUICK
- MENUITEM "Gyors pillanatk\xE9p me&nt\xE9se\tAlt+S", IDM_SAVEQUICK
- MENUITEM SEPARATOR
- MENUITEM "Esem\xE9ny &felv\xE9tel ind\xEDt\xE1sa/le\xE1ll\xEDt\xE1sa", IDM_EVENT_TOGGLE_RECORD
- MENUITEM "Esem\xE9ny &visszaj\xE1tsz\xE1s ind\xEDt\xE1sa/le\xE1ll\xEDt\xE1sa", IDM_EVENT_TOGGLE_PLAYBACK
- MENUITEM "Kil\xF3m\xE9terk\xF5 elhelyez\xE9se a felv\xE9telben\tAlt+G", IDM_EVENT_SETMILESTONE
- MENUITEM "Visszat\xE9r\xE9s az el\xF5z\xF5 kil\xF3m\xE9terk\xF5h\xF6z\tAlt+H", IDM_EVENT_RESETMILESTONE
- POPUP "R\xF6gz\xEDt\xE9s ind\xEDt\xE1s\xE1nak m\xF3dja"
- BEGIN
- MENUITEM "\xDAj pillanatk\xE9p &ment\xE9se", IDM_EVENT_START_MODE_SAVE
- MENUITEM "L\xE9tez\xF5 pillanatk\xE9p &bet\xF6lt\xE9se", IDM_EVENT_START_MODE_LOAD
- MENUITEM "Indul\xE1s &RESET-tel egy\xFCtt", IDM_EVENT_START_MODE_RESET
- MENUITEM "A visszaj\xE1tsz\xE1s &fel\xFCl\xEDr\xE1sa", IDM_EVENT_START_MODE_PLAYBACK
- END
- MENUITEM "V\xE1lassza ki a felv\xE9teleket/k\xF6nyvt\xE1rat", IDM_EVENT_DIRECTORY
- MENUITEM SEPARATOR
- MENUITEM "Vide\xF3 k\xE9sz\xEDt\xE9se/meg\xE1ll\xEDt\xE1sa...\tAlt+C", IDM_MEDIAFILE
- MENUITEM SEPARATOR
- MENUITEM "Hang felv\xE9tele...", IDM_SOUND_RECORD_START
- MENUITEM "Hangfelv\xE9tel le\xE1ll\xEDt\xE1sa", IDM_SOUND_RECORD_STOP
- MENUITEM SEPARATOR
- MENUITEM "H\xE1l\xF3zati j\xE1t\xE9k (k\xEDs\xE9rleti)...", IDM_NETWORK_SETTINGS
- END
- POPUP "&Opci\xF3k"
- BEGIN
- POPUP "Friss\xEDt\xE9si &r\xE1ta"
- BEGIN
- MENUITEM "&Automatikus", IDM_REFRESH_RATE_AUTO
- MENUITEM "1/&1", IDM_REFRESH_RATE_1
- MENUITEM "1/&2", IDM_REFRESH_RATE_2
- MENUITEM "1/&3", IDM_REFRESH_RATE_3
- MENUITEM "1/&4", IDM_REFRESH_RATE_4
- MENUITEM "1/&5", IDM_REFRESH_RATE_5
- MENUITEM "1/&6", IDM_REFRESH_RATE_6
- MENUITEM "1/&7", IDM_REFRESH_RATE_7
- MENUITEM "1/&8", IDM_REFRESH_RATE_8
- MENUITEM "1/&9", IDM_REFRESH_RATE_9
- MENUITEM "1/1&0", IDM_REFRESH_RATE_10
-#if 0
- MENUITEM SEPARATOR
- MENUITEM "&Egy\xE9ni", IDM_REFRESH_RATE_CUSTOM
-#endif
- END
- POPUP "&Maxim\xE1lis sebess\xE9g"
- BEGIN
- MENUITEM "&200%", IDM_MAXIMUM_SPEED_200
- MENUITEM "&100%", IDM_MAXIMUM_SPEED_100
- MENUITEM "&50%", IDM_MAXIMUM_SPEED_50
- MENUITEM "&20%", IDM_MAXIMUM_SPEED_20
- MENUITEM "1&0%", IDM_MAXIMUM_SPEED_10
- MENUITEM "Nincs &hat\xE1r", IDM_MAXIMUM_SPEED_NO_LIMIT
- MENUITEM SEPARATOR
- MENUITEM "&Egy\xE9ni", IDM_MAXIMUM_SPEED_CUSTOM
- END
- MENUITEM "&Hipergyors m\xF3d\tAlt+W", IDM_TOGGLE_WARP_MODE, CHECKED
- MENUITEM SEPARATOR
- MENUITEM "Teljes k\xE9perny\xF5\tAlt+D", IDM_TOGGLE_FULLSCREEN
- MENUITEM "Mindig fel\xFCl", IDM_TOGGLE_ALWAYSONTOP
- MENUITEM SEPARATOR
- MENUITEM "Vide\xF3 gyors\xEDt\xF3t\xE1r", IDM_TOGGLE_VIDEOCACHE, CHECKED
- MENUITEM "&Dupla m\xE9ret", IDM_TOGGLE_DOUBLESIZE, CHECKED
- MENUITEM "Du&pla p\xE1szt\xE1z\xE1s", IDM_TOGGLE_DOUBLESCAN, CHECKED
- MENUITEM "PAL emul\xE1ci\xF3", IDM_TOGGLE_FASTPAL, CHECKED
- MENUITEM "2x m\xE9retez", IDM_TOGGLE_SCALE2X, CHECKED
- MENUITEM SEPARATOR
- MENUITEM "Botkorm\xE1nyok felcser\xE9l\xE9se\tAlt+J", IDM_SWAP_JOYSTICK
- MENUITEM SEPARATOR
- MENUITEM "&Hangok enged\xE9lyez\xE9se", IDM_TOGGLE_SOUND, CHECKED
- MENUITEM SEPARATOR
- MENUITEM "&Igazi lemezegys\xE9g emul\xE1ci\xF3", IDM_TOGGLE_DRIVE_TRUE_EMULATION, CHECKED
- MENUITEM "&True flash filesystem", IDM_TOGGLE_FLASH_TRUE_FILESYSTEM, CHECKED
- MENUITEM "*Virtu\xE1lis eszk\xF6z\xF6k ciklus kihagy\xE1sa", IDM_TOGGLE_VIRTUAL_DEVICES
- MENUITEM SEPARATOR
- POPUP "Vide\xF3 &szabv\xE1ny"
- BEGIN
- MENUITEM "&PAL-G", IDM_SYNC_FACTOR_PAL
- MENUITEM "&NTSC-M", IDM_SYNC_FACTOR_NTSC
- END
- MENUITEM SEPARATOR
- MENUITEM "Emul\xE1tor &azonos\xEDt\xF3", IDM_TOGGLE_EMUID
- MENUITEM "&PS/2 mouse emulation", IDM_PS2MOUSE
- MENUITEM "&Grab mouse events\tAlt+Q", IDM_MOUSE
- END
- POPUP "B&e\xE1ll\xEDt\xE1sok"
- BEGIN
- MENUITEM "&Vide\xF3 be\xE1ll\xEDt\xE1sai...", IDM_VIDEO_SETTINGS
- MENUITEM "&Perif\xE9ri\xE1k be\xE1ll\xEDt\xE1sai...",IDM_DEVICEMANAGER
- MENUITEM "&Lemezegys\xE9g be\xE1ll\xEDt\xE1sai...", IDM_DRIVE_SETTINGS
- MENUITEM "VIC-II be\xE1ll\xEDt\xE1sai...", IDM_VICII_SETTINGS
- MENUITEM "B&otkorm\xE1ny be\xE1ll\xEDt\xE1sai...", IDM_JOY_SETTINGS
- MENUITEM "&Billenty\xFBzet be\xE1ll\xEDt\xE1sai...", IDM_KEYBOARD_SETTINGS
- MENUITEM "Hang be\xE1ll\xEDt\xE1sok...", IDM_SOUND_SETTINGS
- MENUITEM "S&ID be\xE1ll\xEDt\xE1sai...", IDM_SID_SETTINGS
- MENUITEM "&ROM-ok be\xE1ll\xEDt\xE1sai...", IDM_ROM_SETTINGS
- MENUITEM "RA&M be\xE1ll\xEDt\xE1sai...", IDM_RAM_SETTINGS
- MENUITEM "&C64DTV settings...", IDM_C64DTV_SETTINGS
- MENUITEM SEPARATOR
- MENUITEM "Jelenlegi be\xE1ll\xEDt\xE1sok &ment\xE9se", IDM_SETTINGS_SAVE
- MENUITEM "Mentett be\xE1ll\xEDt\xE1sok &bet\xF6lt\xE9se", IDM_SETTINGS_LOAD
- MENUITEM "Alap\xE9rtelmez\xE9sek &be\xE1ll\xEDt\xE1sa", IDM_SETTINGS_DEFAULT
- MENUITEM SEPARATOR
- MENUITEM "Be\xE1ll\xEDt\xE1sok ment\xE9se k&il\xE9p\xE9skor", IDM_TOGGLE_SAVE_SETTINGS_ON_EXIT
- MENUITEM "&Meger\xF5s\xEDt\xE9s kil\xE9p\xE9skor", IDM_TOGGLE_CONFIRM_ON_EXIT
- END
- POPUP "&Nyelv"
- BEGIN
- MENUITEM "&Angol", IDM_LANG_EN
- MENUITEM "&N\xE9met", IDM_LANG_DE
- MENUITEM "&Francia", IDM_LANG_FR
- MENUITEM "&Magyar", IDM_LANG_HU
- MENUITEM "&Olasz", IDM_LANG_IT
- MENUITEM "&Holland", IDM_LANG_NL
- MENUITEM "&Lengyel", IDM_LANG_PL
- MENUITEM "&Sv\xE9d", IDM_LANG_SV
- END
- POPUP "&S\xFAg\xF3"
- BEGIN
-// MENUITEM "H&elp", IDM_HELP
-// MENUITEM SEPARATOR
- MENUITEM "&N\xE9vjegy...", IDM_ABOUT
- MENUITEM SEPARATOR
- MENUITEM "Parancssori &opci\xF3k", IDM_CMDLINE
- MENUITEM SEPARATOR
- MENUITEM "&K\xF6zrem\xFBk\xF6d\xF5k", IDM_CONTRIBUTORS
- MENUITEM "&Licensz", IDM_LICENSE
- MENUITEM "Nincs &garancia", IDM_WARRANTY
- END
-END
-#pragma code_page(28591)
-
-
-// ITALIAN version of menu
-
-IDR_MENUC64DTV_IT MENU DISCARDABLE
-BEGIN
- POPUP "&File"
- BEGIN
- MENUITEM "&Avvia automaticamente l'immagine di un disco...", IDM_AUTOSTART
- MENUITEM SEPARATOR
- POPUP "Seleziona l'immagine di un &disco"
- BEGIN
- MENUITEM "Drive &8\tAlt+8", IDM_ATTACH_8
- MENUITEM "Drive &9\tAlt+9", IDM_ATTACH_9
- MENUITEM "Drive 1&0\tAlt+0", IDM_ATTACH_10
- MENUITEM "Drive &11\tAlt+1", IDM_ATTACH_11
- END
- POPUP "&Rimuovi l'immagine di un disco"
- BEGIN
- MENUITEM "Drive &8", IDM_DETACH_8
- MENUITEM "Drive &9", IDM_DETACH_9
- MENUITEM "Drive 1&0", IDM_DETACH_10
- MENUITEM "Drive &11", IDM_DETACH_11
- MENUITEM SEPARATOR
- MENUITEM "&Tutti\tAlt+A", IDM_DETACH_ALL
- END
- POPUP "&Flip list"
- BEGIN
- MENUITEM "&Aggiungi l'immagine attuale\tAlt+I", IDM_FLIP_ADD
- MENUITEM "&Rimuovi l'immagine attuale\tAlt+K", IDM_FLIP_REMOVE
- MENUITEM "Seleziona l'immagine successiva\tAlt+N", IDM_FLIP_NEXT
- MENUITEM "Seleziona l'immagine &precedente\tAlt+B", IDM_FLIP_PREVIOUS
- MENUITEM SEPARATOR
- MENUITEM "&Carica fliplist", IDM_FLIP_LOAD
- MENUITEM "&Salva fliplist", IDM_FLIP_SAVE
- END
- MENUITEM SEPARATOR
- MENUITEM "&Pausa\tAlt+Pause", IDM_PAUSE, CHECKED
- MENUITEM "&Monitor\tAlt+M", IDM_MONITOR
- POPUP "&Reset"
- BEGIN
- MENUITEM "&Hard\tCtrl+Alt+R", IDM_RESET_HARD
- MENUITEM "&Soft\tAlt+R", IDM_RESET_SOFT
- MENUITEM SEPARATOR
- MENUITEM "Drive #&8", IDM_RESET_DRIVE8
- MENUITEM "Drive #&9", IDM_RESET_DRIVE9
- MENUITEM "Drive #1&0", IDM_RESET_DRIVE10
- MENUITEM "Drive #&11", IDM_RESET_DRIVE11
- END
-#ifdef DEBUG
- POPUP "&Debug"
- BEGIN
- POPUP "M&odalit\xE0"
- BEGIN
- MENUITEM "&Normale", IDM_DEBUG_MODE_NORMAL
- MENUITEM "&Piccolo", IDM_DEBUG_MODE_SMALL
- MENUITEM "&Cronologia", IDM_DEBUG_MODE_HISTORY
- MENUITEM "Autoplay &Cronologia", IDM_DEBUG_MODE_AUTOPLAY
- END
- MENUITEM "Traccia della CPU &principale\tAlt+F10", IDM_TOGGLE_MAINCPU_TRACE, CHECKED
- MENUITEM "Traccia della CPU del drive&0\tAlt+F11", IDM_TOGGLE_DRIVE0CPU_TRACE, CHECKED
- MENUITEM "Traccia della CPU del drive&1\tAlt+F12", IDM_TOGGLE_DRIVE1CPU_TRACE, CHECKED
- END
-#endif
- MENUITEM SEPARATOR
- MENUITEM "E&sci\tAlt+X", IDM_EXIT
- END
- POPUP "Sna&pshot"
- BEGIN
- MENUITEM "Carica &immagine dello snapshot...", IDM_SNAPSHOT_LOAD
- MENUITEM "Salva immagine dello sna&pshot...", IDM_SNAPSHOT_SAVE
- MENUITEM "&Carica immagine quicksnapshot\tAlt+L", IDM_LOADQUICK
- MENUITEM "Salva immagine quicksnapshot\tAlt+S", IDM_SAVEQUICK
- MENUITEM SEPARATOR
- MENUITEM "Avvia/termina la ®istrazione della cronologia", IDM_EVENT_TOGGLE_RECORD
- MENUITEM "Avvia/termina la r&iproduzione della cronologia", IDM_EVENT_TOGGLE_PLAYBACK
- MENUITEM "Imposta segnalibro\tAlt+G", IDM_EVENT_SETMILESTONE
- MENUITEM "Vai al segnalibro\tAlt+H", IDM_EVENT_RESETMILESTONE
- POPUP "Modalit\xE0 di inizio registrazione"
- BEGIN
- MENUITEM "&Salva nuovo snapshot", IDM_EVENT_START_MODE_SAVE
- MENUITEM "&Carica snapshot esistente", IDM_EVENT_START_MODE_LOAD
- MENUITEM "Avvia con &reset", IDM_EVENT_START_MODE_RESET
- MENUITEM "Sovrascrivi la &riproduzione", IDM_EVENT_START_MODE_PLAYBACK
- END
- MENUITEM "Seleziona i file/directory della cronologia", IDM_EVENT_DIRECTORY
- MENUITEM SEPARATOR
- MENUITEM "Salva/arresta file multimediale...\tAlt+C", IDM_MEDIAFILE
- MENUITEM SEPARATOR
- MENUITEM "Registra audio...", IDM_SOUND_RECORD_START
- MENUITEM "Interrompi la registrazione audio", IDM_SOUND_RECORD_STOP
- MENUITEM SEPARATOR
- MENUITEM "Netplay (sperimentale)...", IDM_NETWORK_SETTINGS
- END
- POPUP "&Opzioni"
- BEGIN
- POPUP "Frequenza di &aggiornamento"
- BEGIN
- MENUITEM "&Auto", IDM_REFRESH_RATE_AUTO
- MENUITEM "1/&1", IDM_REFRESH_RATE_1
- MENUITEM "1/&2", IDM_REFRESH_RATE_2
- MENUITEM "1/&3", IDM_REFRESH_RATE_3
- MENUITEM "1/&4", IDM_REFRESH_RATE_4
- MENUITEM "1/&5", IDM_REFRESH_RATE_5
- MENUITEM "1/&6", IDM_REFRESH_RATE_6
- MENUITEM "1/&7", IDM_REFRESH_RATE_7
- MENUITEM "1/&8", IDM_REFRESH_RATE_8
- MENUITEM "1/&9", IDM_REFRESH_RATE_9
- MENUITEM "1/1&0", IDM_REFRESH_RATE_10
-#if 0
- MENUITEM SEPARATOR
- MENUITEM "&Custom", IDM_REFRESH_RATE_CUSTOM
-#endif
- END
- POPUP "Velocit\xE0 &massima"
- BEGIN
- MENUITEM "&200%", IDM_MAXIMUM_SPEED_200
- MENUITEM "&100%", IDM_MAXIMUM_SPEED_100
- MENUITEM "&50%", IDM_MAXIMUM_SPEED_50
- MENUITEM "&20%", IDM_MAXIMUM_SPEED_20
- MENUITEM "1&0%", IDM_MAXIMUM_SPEED_10
- MENUITEM "Nessun &limite", IDM_MAXIMUM_SPEED_NO_LIMIT
- MENUITEM SEPARATOR
- MENUITEM "&Personalizzata", IDM_MAXIMUM_SPEED_CUSTOM
- END
- MENUITEM "Modalit\xE0 &turbo\tAlt+W", IDM_TOGGLE_WARP_MODE, CHECKED
- MENUITEM SEPARATOR
- MENUITEM "A tutto schermo\tAlt+D", IDM_TOGGLE_FULLSCREEN
- MENUITEM "Sempre in primo piano", IDM_TOGGLE_ALWAYSONTOP
- MENUITEM SEPARATOR
- MENUITEM "&Cache video", IDM_TOGGLE_VIDEOCACHE, CHECKED
- MENUITEM "&Dimensione doppia", IDM_TOGGLE_DOUBLESIZE, CHECKED
- MENUITEM "Scansione do&ppia", IDM_TOGGLE_DOUBLESCAN, CHECKED
- MENUITEM "Emulazione PAL", IDM_TOGGLE_FASTPAL, CHECKED
- MENUITEM "Scale2x", IDM_TOGGLE_SCALE2X, CHECKED
- MENUITEM SEPARATOR
- MENUITEM "Scambia &joystick\tAlt+J", IDM_SWAP_JOYSTICK
- MENUITEM SEPARATOR
- MENUITEM "Riproduzione del &suono", IDM_TOGGLE_SOUND, CHECKED
- MENUITEM SEPARATOR
- MENUITEM "Attiva l'emulazione &hardware dei drive", IDM_TOGGLE_DRIVE_TRUE_EMULATION, CHECKED
- MENUITEM "&True flash filesystem", IDM_TOGGLE_FLASH_TRUE_FILESYSTEM, CHECKED
- MENUITEM "Attiva le periferiche &virtuali", IDM_TOGGLE_VIRTUAL_DEVICES
- MENUITEM SEPARATOR
- POPUP "Standard vide&o"
- BEGIN
- MENUITEM "&PAL-G", IDM_SYNC_FACTOR_PAL
- MENUITEM "&NTSC-M", IDM_SYNC_FACTOR_NTSC
- END
- MENUITEM SEPARATOR
- MENUITEM "&Identificazione dell'emulatore", IDM_TOGGLE_EMUID
- MENUITEM "&PS/2 mouse emulation", IDM_PS2MOUSE
- MENUITEM "&Grab mouse events\tAlt+Q", IDM_MOUSE
- END
- POPUP "I&mpostazioni"
- BEGIN
- MENUITEM "Impostazioni &video...", IDM_VIDEO_SETTINGS
- MENUITEM "Impostazioni &periferiche...",IDM_DEVICEMANAGER
- MENUITEM "Impostazioni &drive...", IDM_DRIVE_SETTINGS
- MENUITEM "Impostazioni VIC-II...", IDM_VICII_SETTINGS
- MENUITEM "Impostazioni &joystick...", IDM_JOY_SETTINGS
- MENUITEM "Impostazioni &tastiera...", IDM_KEYBOARD_SETTINGS
- MENUITEM "Impostazioni a&udio...", IDM_SOUND_SETTINGS
- MENUITEM "Impostazioni S&ID...", IDM_SID_SETTINGS
- MENUITEM "Impostazioni &ROM...", IDM_ROM_SETTINGS
- MENUITEM "Impostazioni RA&M...", IDM_RAM_SETTINGS
- MENUITEM "&C64DTV settings...", IDM_C64DTV_SETTINGS
- MENUITEM SEPARATOR
- MENUITEM "&Salva le impostazioni attuali", IDM_SETTINGS_SAVE
- MENUITEM "&Carica le impostazioni salvate", IDM_SETTINGS_LOAD
- MENUITEM "&Ripristina le impostazioni originarie", IDM_SETTINGS_DEFAULT
- MENUITEM SEPARATOR
- MENUITEM "Salva le impostazioni in u&scita", IDM_TOGGLE_SAVE_SETTINGS_ON_EXIT
- MENUITEM "&Conferma all'uscita", IDM_TOGGLE_CONFIRM_ON_EXIT
- END
- POPUP "&Lingua"
- BEGIN
- MENUITEM "&Inglese", IDM_LANG_EN
- MENUITEM "&Tedesco", IDM_LANG_DE
- MENUITEM "&Francese", IDM_LANG_FR
- MENUITEM "&Ungherese", IDM_LANG_HU
- MENUITEM "&Italiano", IDM_LANG_IT
- MENUITEM "&Olandese", IDM_LANG_NL
- MENUITEM "&Polacco", IDM_LANG_PL
- MENUITEM "&Sv...
[truncated message content] |
|
From: <no...@us...> - 2008-07-21 16:32:52
|
Revision: 19063
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=19063&view=rev
Author: nojoopa
Date: 2008-07-21 16:33:00 +0000 (Mon, 21 Jul 2008)
Log Message:
-----------
Fixed bugs (introduced in ifdef removal) in d020/d024 read.
Modified Paths:
--------------
branches/viceplus/v2.0-x64dtv/vice/src/vicii/vicii-mem.c
Modified: branches/viceplus/v2.0-x64dtv/vice/src/vicii/vicii-mem.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/vicii/vicii-mem.c 2008-07-20 23:11:18 UTC (rev 19062)
+++ branches/viceplus/v2.0-x64dtv/vice/src/vicii/vicii-mem.c 2008-07-21 16:33:00 UTC (rev 19063)
@@ -1698,7 +1698,7 @@
case 0x20: /* $D020: Border color */
VICII_DEBUG_REGISTER(("Border Color register: $%02X",
vicii.regs[addr]));
- return vicii.viciidtv?vicii.regs[addr] | 0xf0:vicii.regs[addr];
+ return vicii.viciidtv?vicii.regs[addr]:(vicii.regs[addr] | 0xf0);
case 0x21: /* $D021: Background #0 color */
case 0x22: /* $D022: Background #1 color */
@@ -1706,7 +1706,7 @@
case 0x24: /* $D024: Background #3 color */
VICII_DEBUG_REGISTER(("Background Color #%d register: $%02X",
addr - 0x21, vicii.regs[addr]));
- return vicii.viciidtv?vicii.regs[addr] | 0xf0:vicii.regs[addr];
+ return vicii.viciidtv?vicii.regs[addr]:(vicii.regs[addr] | 0xf0);
case 0x25: /* $D025: Sprite multicolor register #0 */
case 0x26: /* $D026: Sprite multicolor register #1 */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bla...@us...> - 2008-07-20 23:11:45
|
Revision: 19062
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=19062&view=rev
Author: blackystardust
Date: 2008-07-20 23:11:18 +0000 (Sun, 20 Jul 2008)
Log Message:
-----------
Fixed some warnings
Modified Paths:
--------------
branches/viceplus/v2.0-x64dtv/vice/src/arch/unix/gui/uic64dtv.c
branches/viceplus/v2.0-x64dtv/vice/src/monitor/mon_file.c
branches/viceplus/v2.0-x64dtv/vice/src/monitor/montypes.h
Modified: branches/viceplus/v2.0-x64dtv/vice/src/arch/unix/gui/uic64dtv.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/unix/gui/uic64dtv.c 2008-07-20 21:11:46 UTC (rev 19061)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/unix/gui/uic64dtv.c 2008-07-20 23:11:18 UTC (rev 19062)
@@ -37,8 +37,6 @@
UI_MENU_DEFINE_TOGGLE(c64dtvromrw)
UI_MENU_DEFINE_TOGGLE(HummerUserportJoy)
UI_MENU_DEFINE_RADIO(HummerUserportJoyPort)
-UI_MENU_DEFINE_TOGGLE(PS2Mouse)
-UI_MENU_DEFINE_TOGGLE(Mouse)
UI_CALLBACK(set_c64dtv_rom_name)
{
Modified: branches/viceplus/v2.0-x64dtv/vice/src/monitor/mon_file.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/monitor/mon_file.c 2008-07-20 21:11:46 UTC (rev 19061)
+++ branches/viceplus/v2.0-x64dtv/vice/src/monitor/mon_file.c 2008-07-20 23:11:18 UTC (rev 19062)
@@ -154,7 +154,7 @@
BYTE b1 = 0, b2 = 0;
int ch = 0;
MEMSPACE mem;
- int origbank;
+ int origbank = 0;
#define curbank (mon_interfaces[mem]->current_bank)
if (mon_file_open(filename, 0, device) < 0) {
Modified: branches/viceplus/v2.0-x64dtv/vice/src/monitor/montypes.h
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/monitor/montypes.h 2008-07-20 21:11:46 UTC (rev 19061)
+++ branches/viceplus/v2.0-x64dtv/vice/src/monitor/montypes.h 2008-07-20 23:11:18 UTC (rev 19062)
@@ -293,7 +293,6 @@
extern void mon_record_commands(char *filename);
extern void mon_end_recording(void);
-extern void mon_change_device(MEMSPACE mem);
+extern void monitor_change_device(MEMSPACE mem);
#endif
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cnv...@us...> - 2008-07-20 21:11:59
|
Revision: 19061
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=19061&view=rev
Author: cnvogelg
Date: 2008-07-20 21:11:46 +0000 (Sun, 20 Jul 2008)
Log Message:
-----------
fixed gtk color setup to be endian safe. big endian now works, too.
Modified Paths:
--------------
branches/chris/cocoa-port/vice/src/arch/unix/x11/gnome/uicolor.c
Modified: branches/chris/cocoa-port/vice/src/arch/unix/x11/gnome/uicolor.c
===================================================================
--- branches/chris/cocoa-port/vice/src/arch/unix/x11/gnome/uicolor.c 2008-07-20 20:40:53 UTC (rev 19060)
+++ branches/chris/cocoa-port/vice/src/arch/unix/x11/gnome/uicolor.c 2008-07-20 21:11:46 UTC (rev 19061)
@@ -101,14 +101,12 @@
for (i = 0; i < palette->num_entries; i++) {
palette_entry_t color = palette->entries[i];
- DWORD color_pixel;
-
- unsigned char *col = (unsigned char *)&color_pixel;
- col[0] = color.red ;
- col[1] = color.green;
- col[2] = color.blue ;
- video_render_setphysicalcolor(((video_canvas_t*)c)->videoconfig, i,
- color_pixel, 24);
+ DWORD color_pixel =
+ (DWORD)color.red |
+ (DWORD)color.green << 8 |
+ (DWORD)color.blue << 16;
+ video_render_setphysicalcolor(((video_canvas_t*)c)->videoconfig, i,
+ color_pixel, 24);
}
return 0;
}
@@ -116,27 +114,11 @@
static void uicolor_init_video_colors()
{
short i;
- DWORD pixelr, pixelg, pixelb;
- for (i = 0; i < 256; i++)
- {
- unsigned char* pixelrbyte = (unsigned char*)&pixelr;
- unsigned char* pixelgbyte = (unsigned char*)&pixelg;
- unsigned char* pixelbbyte = (unsigned char*)&pixelb;
- pixelrbyte[0] = i;
- pixelrbyte[1] = 0;
- pixelrbyte[2] = 0;
- pixelgbyte[0] = 0;
- pixelgbyte[1] = i;
- pixelgbyte[2] = 0;
- pixelbbyte[0] = 0;
- pixelbbyte[1] = 0;
- pixelbbyte[2] = i;
-
- video_render_setrawrgb(i,
- pixelr,
- pixelg,
- pixelb);
+ for (i = 0; i < 256; i++) {
+ video_render_setrawrgb(i,
+ (DWORD)i, (DWORD)i << 8, (DWORD)i << 16
+ );
}
video_render_initraw();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <no...@us...> - 2008-07-20 20:41:04
|
Revision: 19060
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=19060&view=rev
Author: nojoopa
Date: 2008-07-20 20:40:53 +0000 (Sun, 20 Jul 2008)
Log Message:
-----------
x64dtv merge
Modified Paths:
--------------
branches/viceplus/v2.0-x64dtv/vice/src/monitor/mon_lex.c
branches/viceplus/v2.0-x64dtv/vice/src/monitor/mon_parse.c
branches/viceplus/v2.0-x64dtv/vice/src/raster/raster-line.c
branches/viceplus/v2.0-x64dtv/vice/src/raster/raster.c
branches/viceplus/v2.0-x64dtv/vice/src/raster/raster.h
branches/viceplus/v2.0-x64dtv/vice/src/vicii/vicii-badline.c
Modified: branches/viceplus/v2.0-x64dtv/vice/src/monitor/mon_lex.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/monitor/mon_lex.c 2008-07-20 17:59:30 UTC (rev 19059)
+++ branches/viceplus/v2.0-x64dtv/vice/src/monitor/mon_lex.c 2008-07-20 20:40:53 UTC (rev 19060)
@@ -363,8 +363,8 @@
*yy_cp = '\0'; \
(yy_c_buf_p) = yy_cp;
-#define YY_NUM_RULES 173
-#define YY_END_OF_BUFFER 174
+#define YY_NUM_RULES 203
+#define YY_END_OF_BUFFER 204
/* This struct is not used in this scanner,
but its presence is necessary. */
struct yy_trans_info
@@ -372,119 +372,123 @@
flex_int32_t yy_verify;
flex_int32_t yy_nxt;
};
-static yyconst flex_int16_t yy_acclist[987] =
+static yyconst flex_int16_t yy_acclist[1020] =
{ 0,
- 100, 163, 100, 163, 100, 100, 100, 100, 85, 100,
- 85, 100, 100, 100, 100, 163, 100, 163, 100, 163,
- 100, 163, 100, 163, 100, 163, 100, 163, 100, 163,
- 100, 103, 100, 103, 99, 100, 99, 100, 174, 172,
- 173, 100, 173, 101, 172, 173, 83, 172, 173, 172,
- 173, 172, 173, 172, 173, 172, 173, 170, 172, 173,
- 172, 173, 163, 165, 168, 172, 173, 160, 163, 165,
- 168, 172, 173, 165, 168, 172, 173, 165, 168, 172,
- 173, 76, 172, 173, 169, 172, 173, 168, 172, 173,
- 92, 168, 172, 173, 168, 172, 173, 90, 168, 172,
+ 100, 193, 100, 193, 100, 100, 100, 100, 85, 100,
+ 85, 100, 100, 100, 100, 193, 100, 193, 100, 193,
+ 100, 193, 100, 193, 100, 193, 100, 193, 100, 193,
+ 100, 103, 100, 103, 99, 100, 99, 100, 204, 202,
+ 203, 100, 203, 101, 202, 203, 83, 202, 203, 202,
+ 203, 202, 203, 202, 203, 202, 203, 200, 202, 203,
+ 202, 203, 193, 195, 198, 202, 203, 190, 193, 195,
+ 198, 202, 203, 195, 198, 202, 203, 195, 198, 202,
+ 203, 76, 202, 203, 199, 202, 203, 198, 202, 203,
+ 92, 198, 202, 203, 198, 202, 203, 90, 198, 202,
- 173, 91, 172, 173, 93, 172, 173, 172, 173, 172,
- 173, 172, 173, 93, 172, 173, 172, 173, 172, 173,
- 172, 173, 172, 173, 2, 172, 173, 33, 172, 173,
- 3, 172, 173, 75, 172, 173, 4, 75, 172, 173,
- 75, 172, 173, 17, 75, 172, 173, 22, 75, 172,
- 173, 75, 172, 173, 31, 75, 172, 173, 32, 75,
- 172, 173, 34, 75, 172, 173, 35, 75, 172, 173,
- 75, 172, 173, 40, 75, 172, 173, 42, 75, 172,
- 173, 49, 75, 172, 173, 51, 75, 172, 173, 75,
- 172, 173, 56, 75, 172, 173, 61, 75, 172, 173,
+ 203, 91, 202, 203, 93, 202, 203, 202, 203, 202,
+ 203, 202, 203, 93, 202, 203, 202, 203, 202, 203,
+ 202, 203, 202, 203, 2, 202, 203, 33, 202, 203,
+ 3, 202, 203, 75, 202, 203, 4, 75, 202, 203,
+ 75, 202, 203, 17, 75, 202, 203, 22, 75, 202,
+ 203, 75, 202, 203, 31, 75, 202, 203, 32, 75,
+ 202, 203, 34, 75, 202, 203, 35, 75, 202, 203,
+ 75, 202, 203, 40, 75, 202, 203, 42, 75, 202,
+ 203, 49, 75, 202, 203, 51, 75, 202, 203, 75,
+ 202, 203, 56, 75, 202, 203, 61, 75, 202, 203,
- 47, 75, 172, 173, 75, 172, 173, 73, 75, 172,
- 173, 30, 75, 172, 173, 75, 172, 173, 67, 75,
- 172, 173, 1, 172, 173, 85, 172, 173, 85, 100,
- 173, 84, 172, 173, 85, 170, 172, 173, 85, 169,
- 172, 173, 104, 172, 173, 104, 170, 172, 173, 104,
- 169, 172, 173, 157, 172, 173, 155, 172, 173, 156,
- 172, 173, 172, 173, 160, 163, 165, 168, 172, 173,
- 165, 168, 172, 173, 158, 172, 173, 168, 172, 173,
- 16530, 147, 168, 172, 173, 148, 168, 172, 173, 149,
- 168, 172, 173, 150, 168, 172, 173, 168, 172, 173,
+ 47, 75, 202, 203, 75, 202, 203, 73, 75, 202,
+ 203, 30, 75, 202, 203, 75, 202, 203, 67, 75,
+ 202, 203, 1, 202, 203, 85, 202, 203, 85, 100,
+ 203, 84, 202, 203, 85, 200, 202, 203, 85, 199,
+ 202, 203, 104, 202, 203, 104, 200, 202, 203, 104,
+ 199, 202, 203, 187, 202, 203, 185, 202, 203, 186,
+ 202, 203, 202, 203, 190, 193, 195, 198, 202, 203,
+ 195, 198, 202, 203, 188, 202, 203, 198, 202, 203,
+ 16560, 177, 198, 202, 203, 178, 198, 202, 203, 179,
+ 198, 202, 203, 180, 198, 202, 203, 198, 202, 203,
- 172, 173, 151, 172, 173, 172, 173, 152, 172, 173,
- 153, 172, 173, 154, 172, 173, 168, 172, 173,16530,
- 147, 168, 172, 173, 149, 168, 172, 173, 151, 172,
- 173, 172, 173, 153, 172, 173, 172, 173, 172, 173,
- 123, 172, 173, 124, 172, 173, 172, 173, 113, 172,
- 173, 169, 172, 173, 114, 172, 173, 172, 173, 105,
- 168, 172, 173, 172, 173, 172, 173, 106, 172, 173,
- 107, 172, 173, 106, 172, 173, 172, 173, 103, 172,
- 173, 103, 172, 173, 103, 172, 173, 103, 172, 173,
- 103, 172, 173, 99, 172, 173, 100, 167, 161, 162,
+ 202, 203, 181, 202, 203, 202, 203, 182, 202, 203,
+ 183, 202, 203, 184, 202, 203, 198, 202, 203,16560,
+ 177, 198, 202, 203, 179, 198, 202, 203, 181, 202,
+ 203, 202, 203, 183, 202, 203, 202, 203, 202, 203,
+ 153, 202, 203, 154, 202, 203, 202, 203, 128, 202,
+ 203, 199, 202, 203, 129, 202, 203, 202, 203, 105,
+ 198, 202, 203, 202, 203, 202, 203, 202, 203, 106,
+ 202, 203, 107, 202, 203, 106, 202, 203, 202, 203,
+ 103, 202, 203, 103, 202, 203, 103, 202, 203, 103,
+ 202, 203, 103, 202, 203, 99, 202, 203, 100, 197,
- 164, 86, 88, 89, 87, 145, 144, 145, 163, 165,
- 168, 165, 168, 168, 160, 163, 165, 168, 160, 163,
- 165, 168, 95, 96, 94, 166, 82, 77, 75, 75,
- 5, 75, 75, 75, 8, 75, 9, 75, 11, 75,
- 12, 75, 13, 75, 75, 15, 75, 75, 75, 75,
- 75, 75, 24, 75, 75, 75, 75, 75, 75, 75,
- 75, 75, 36, 75, 38, 75, 75, 41, 75, 75,
- 21, 75, 43, 75, 75, 75, 75, 48, 75, 75,
- 50, 75, 75, 75, 75, 75, 75, 75, 75, 63,
- 75, 75, 75, 75, 62, 75, 75, 75, 70, 75,
+ 191, 192, 194, 86, 88, 89, 87, 175, 174, 175,
+ 193, 195, 198, 195, 198, 198, 190, 193, 195, 198,
+ 190, 193, 195, 198, 95, 96, 94, 196, 82, 77,
+ 75, 75, 5, 75, 75, 75, 8, 75, 9, 75,
+ 11, 75, 12, 75, 13, 75, 75, 15, 75, 75,
+ 75, 75, 75, 75, 24, 75, 75, 75, 75, 75,
+ 75, 75, 75, 75, 36, 75, 38, 75, 75, 41,
+ 75, 75, 21, 75, 43, 75, 75, 75, 75, 48,
+ 75, 75, 50, 75, 75, 75, 75, 75, 75, 75,
+ 75, 63, 75, 75, 75, 75, 62, 75, 75, 75,
- 71, 75, 75, 75, 85, 85, 100, 104, 160, 163,
- 165, 168, 8338, 143, 168, 133, 143, 168, 143, 134,
- 143, 168, 135, 143, 168, 136, 143, 137, 143, 140,
- 143, 143, 166, 137, 143, 140, 143, 111, 116, 118,
- 119, 120, 112, 110, 115, 117, 108, 109, 171, 103,
- 103, 103, 99, 145, 144, 145, 163, 165, 168, 165,
- 168, 168, 160, 163, 165, 168, 97, 98, 78, 102,
+ 70, 75, 71, 75, 75, 75, 85, 85, 100, 104,
+ 190, 193, 195, 198, 8368, 173, 198, 163, 173, 198,
+ 173, 164, 173, 198, 165, 173, 198, 166, 173, 167,
+ 173, 170, 173, 173, 196, 167, 173, 170, 173, 126,
+ 131, 133, 134, 135, 127, 125, 130, 132, 198, 108,
+ 110, 111, 112, 113, 114, 115, 116, 109, 201, 103,
+ 103, 103, 99, 175, 174, 175, 193, 195, 198, 195,
+ 198, 198, 190, 193, 195, 198, 97, 98, 78, 102,
75, 75, 75, 75, 75, 75, 75, 75, 75, 75,
75, 19, 75, 23, 75, 75, 25, 75, 75, 75,
+
75, 75, 75, 75, 75, 75, 75, 75, 75, 42,
-
75, 75, 75, 75, 75, 75, 75, 52, 75, 75,
54, 75, 55, 75, 75, 75, 60, 75, 75, 75,
66, 75, 65, 75, 75, 75, 75, 75, 75, 75,
- 75, 75, 75, 75, 143, 168, 143, 138, 143, 139,
- 143, 141, 143, 142, 143, 121, 122, 163, 165, 168,
- 165, 168, 168, 160, 163, 165, 168, 80, 75, 75,
- 75, 7, 75, 75, 75, 75, 75, 75, 20, 75,
- 75, 75, 18, 75, 75, 75, 75, 75, 75, 28,
- 75, 75, 30, 75, 31, 75, 32, 75, 33, 75,
- 34, 75, 75, 75, 40, 75, 75, 75, 75, 75,
+ 75, 75, 75, 75, 173, 198, 173, 168, 173, 169,
+ 173, 171, 173, 172, 173, 136, 138, 139, 140, 141,
+ 142, 143, 144, 137, 123, 117, 118, 119, 120, 121,
+ 122, 124, 193, 195, 198, 195, 198, 198, 190, 193,
+ 195, 198, 80, 75, 75, 75, 7, 75, 75, 75,
+ 75, 75, 75, 20, 75, 75, 75, 18, 75, 75,
- 45, 75, 75, 47, 75, 49, 75, 75, 75, 53,
- 75, 75, 75, 75, 75, 75, 75, 75, 75, 61,
- 75, 75, 75, 75, 75, 67, 75, 68, 75, 75,
- 75, 75, 75, 75, 75, 143, 168, 143, 163, 165,
- 168, 165, 168, 168, 160, 163, 165, 168, 81, 75,
- 75, 75, 8, 75, 75, 10, 75, 11, 75, 75,
+ 75, 75, 75, 75, 28, 75, 75, 30, 75, 31,
+ 75, 32, 75, 33, 75, 34, 75, 75, 75, 40,
+ 75, 75, 75, 75, 75, 45, 75, 75, 47, 75,
+ 49, 75, 75, 75, 53, 75, 75, 75, 75, 75,
+ 75, 75, 75, 75, 61, 75, 75, 75, 75, 75,
+ 67, 75, 68, 75, 75, 75, 75, 75, 75, 75,
+ 173, 198, 173, 151, 145, 146, 147, 148, 149, 150,
+ 152, 193, 195, 198, 195, 198, 198, 190, 193, 195,
+ 198, 81, 75, 75, 75, 8, 75, 75, 10, 75,
+ 11, 75, 75, 75, 75, 75, 75, 75, 75, 75,
+
75, 75, 75, 75, 75, 75, 75, 75, 75, 75,
- 75, 75, 75, 75, 75, 75, 75, 46, 75, 75,
- 51, 75, 54, 75, 75, 75, 57, 75, 75, 75,
- 75, 75, 75, 75, 64, 75, 75, 75, 75, 70,
+ 46, 75, 75, 51, 75, 54, 75, 75, 75, 57,
+ 75, 75, 75, 75, 75, 75, 75, 64, 75, 75,
+ 75, 75, 70, 75, 75, 71, 75, 73, 75, 75,
+ 159, 193, 195, 198, 195, 198, 198, 190, 193, 195,
+ 198, 79, 75, 6, 75, 75, 75, 75, 75, 75,
+ 75, 75, 23, 75, 26, 75, 25, 75, 75, 22,
+ 75, 29, 75, 37, 75, 39, 75, 75, 75, 75,
+ 75, 44, 75, 75, 55, 75, 75, 58, 75, 75,
+ 59, 75, 60, 75, 75, 63, 75, 75, 75, 72,
- 75, 75, 71, 75, 73, 75, 75, 129, 163, 165,
- 168, 165, 168, 168, 160, 163, 165, 168, 79, 75,
- 6, 75, 75, 75, 75, 75, 75, 75, 75, 23,
- 75, 26, 75, 25, 75, 75, 22, 75, 29, 75,
- 37, 75, 39, 75, 75, 75, 75, 75, 44, 75,
- 75, 55, 75, 75, 58, 75, 75, 59, 75, 60,
- 75, 75, 63, 75, 75, 75, 72, 75, 75, 125,
- 132, 130, 163, 165, 168, 165, 168, 168, 160, 163,
- 165, 168, 75, 75, 75, 75, 75, 16, 75, 17,
- 75, 75, 75, 75, 27, 75, 75, 75, 75, 75,
+ 75, 75, 155, 162, 160, 193, 195, 198, 195, 198,
+ 198, 190, 193, 195, 198, 75, 75, 75, 75, 75,
+ 16, 75, 17, 75, 75, 75, 75, 27, 75, 75,
+ 75, 75, 75, 75, 75, 75, 75, 75, 75, 75,
+ 74, 75, 161, 189, 193, 195, 198, 189, 195, 198,
+ 189, 198, 189, 190, 193, 195, 198, 75, 75, 75,
+ 75, 75, 75, 75, 75, 75, 75, 75, 75, 75,
+ 75, 75, 75, 75, 75, 69, 75, 158, 193, 195,
+ 198, 195, 198, 198, 190, 193, 195, 198, 75, 75,
+ 75, 18, 75, 75, 75, 75, 75, 75, 56, 75,
- 75, 75, 75, 75, 75, 75, 75, 74, 75, 131,
- 159, 163, 165, 168, 159, 165, 168, 159, 168, 159,
- 160, 163, 165, 168, 75, 75, 75, 75, 75, 75,
- 75, 75, 75, 75, 75, 75, 75, 75, 75, 75,
- 75, 75, 69, 75, 128, 163, 165, 168, 165, 168,
- 168, 160, 163, 165, 168, 75, 75, 75, 18, 75,
- 75, 75, 75, 75, 75, 56, 75, 75, 75, 75,
- 75, 75, 127, 126, 9, 75, 75, 14, 75, 75,
- 75, 75, 75, 75, 75, 75
+ 75, 75, 75, 75, 75, 157, 156, 9, 75, 75,
+ 14, 75, 75, 75, 75, 75, 75, 75, 75
} ;
-static yyconst flex_int16_t yy_accept[596] =
+static yyconst flex_int16_t yy_accept[634] =
{ 0,
1, 3, 5, 6, 7, 8, 9, 11, 13, 14,
15, 17, 19, 21, 23, 25, 27, 29, 31, 33,
@@ -499,59 +503,63 @@
294, 298, 301, 303, 306, 308, 311, 314, 317, 321,
325, 329, 332, 334, 337, 339, 341, 344, 347, 349,
- 352, 355, 358, 360, 364, 366, 368, 371, 374, 377,
- 379, 382, 385, 388, 391, 394, 397, 398, 399, 400,
- 401, 402, 403, 404, 405, 406, 407, 409, 412, 414,
- 415, 419, 423, 424, 425, 426, 427, 428, 428, 428,
- 429, 429, 429, 429, 430, 431, 433, 434, 435, 437,
- 439, 441, 443, 445, 446, 448, 449, 450, 451, 452,
- 453, 455, 456, 457, 458, 459, 460, 461, 462, 463,
- 465, 467, 468, 470, 471, 473, 475, 476, 477, 478,
+ 352, 355, 358, 360, 364, 366, 368, 370, 373, 376,
+ 379, 381, 384, 387, 390, 393, 396, 399, 400, 401,
+ 402, 403, 404, 405, 406, 407, 408, 409, 411, 414,
+ 416, 417, 421, 425, 426, 427, 428, 429, 430, 430,
+ 430, 431, 431, 431, 431, 432, 433, 435, 436, 437,
+ 439, 441, 443, 445, 447, 448, 450, 451, 452, 453,
+ 454, 455, 457, 458, 459, 460, 461, 462, 463, 464,
+ 465, 467, 469, 470, 472, 473, 475, 477, 478, 479,
- 480, 481, 483, 484, 485, 486, 487, 488, 489, 490,
- 492, 493, 494, 495, 497, 498, 499, 501, 503, 504,
- 505, 506, 508, 509, 513, 513, 514, 516, 519, 520,
- 523, 526, 528, 530, 532, 534, 536, 538, 539, 540,
- 541, 541, 541, 542, 543, 544, 545, 546, 547, 548,
- 549, 550, 551, 552, 553, 554, 555, 557, 560, 562,
- 563, 567, 568, 569, 569, 570, 570, 570, 571, 572,
- 573, 574, 575, 576, 577, 578, 579, 580, 581, 582,
- 584, 586, 587, 589, 590, 591, 592, 593, 594, 595,
- 596, 597, 598, 599, 600, 602, 603, 604, 605, 606,
+ 480, 482, 483, 485, 486, 487, 488, 489, 490, 491,
+ 492, 494, 495, 496, 497, 499, 500, 501, 503, 505,
+ 506, 507, 508, 510, 511, 515, 515, 516, 518, 521,
+ 522, 525, 528, 530, 532, 534, 536, 538, 540, 541,
+ 542, 543, 543, 543, 543, 544, 545, 546, 547, 548,
+ 549, 550, 551, 551, 552, 553, 554, 555, 556, 557,
+ 558, 559, 559, 560, 561, 562, 563, 564, 565, 567,
+ 570, 572, 573, 577, 578, 579, 579, 580, 580, 580,
+ 581, 582, 583, 584, 585, 586, 587, 588, 589, 590,
+ 591, 592, 594, 596, 597, 599, 600, 601, 602, 603,
- 607, 608, 610, 611, 613, 615, 616, 617, 619, 620,
- 621, 623, 625, 626, 627, 628, 629, 630, 631, 632,
- 633, 634, 635, 635, 637, 638, 640, 642, 644, 646,
- 647, 648, 651, 653, 654, 658, 659, 659, 659, 660,
- 661, 662, 664, 665, 666, 667, 668, 669, 671, 672,
- 673, 675, 676, 677, 678, 679, 680, 682, 683, 685,
- 687, 689, 691, 693, 694, 695, 697, 698, 699, 700,
- 701, 703, 704, 706, 708, 709, 710, 712, 713, 714,
- 715, 716, 717, 718, 719, 720, 722, 723, 724, 725,
- 726, 728, 730, 731, 732, 733, 734, 735, 736, 736,
+ 604, 605, 606, 607, 608, 609, 610, 612, 613, 614,
+ 615, 616, 617, 618, 620, 621, 623, 625, 626, 627,
+ 629, 630, 631, 633, 635, 636, 637, 638, 639, 640,
+ 641, 642, 643, 644, 645, 645, 647, 648, 650, 652,
+ 654, 656, 656, 657, 657, 658, 659, 660, 661, 662,
+ 663, 664, 665, 665, 666, 667, 668, 669, 670, 671,
+ 672, 673, 676, 678, 679, 683, 684, 684, 684, 685,
+ 686, 687, 689, 690, 691, 692, 693, 694, 696, 697,
+ 698, 700, 701, 702, 703, 704, 705, 707, 708, 710,
+ 712, 714, 716, 718, 719, 720, 722, 723, 724, 725,
- 736, 736, 738, 739, 742, 744, 745, 749, 750, 750,
- 751, 752, 753, 755, 756, 758, 760, 761, 762, 763,
- 764, 765, 766, 767, 768, 769, 770, 771, 772, 773,
- 774, 775, 776, 777, 778, 780, 781, 783, 785, 786,
- 787, 789, 790, 791, 792, 793, 794, 795, 797, 798,
- 799, 800, 802, 803, 805, 807, 808, 808, 809, 809,
- 809, 809, 812, 814, 815, 819, 820, 821, 823, 824,
- 825, 826, 827, 828, 829, 830, 832, 834, 836, 837,
- 839, 841, 843, 845, 846, 847, 848, 849, 851, 852,
- 854, 855, 857, 858, 860, 862, 863, 865, 866, 867,
+ 726, 728, 729, 731, 733, 734, 735, 737, 738, 739,
+ 740, 741, 742, 743, 744, 745, 747, 748, 749, 750,
+ 751, 753, 755, 756, 757, 758, 759, 760, 761, 761,
+ 761, 761, 763, 764, 765, 766, 767, 768, 769, 770,
+ 771, 772, 775, 777, 778, 782, 783, 783, 784, 785,
+ 786, 788, 789, 791, 793, 794, 795, 796, 797, 798,
+ 799, 800, 801, 802, 803, 804, 805, 806, 807, 808,
+ 809, 810, 811, 813, 814, 816, 818, 819, 820, 822,
+ 823, 824, 825, 826, 827, 828, 830, 831, 832, 833,
+ 835, 836, 838, 840, 841, 841, 842, 842, 842, 842,
- 869, 870, 870, 870, 871, 872, 873, 873, 876, 878,
- 879, 883, 884, 885, 886, 887, 888, 890, 892, 893,
- 894, 895, 897, 898, 899, 900, 901, 902, 903, 904,
- 905, 906, 907, 908, 910, 910, 910, 911, 915, 918,
- 920, 925, 926, 927, 928, 929, 930, 931, 932, 933,
- 934, 935, 936, 937, 938, 939, 940, 941, 942, 943,
- 945, 946, 946, 949, 951, 952, 956, 957, 958, 959,
- 961, 962, 963, 964, 965, 966, 968, 969, 970, 971,
- 972, 973, 974, 975, 977, 978, 980, 981, 982, 983,
- 984, 985, 986, 987, 987
+ 845, 847, 848, 852, 853, 854, 856, 857, 858, 859,
+ 860, 861, 862, 863, 865, 867, 869, 870, 872, 874,
+ 876, 878, 879, 880, 881, 882, 884, 885, 887, 888,
+ 890, 891, 893, 895, 896, 898, 899, 900, 902, 903,
+ 903, 903, 904, 905, 906, 906, 909, 911, 912, 916,
+ 917, 918, 919, 920, 921, 923, 925, 926, 927, 928,
+ 930, 931, 932, 933, 934, 935, 936, 937, 938, 939,
+ 940, 941, 943, 943, 943, 944, 948, 951, 953, 958,
+ 959, 960, 961, 962, 963, 964, 965, 966, 967, 968,
+ 969, 970, 971, 972, 973, 974, 975, 976, 978, 979,
+ 979, 982, 984, 985, 989, 990, 991, 992, 994, 995,
+ 996, 997, 998, 999, 1001, 1002, 1003, 1004, 1005, 1006,
+ 1007, 1008, 1010, 1011, 1013, 1014, 1015, 1016, 1017, 1018,
+ 1019, 1020, 1020
} ;
static yyconst flex_int32_t yy_ec[256] =
@@ -561,15 +569,15 @@
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 4, 5, 6, 7, 8, 9, 10, 1, 11,
12, 1, 13, 14, 1, 15, 1, 16, 17, 18,
- 18, 18, 18, 18, 18, 19, 20, 21, 22, 23,
- 24, 25, 26, 27, 28, 29, 30, 31, 32, 33,
- 34, 35, 36, 34, 34, 37, 34, 34, 38, 39,
- 34, 34, 40, 34, 34, 34, 34, 41, 42, 34,
- 1, 1, 1, 1, 43, 1, 44, 45, 46, 47,
+ 19, 20, 21, 22, 23, 24, 25, 26, 27, 28,
+ 29, 30, 31, 32, 33, 34, 35, 36, 37, 38,
+ 39, 40, 41, 39, 39, 42, 43, 39, 44, 45,
+ 39, 46, 47, 39, 39, 39, 39, 48, 49, 39,
+ 1, 1, 1, 1, 50, 1, 51, 52, 53, 54,
- 48, 49, 50, 51, 52, 34, 53, 54, 55, 56,
- 57, 58, 59, 60, 61, 62, 63, 64, 65, 66,
- 67, 68, 1, 69, 1, 70, 1, 1, 1, 1,
+ 55, 56, 57, 58, 59, 39, 60, 61, 62, 63,
+ 64, 65, 66, 67, 68, 69, 70, 71, 72, 73,
+ 74, 75, 1, 76, 1, 77, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
@@ -586,331 +594,374 @@
1, 1, 1, 1, 1
} ;
-static yyconst flex_int32_t yy_meta[71] =
+static yyconst flex_int32_t yy_meta[78] =
{ 0,
1, 1, 2, 3, 1, 4, 1, 5, 5, 5,
6, 1, 5, 7, 1, 8, 8, 8, 8, 8,
- 9, 1, 1, 1, 1, 9, 9, 10, 10, 10,
- 10, 10, 10, 11, 11, 11, 11, 11, 11, 11,
- 11, 11, 12, 10, 10, 10, 10, 10, 10, 11,
+ 8, 8, 8, 8, 8, 9, 1, 1, 1, 1,
+ 9, 9, 10, 10, 10, 10, 10, 10, 11, 11,
+ 11, 11, 11, 11, 11, 11, 11, 11, 11, 12,
+ 10, 10, 10, 10, 10, 10, 11, 11, 11, 11,
11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
- 11, 11, 11, 11, 11, 11, 11, 11, 1, 1
+ 11, 11, 11, 11, 11, 1, 1
} ;
-static yyconst flex_int16_t yy_base[629] =
+static yyconst flex_int16_t yy_base[661] =
{ 0,
- 0, 0, 65, 0, 131, 0, 200, 205, 213, 218,
- 242, 0, 308, 0, 372, 0, 418, 464, 531, 0,
- 601, 671, 1419, 1420, 75, 1420, 1420, 0, 72, 74,
- 308, 1420, 415, 331, 355, 107, 1397, 1420, 1420, 0,
- 0, 1396, 0, 1420, 1420, 1375, 1366, 1357, 52, 1351,
- 1355, 1345, 0, 1420, 1420, 1420, 0, 171, 383, 310,
- 345, 20, 1358, 1352, 57, 178, 1360, 177, 406, 1359,
- 410, 1343, 192, 445, 55, 1349, 1360, 0, 1336, 0,
- 1420, 0, 100, 1420, 0, 0, 0, 0, 0, 1420,
- 1420, 1420, 502, 113, 1381, 1420, 740, 447, 469, 615,
+ 0, 0, 76, 81, 110, 0, 186, 191, 199, 204,
+ 233, 0, 306, 0, 378, 0, 453, 0, 526, 603,
+ 680, 757, 1723, 1724, 84, 1724, 1724, 0, 75, 80,
+ 306, 1724, 346, 819, 77, 416, 1696, 1724, 1724, 494,
+ 0, 1695, 0, 1724, 1724, 1672, 1663, 1654, 135, 1648,
+ 1652, 1642, 0, 1724, 1724, 1724, 0, 150, 312, 158,
+ 282, 151, 1655, 1649, 34, 168, 1657, 283, 332, 1656,
+ 349, 1640, 166, 361, 159, 1646, 1657, 0, 1633, 0,
+ 1724, 0, 104, 1724, 0, 0, 0, 0, 0, 1724,
+ 1724, 1724, 536, 213, 1680, 1724, 874, 561, 521, 620,
- 628, 631, 0, 1364, 171, 0, 1359, 0, 177, 685,
- 699, 1345, 249, 1332, 1373, 324, 1420, 1420, 601, 1372,
- 1371, 1370, 1324, 0, 193, 278, 1351, 1420, 1325, 0,
- 0, 305, 1369, 1368, 1367, 0, 354, 0, 328, 378,
- 500, 1420, 1420, 1420, 1420, 0, 405, 637, 649, 0,
- 642, 1366, 1420, 1420, 1420, 1420, 1420, 1342, 1336, 1420,
- 1327, 1333, 1376, 0, 1334, 0, 1318, 320, 1322, 1330,
- 1333, 0, 0, 1316, 0, 1323, 308, 1311, 645, 323,
- 0, 1318, 1328, 1319, 1316, 1307, 1314, 1311, 1310, 0,
- 0, 1298, 0, 1320, 0, 0, 1308, 318, 1298, 0,
+ 637, 640, 0, 1663, 265, 0, 1656, 0, 282, 694,
+ 697, 1642, 275, 1629, 1672, 572, 1724, 1724, 448, 1671,
+ 1670, 1669, 1621, 304, 318, 552, 321, 410, 1724, 391,
+ 0, 0, 345, 1670, 1669, 1668, 0, 105, 0, 352,
+ 631, 720, 1724, 1724, 1724, 1724, 0, 366, 934, 651,
+ 757, 687, 698, 1724, 1724, 1724, 1724, 1724, 1642, 1636,
+ 1724, 1627, 1633, 1683, 0, 1634, 0, 1618, 346, 1622,
+ 1630, 1633, 0, 0, 1616, 0, 1623, 342, 1611, 431,
+ 380, 0, 1618, 1628, 1619, 1616, 1607, 1614, 1611, 1610,
+ 0, 0, 1598, 0, 1620, 0, 0, 1608, 385, 1598,
- 1295, 0, 1316, 1307, 1311, 1305, 1309, 654, 1291, 1294,
- 1287, 64, 1305, 0, 281, 1293, 1306, 360, 1287, 1301,
- 0, 479, 0, 1326, 708, 1420, 805, 851, 717, 0,
- 0, 734, 810, 840, 869, 874, 897, 1420, 1420, 1420,
- 1316, 1306, 1420, 1420, 1420, 1420, 1420, 1420, 1420, 1420,
- 0, 0, 1323, 1322, 0, 0, 408, 706, 746, 0,
- 621, 1420, 1420, 1295, 1420, 1281, 1290, 1333, 1295, 1293,
- 1283, 1282, 449, 1290, 1269, 1270, 1270, 351, 1283, 1278,
- 1280, 1283, 1274, 1281, 1266, 1278, 1260, 1267, 1263, 1261,
- 1256, 1260, 1271, 1268, 684, 470, 1270, 1265, 1250, 1244,
+ 0, 1595, 0, 1616, 1607, 1611, 1605, 1609, 568, 1591,
+ 1594, 1587, 135, 1605, 0, 386, 1593, 1606, 322, 1587,
+ 1601, 0, 481, 0, 482, 723, 1724, 987, 0, 1650,
+ 0, 0, 1649, 538, 544, 1648, 658, 660, 1724, 1724,
+ 1616, 1615, 773, 1604, 1599, 1724, 1724, 1724, 1724, 1724,
+ 406, 1724, 783, 1724, 1724, 1724, 1724, 1724, 1724, 1724,
+ 1724, 460, 0, 0, 1621, 1620, 0, 0, 629, 1047,
+ 789, 797, 504, 1724, 1724, 1591, 1724, 1577, 1586, 1636,
+ 1591, 1589, 1579, 1578, 530, 1586, 1565, 1566, 1566, 353,
+ 1579, 1574, 1576, 1579, 1570, 1577, 1562, 1574, 1556, 1563,
- 1254, 0, 1247, 1256, 1250, 1254, 815, 1242, 1256, 405,
- 0, 0, 1238, 1254, 1243, 1242, 1251, 1252, 1234, 1244,
- 1249, 1246, 1282, 948, 902, 919, 925, 942, 953, 1420,
- 1420, 799, 823, 0, 628, 1420, 1244, 1237, 1236, 1243,
- 1226, 0, 1240, 1233, 1232, 1236, 1234, 0, 1238, 1237,
- 1228, 1227, 1216, 1231, 1230, 437, 0, 1221, 0, 0,
- 0, 0, 0, 1214, 1210, 1229, 1220, 1226, 1211, 1204,
- 0, 1209, 0, 0, 1221, 1203, 0, 1198, 1203, 1201,
- 1199, 1212, 1196, 1210, 1197, 1213, 1207, 1203, 1210, 1203,
- 0, 0, 1205, 1202, 1194, 1194, 1196, 1201, 0, 1231,
+ 1559, 1557, 1552, 1556, 1567, 1564, 796, 568, 1566, 1561,
+ 1546, 1540, 1550, 0, 1543, 1552, 1546, 1550, 909, 1538,
+ 1552, 264, 0, 0, 1534, 1550, 1539, 1538, 1547, 1548,
+ 1530, 1540, 1545, 1542, 1585, 1100, 1591, 1590, 1579, 1578,
+ 1577, 1532, 1724, 807, 1724, 1724, 1724, 1724, 1724, 1724,
+ 1724, 1724, 1531, 1724, 1724, 1724, 1724, 1724, 1724, 1724,
+ 1724, 1160, 863, 976, 581, 1724, 1513, 1506, 1505, 1512,
+ 1495, 0, 1509, 1499, 1498, 1502, 1497, 0, 1501, 1500,
+ 1491, 1490, 1479, 1480, 1475, 376, 0, 1455, 0, 0,
+ 0, 0, 0, 1435, 1422, 1440, 1427, 1422, 1402, 1395,
- 794, 1240, 1239, 891, 914, 0, 886, 1420, 1194, 1197,
- 1189, 1179, 0, 1195, 0, 0, 1177, 1180, 1175, 1172,
- 1172, 1184, 1180, 1182, 1175, 1167, 1179, 1178, 1176, 1170,
- 1179, 1161, 1154, 1161, 0, 1159, 0, 0, 1155, 1139,
- 0, 1134, 1132, 1129, 1130, 1128, 1124, 0, 1125, 1112,
- 1115, 0, 1115, 0, 0, 1109, 0, 1160, 1154, 1150,
- 0, 966, 971, 0, 937, 1420, 1117, 0, 1117, 350,
- 1112, 1112, 1108, 1089, 1074, 1081, 0, 0, 1062, 0,
- 0, 0, 0, 1056, 1038, 687, 1041, 0, 1035, 0,
- 1030, 0, 1026, 0, 0, 1027, 1009, 1023, 915, 0,
+ 0, 1400, 0, 0, 1410, 1315, 0, 1310, 1315, 1313,
+ 1297, 1310, 1294, 1308, 1295, 1311, 1305, 1275, 1282, 1275,
+ 0, 0, 1277, 1260, 1252, 1252, 1254, 1259, 0, 1296,
+ 1070, 1305, 1288, 1724, 1724, 1724, 1724, 1724, 1724, 1724,
+ 1724, 1201, 1089, 1183, 584, 1724, 1236, 1223, 1215, 1205,
+ 0, 1221, 0, 0, 1203, 1206, 1201, 1182, 1182, 1194,
+ 1190, 1178, 1171, 1163, 1175, 1174, 1172, 1166, 1159, 1144,
+ 1125, 1136, 0, 1139, 0, 0, 1135, 1119, 0, 1118,
+ 1119, 1081, 1069, 1070, 1067, 0, 1068, 1055, 1058, 0,
+ 1061, 0, 0, 1045, 0, 1103, 1099, 1083, 0, 1242,
- 924, 951, 0, 1420, 1420, 1420, 942, 982, 987, 0,
- 992, 902, 903, 899, 880, 879, 0, 0, 869, 867,
- 858, 0, 860, 769, 830, 804, 811, 802, 813, 803,
- 795, 787, 777, 0, 769, 0, 1420, 995, 1000, 0,
- 1005, 713, 701, 702, 676, 659, 663, 657, 670, 665,
- 644, 648, 633, 642, 601, 337, 603, 593, 573, 0,
- 0, 608, 1008, 0, 0, 1011, 480, 464, 476, 0,
- 446, 464, 447, 452, 423, 0, 439, 430, 420, 407,
- 411, 1420, 1420, 0, 408, 0, 399, 291, 273, 179,
- 144, 46, 18, 1420, 1029, 1041, 1053, 1058, 1064, 1069,
+ 1224, 1265, 660, 1724, 1044, 0, 1044, 650, 1039, 1025,
+ 1023, 1018, 1007, 1025, 0, 0, 1019, 0, 0, 0,
+ 0, 1022, 970, 678, 960, 0, 965, 0, 962, 0,
+ 963, 0, 0, 964, 946, 962, 935, 0, 927, 971,
+ 0, 1724, 1724, 1724, 968, 1283, 1306, 1324, 712, 926,
+ 927, 924, 911, 921, 0, 0, 911, 910, 904, 0,
+ 911, 697, 911, 892, 900, 857, 851, 853, 846, 851,
+ 841, 0, 887, 0, 1724, 1334, 1357, 1375, 714, 828,
+ 833, 836, 810, 793, 804, 799, 814, 808, 791, 797,
+ 795, 796, 782, 791, 792, 782, 790, 0, 0, 820,
- 1079, 1084, 1096, 1108, 1111, 1122, 1127, 1132, 1137, 1142,
- 1147, 1155, 1159, 1164, 1173, 1177, 1178, 1183, 1187, 1188,
- 1194, 1196, 1200, 1201, 1205, 1206, 1210, 1211
+ 0, 0, 0, 717, 777, 761, 774, 0, 717, 702,
+ 690, 695, 633, 0, 647, 610, 598, 576, 524, 1724,
+ 1724, 0, 515, 0, 511, 492, 410, 276, 247, 163,
+ 20, 1724, 1400, 1412, 1424, 1436, 1448, 1453, 1459, 1471,
+ 1476, 1488, 1500, 1503, 1514, 1519, 1524, 1529, 1534, 1544,
+ 1550, 1559, 1561, 1566, 1568, 1574, 1576, 1578, 1580, 1582
} ;
-static yyconst flex_int16_t yy_def[629] =
+static yyconst flex_int16_t yy_def[661] =
{ 0,
- 594, 1, 1, 3, 594, 5, 595, 595, 596, 596,
- 594, 11, 1, 13, 3, 15, 15, 15, 594, 19,
- 597, 597, 594, 594, 594, 594, 594, 598, 594, 594,
- 594, 594, 599, 600, 600, 35, 36, 594, 594, 600,
- 600, 600, 600, 594, 594, 594, 594, 594, 594, 594,
- 594, 594, 601, 594, 594, 594, 602, 602, 602, 602,
- 602, 602, 602, 602, 602, 602, 602, 602, 602, 602,
- 602, 602, 602, 602, 602, 602, 602, 602, 602, 602,
- 594, 603, 603, 594, 603, 603, 604, 604, 604, 594,
- 594, 594, 599, 35, 36, 594, 594, 97, 97, 97,
+ 632, 1, 633, 633, 632, 5, 634, 634, 635, 635,
+ 632, 11, 1, 13, 13, 15, 633, 17, 636, 636,
+ 637, 637, 632, 632, 632, 632, 632, 638, 632, 632,
+ 632, 632, 639, 632, 34, 34, 36, 632, 632, 34,
+ 40, 40, 40, 632, 632, 632, 632, 632, 632, 632,
+ 632, 632, 640, 632, 632, 632, 641, 641, 641, 641,
+ 641, 641, 641, 641, 641, 641, 641, 641, 641, 641,
+ 641, 641, 641, 641, 641, 641, 641, 641, 641, 641,
+ 632, 642, 642, 632, 642, 642, 643, 643, 643, 632,
+ 632, 632, 639, 34, 36, 632, 632, 97, 97, 97,
- 97, 97, 605, 605, 605, 605, 605, 605, 97, 97,
- 97, 605, 605, 605, 594, 594, 594, 594, 594, 594,
- 594, 594, 594, 600, 594, 594, 594, 594, 594, 606,
- 607, 607, 607, 607, 607, 608, 594, 598, 594, 594,
- 594, 594, 594, 594, 594, 609, 610, 611, 611, 611,
- 149, 151, 594, 594, 594, 594, 594, 594, 594, 594,
- 594, 594, 601, 602, 602, 602, 602, 602, 602, 602,
- 602, 602, 602, 602, 602, 602, 602, 602, 602, 602,
- 602, 602, 602, 602, 602, 602, 602, 602, 602, 602,
- 602, 602, 602, 602, 602, 602, 602, 602, 602, 602,
+ 97, 97, 644, 644, 644, 644, 644, 644, 97, 97,
+ 97, 644, 644, 644, 632, 632, 632, 632, 632, 632,
+ 632, 632, 632, 40, 632, 632, 632, 632, 632, 632,
+ 645, 646, 646, 646, 646, 646, 647, 632, 638, 632,
+ 632, 632, 632, 632, 632, 632, 648, 649, 632, 149,
+ 149, 149, 149, 632, 632, 632, 632, 632, 632, 632,
+ 632, 632, 632, 640, 641, 641, 641, 641, 641, 641,
+ 641, 641, 641, 641, 641, 641, 641, 641, 641, 641,
+ 641, 641, 641, 641, 641, 641, 641, 641, 641, 641,
+ 641, 641, 641, 641, 641, 641, 641, 641, 641, 641,
- 602, 602, 602, 602, 602, 602, 602, 602, 602, 602,
- 602, 602, 602, 602, 602, 602, 602, 602, 602, 602,
- 603, 603, 604, 151, 594, 594, 612, 612, 612, 228,
- 228, 612, 612, 612, 612, 612, 612, 594, 594, 594,
- 594, 594, 594, 594, 594, 594, 594, 594, 594, 594,
- 606, 607, 607, 607, 608, 609, 610, 613, 613, 613,
- 259, 594, 594, 594, 594, 594, 594, 601, 602, 602,
- 602, 602, 602, 602, 602, 602, 602, 602, 602, 602,
- 602, 602, 602, 602, 602, 602, 602, 602, 602, 602,
- 602, 602, 602, 602, 602, 602, 602, 602, 602, 602,
+ 641, 641, 641, 641, 641, 641, 641, 641, 641, 641,
+ 641, 641, 641, 641, 641, 641, 641, 641, 641, 641,
+ 641, 642, 642, 643, 149, 632, 632, 632, 228, 650,
+ 228, 228, 650, 650, 650, 650, 650, 650, 632, 632,
+ 632, 632, 632, 632, 632, 632, 632, 632, 632, 632,
+ 151, 632, 632, 632, 632, 632, 632, 632, 632, 632,
+ 632, 632, 645, 646, 646, 646, 647, 648, 649, 632,
+ 270, 270, 270, 632, 632, 632, 632, 632, 632, 640,
+ 641, 641, 641, 641, 641, 641, 641, 641, 641, 641,
+ 641, 641, 641, 641, 641, 641, 641, 641, 641, 641,
- 602, 602, 602, 602, 602, 602, 602, 602, 602, 602,
- 602, 602, 602, 602, 602, 602, 602, 602, 602, 602,
- 602, 602, 614, 615, 615, 615, 615, 615, 615, 594,
- 594, 616, 616, 616, 333, 594, 594, 594, 602, 602,
- 602, 602, 602, 602, 602, 602, 602, 602, 602, 602,
- 602, 602, 602, 602, 602, 602, 602, 602, 602, 602,
- 602, 602, 602, 602, 602, 602, 602, 602, 602, 602,
- 602, 602, 602, 602, 602, 602, 602, 602, 602, 602,
- 602, 602, 602, 602, 602, 602, 602, 602, 602, 602,
- 602, 602, 602, 602, 602, 602, 602, 602, 617, 618,
+ 641, 641, 641, 641, 641, 641, 641, 641, 641, 641,
+ 641, 641, 641, 641, 641, 641, 641, 641, 641, 641,
+ 641, 641, 641, 641, 641, 641, 641, 641, 641, 641,
+ 641, 641, 641, 641, 651, 632, 652, 652, 652, 652,
+ 652, 632, 632, 632, 632, 632, 632, 632, 632, 632,
+ 632, 632, 632, 632, 632, 632, 632, 632, 632, 632,
+ 632, 632, 362, 362, 362, 632, 632, 632, 641, 641,
+ 641, 641, 641, 641, 641, 641, 641, 641, 641, 641,
+ 641, 641, 641, 641, 641, 641, 641, 641, 641, 641,
+ 641, 641, 641, 641, 641, 641, 641, 641, 641, 641,
- 594, 616, 594, 619, 619, 619, 405, 594, 594, 602,
- 602, 602, 602, 602, 602, 602, 602, 602, 602, 602,
- 602, 602, 602, 602, 602, 602, 602, 602, 602, 602,
- 602, 602, 602, 602, 602, 602, 602, 602, 602, 602,
- 602, 602, 602, 602, 602, 602, 602, 602, 602, 602,
- 602, 602, 602, 602, 602, 602, 620, 621, 594, 594,
- 622, 623, 623, 623, 463, 594, 602, 602, 602, 602,
- 602, 602, 602, 602, 602, 602, 602, 602, 602, 602,
- 602, 602, 602, 602, 602, 602, 602, 602, 602, 602,
- 602, 602, 602, 602, 602, 602, 602, 602, 602, 602,
+ 641, 641, 641, 641, 641, 641, 641, 641, 641, 641,
+ 641, 641, 641, 641, 641, 641, 641, 641, 641, 641,
+ 641, 641, 641, 641, 641, 641, 641, 641, 653, 654,
+ 632, 364, 632, 632, 632, 632, 632, 632, 632, 632,
+ 632, 632, 442, 442, 442, 632, 632, 641, 641, 641,
+ 641, 641, 641, 641, 641, 641, 641, 641, 641, 641,
+ 641, 641, 641, 641, 641, 641, 641, 641, 641, 641,
+ 641, 641, 641, 641, 641, 641, 641, 641, 641, 641,
+ 641, 641, 641, 641, 641, 641, 641, 641, 641, 641,
+ 641, 641, 641, 641, 655, 656, 632, 632, 657, 632,
- 602, 594, 624, 594, 594, 594, 594, 625, 625, 625,
- 509, 602, 602, 602, 602, 602, 602, 602, 602, 602,
- 602, 602, 602, 602, 602, 602, 602, 602, 602, 602,
- 602, 602, 602, 602, 594, 626, 594, 627, 627, 627,
- 539, 602, 602, 602, 602, 602, 602, 602, 602, 602,
- 602, 602, 602, 602, 602, 602, 602, 602, 602, 602,
- 628, 594, 539, 539, 627, 539, 602, 602, 602, 602,
- 602, 602, 602, 602, 602, 602, 602, 602, 602, 602,
- 602, 594, 594, 602, 602, 602, 602, 602, 602, 602,
- 602, 602, 602, 0, 594, 594, 594, 594, 594, 594,
+ 500, 500, 500, 632, 641, 641, 641, 641, 641, 641,
+ 641, 641, 641, 641, 641, 641, 641, 641, 641, 641,
+ 641, 641, 641, 641, 641, 641, 641, 641, 641, 641,
+ 641, 641, 641, 641, 641, 641, 641, 641, 641, 632,
+ 658, 632, 632, 632, 632, 632, 546, 546, 546, 641,
+ 641, 641, 641, 641, 641, 641, 641, 641, 641, 641,
+ 641, 641, 641, 641, 641, 641, 641, 641, 641, 641,
+ 641, 641, 632, 659, 632, 632, 576, 576, 576, 641,
+ 641, 641, 641, 641, 641, 641, 641, 641, 641, 641,
+ 641, 641, 641, 641, 641, 641, 641, 641, 660, 632,
- 594, 594, 594, 594, 594, 594, 594, 594, 594, 594,
- 594, 594, 594, 594, 594, 594, 594, 594, 594, 594,
- 594, 594, 594, 594, 594, 594, 594, 594
+ 576, 577, 578, 576, 641, 641, 641, 641, 641, 641,
+ 641, 641, 641, 641, 641, 641, 641, 641, 641, 632,
+ 632, 641, 641, 641, 641, 641, 641, 641, 641, 641,
+ 641, 0, 632, 632, 632, 632, 632, 632, 632, 632,
+ 632, 632, 632, 632, 632, 632, 632, 632, 632, 632,
+ 632, 632, 632, 632, 632, 632, 632, 632, 632, 632
} ;
-static yyconst flex_int16_t yy_nxt[1491] =
+static yyconst flex_int16_t yy_nxt[1802] =
{ 0,
24, 25, 26, 25, 24, 27, 24, 28, 29, 30,
- 24, 24, 31, 32, 33, 34, 35, 34, 36, 37,
- 24, 38, 24, 39, 24, 24, 24, 40, 41, 42,
- 43, 40, 40, 24, 44, 24, 24, 45, 24, 24,
- 46, 24, 24, 40, 41, 42, 43, 40, 40, 24,
- 44, 47, 24, 48, 24, 24, 49, 24, 24, 24,
- 50, 51, 24, 24, 24, 52, 24, 24, 24, 24,
- 53, 181, 24, 24, 24, 183, 137, 24, 137, 24,
- 24, 24, 24, 24, 24, 184, 24, 139, 139, 140,
- 140, 140, 24, 24, 24, 24, 24, 24, 216, 24,
+ 24, 24, 31, 32, 33, 34, 35, 34, 34, 34,
+ 34, 34, 34, 36, 37, 24, 38, 24, 39, 24,
+ 24, 24, 40, 41, 42, 43, 40, 40, 24, 44,
+ 24, 24, 24, 45, 24, 24, 24, 46, 24, 24,
+ 40, 41, 42, 43, 40, 40, 24, 44, 47, 24,
+ 48, 24, 24, 49, 24, 24, 24, 50, 51, 24,
+ 24, 24, 52, 24, 24, 24, 24, 25, 26, 25,
+ 182, 53, 25, 26, 25, 138, 53, 138, 188, 32,
+ 140, 140, 152, 153, 32, 141, 141, 141, 141, 141,
- 159, 222, 24, 222, 187, 24, 312, 160, 24, 24,
- 24, 24, 24, 24, 217, 24, 24, 312, 24, 188,
- 313, 24, 149, 149, 149, 24, 24, 153, 224, 224,
- 24, 24, 25, 26, 25, 24, 24, 24, 24, 24,
- 24, 24, 24, 24, 32, 24, 24, 24, 24, 24,
- 24, 24, 24, 24, 39, 54, 55, 56, 57, 57,
+ 141, 141, 141, 189, 39, 223, 138, 223, 138, 39,
+ 24, 25, 26, 25, 24, 24, 24, 24, 24, 24,
+ 24, 24, 24, 32, 24, 24, 24, 24, 24, 24,
+ 24, 24, 24, 24, 24, 24, 24, 24, 39, 54,
+ 55, 56, 57, 57, 57, 57, 57, 57, 57, 57,
57, 57, 57, 57, 57, 57, 57, 57, 57, 57,
- 57, 57, 57, 57, 58, 59, 60, 61, 62, 63,
- 64, 65, 66, 67, 68, 69, 70, 57, 71, 72,
- 73, 74, 75, 76, 57, 77, 78, 79, 80, 24,
+ 58, 59, 60, 61, 62, 63, 64, 65, 66, 67,
+ 68, 69, 70, 57, 71, 72, 73, 74, 75, 76,
+ 57, 77, 78, 79, 80, 24, 81, 83, 26, 83,
+ 160, 84, 83, 26, 83, 324, 84, 161, 325, 85,
- 81, 83, 26, 83, 214, 84, 83, 26, 83, 227,
- 84, 233, 234, 85, 25, 26, 25, 165, 85, 25,
- 26, 25, 249, 86, 166, 228, 88, 189, 86, 190,
- 193, 88, 167, 194, 191, 207, 89, 195, 249, 208,
- 494, 89, 24, 25, 26, 25, 24, 24, 90, 28,
- 29, 30, 91, 92, 31, 32, 93, 34, 94, 34,
- 95, 95, 96, 24, 24, 39, 24, 24, 24, 97,
- 98, 99, 100, 101, 102, 103, 104, 105, 106, 103,
- 103, 103, 107, 108, 24, 109, 110, 99, 111, 101,
- 102, 103, 112, 113, 103, 106, 103, 103, 103, 103,
+ 25, 26, 25, 166, 85, 25, 26, 25, 175, 217,
+ 167, 176, 88, 184, 86, 177, 208, 88, 168, 86,
+ 209, 178, 179, 185, 190, 218, 191, 89, 225, 225,
+ 324, 192, 89, 24, 25, 26, 25, 24, 24, 90,
+ 28, 29, 30, 91, 92, 31, 32, 93, 34, 94,
+ 34, 34, 34, 34, 34, 34, 95, 95, 96, 24,
+ 24, 39, 24, 24, 24, 97, 98, 99, 100, 101,
+ 102, 103, 104, 105, 106, 103, 103, 103, 103, 103,
+ 107, 108, 24, 109, 110, 99, 111, 101, 102, 103,
+ 112, 113, 103, 106, 103, 103, 103, 103, 103, 103,
- 103, 103, 103, 103, 103, 103, 103, 114, 108, 103,
- 24, 24, 115, 24, 236, 237, 250, 116, 117, 118,
- 253, 254, 119, 141, 141, 141, 141, 141, 315, 24,
- 120, 121, 122, 239, 492, 250, 40, 316, 40, 140,
- 140, 140, 24, 139, 139, 24, 148, 148, 148, 149,
- 149, 193, 40, 174, 40, 137, 175, 137, 24, 24,
- 176, 24, 278, 279, 24, 271, 177, 178, 24, 24,
- 151, 152, 148, 149, 149, 272, 123, 24, 296, 28,
- 29, 30, 195, 284, 31, 297, 577, 34, 94, 34,
- 95, 95, 179, 140, 140, 140, 180, 578, 181, 124,
+ 103, 103, 103, 103, 103, 114, 108, 103, 24, 24,
+ 115, 24, 234, 235, 215, 116, 117, 118, 417, 228,
+ 119, 142, 142, 142, 142, 142, 142, 142, 142, 142,
+ 142, 418, 24, 120, 121, 122, 180, 229, 251, 40,
+ 181, 40, 182, 194, 532, 24, 195, 237, 238, 24,
+ 196, 183, 252, 143, 144, 145, 251, 40, 146, 40,
+ 265, 266, 169, 24, 24, 261, 24, 140, 140, 24,
+ 252, 147, 170, 24, 24, 331, 147, 147, 171, 172,
+ 173, 123, 24, 174, 197, 261, 198, 30, 24, 24,
+ 332, 268, 24, 199, 94, 200, 268, 268, 283, 201,
- 40, 40, 40, 40, 40, 349, 319, 182, 350, 514,
- 125, 126, 127, 128, 515, 124, 40, 40, 40, 40,
- 40, 320, 142, 143, 144, 256, 168, 145, 256, 125,
- 256, 256, 126, 256, 256, 146, 169, 129, 128, 130,
- 146, 146, 170, 171, 172, 40, 593, 173, 594, 594,
- 594, 196, 387, 197, 202, 173, 24, 24, 46, 24,
- 198, 40, 199, 203, 592, 388, 200, 594, 448, 204,
- 594, 594, 594, 591, 205, 24, 230, 590, 24, 227,
- 222, 425, 222, 52, 24, 130, 589, 371, 209, 594,
- 210, 40, 343, 211, 344, 212, 213, 426, 214, 488,
+ 203, 95, 95, 290, 291, 24, 39, 24, 284, 204,
+ 124, 210, 40, 211, 379, 205, 212, 380, 213, 214,
+ 206, 215, 125, 126, 127, 128, 129, 463, 124, 216,
+ 40, 150, 150, 150, 150, 150, 150, 150, 150, 262,
+ 327, 154, 125, 464, 126, 127, 196, 296, 354, 328,
+ 130, 129, 308, 24, 25, 26, 25, 157, 262, 309,
+ 28, 29, 30, 157, 262, 31, 32, 354, 34, 94,
+ 34, 34, 34, 34, 34, 34, 95, 95, 530, 131,
+ 241, 39, 223, 262, 223, 40, 40, 40, 40, 40,
+ 40, 293, 242, 243, 244, 245, 246, 273, 273, 294,
- 588, 227, 24, 24, 46, 24, 215, 40, 587, 594,
- 594, 594, 348, 370, 594, 141, 141, 141, 141, 141,
- 371, 24, 146, 586, 24, 585, 584, 146, 146, 52,
- 24, 24, 25, 26, 25, 24, 24, 24, 24, 24,
- 24, 24, 24, 24, 32, 24, 131, 132, 131, 133,
- 134, 24, 24, 24, 39, 24, 24, 24, 131, 131,
- 135, 131, 131, 131, 131, 131, 131, 131, 131, 131,
- 131, 131, 131, 131, 131, 131, 135, 131, 131, 131,
- 131, 131, 131, 131, 131, 131, 131, 131, 131, 131,
- 131, 131, 131, 131, 131, 131, 131, 131, 131, 24,
+ 46, 295, 361, 40, 40, 40, 40, 40, 40, 151,
+ 151, 151, 151, 151, 151, 151, 151, 151, 151, 365,
+ 365, 361, 632, 632, 632, 52, 24, 25, 26, 25,
+ 24, 24, 24, 24, 24, 24, 24, 24, 24, 32,
+ 24, 335, 133, 632, 632, 632, 632, 335, 632, 134,
+ 135, 24, 24, 24, 39, 24, 24, 24, 228, 194,
+ 136, 147, 632, 632, 632, 631, 147, 147, 253, 174,
+ 254, 255, 256, 257, 258, 259, 260, 338, 136, 339,
+ 373, 240, 374, 340, 630, 341, 632, 141, 141, 141,
+ 141, 141, 141, 141, 141, 231, 445, 445, 228, 503,
- 24, 24, 25, 26, 25, 24, 24, 24, 24, 24,
- 24, 24, 24, 24, 32, 24, 594, 594, 594, 583,
- 581, 24, 24, 24, 39, 24, 24, 24, 240, 594,
- 594, 594, 594, 594, 594, 594, 335, 335, 332, 241,
- 242, 243, 244, 407, 407, 404, 231, 227, 594, 580,
- 579, 594, 258, 258, 258, 259, 259, 261, 261, 258,
- 227, 576, 262, 227, 259, 259, 259, 259, 259, 24,
- 24, 24, 25, 26, 25, 24, 24, 24, 24, 24,
- 24, 24, 24, 24, 32, 24, 594, 594, 594, 200,
- 435, 24, 24, 24, 39, 24, 24, 24, 281, 305,
+ 503, 24, 24, 24, 25, 26, 25, 24, 24, 24,
+ 24, 24, 24, 24, 24, 24, 32, 24, 400, 133,
+ 317, 632, 632, 632, 318, 401, 134, 135, 24, 24,
+ 24, 39, 24, 24, 24, 319, 320, 136, 632, 632,
+ 632, 632, 632, 632, 486, 632, 141, 141, 141, 141,
+ 141, 141, 141, 141, 268, 136, 232, 228, 629, 268,
+ 268, 335, 632, 335, 628, 632, 271, 271, 271, 271,
+ 271, 271, 271, 271, 228, 549, 549, 228, 24, 24,
+ 24, 25, 26, 25, 24, 24, 24, 24, 24, 24,
+ 24, 24, 24, 32, 24, 632, 632, 632, 632, 632,
- 594, 594, 594, 306, 575, 594, 282, 574, 283, 225,
- 226, 225, 573, 572, 307, 308, 571, 227, 570, 594,
- 323, 332, 332, 332, 333, 333, 569, 568, 226, 367,
- 230, 227, 594, 594, 594, 594, 594, 323, 368, 24,
- 24, 225, 226, 225, 369, 567, 231, 524, 172, 594,
- 594, 594, 594, 594, 525, 150, 150, 150, 150, 150,
- 226, 333, 333, 333, 333, 333, 166, 227, 227, 227,
- 227, 227, 228, 229, 229, 229, 229, 229, 229, 229,
- 229, 229, 561, 227, 227, 227, 227, 227, 227, 229,
- 229, 229, 229, 229, 229, 229, 229, 229, 229, 229,
+ 632, 627, 273, 273, 401, 24, 24, 24, 39, 24,
+ 24, 24, 274, 273, 273, 338, 552, 340, 339, 632,
+ 341, 553, 632, 275, 226, 227, 226, 579, 579, 604,
+ 604, 228, 604, 604, 228, 142, 142, 142, 142, 142,
+ 142, 142, 142, 142, 142, 562, 231, 589, 227, 526,
+ 626, 232, 563, 625, 590, 24, 24, 24, 25, 26,
+ 25, 24, 24, 24, 24, 24, 24, 24, 24, 24,
+ 32, 24, 272, 272, 272, 272, 272, 272, 272, 272,
+ 272, 272, 24, 24, 24, 39, 24, 24, 24, 344,
+ 378, 345, 346, 347, 348, 349, 350, 351, 355, 356,
- 229, 229, 229, 229, 229, 229, 229, 229, 323, 460,
- 460, 460, 551, 323, 404, 404, 404, 405, 405, 552,
- 260, 260, 260, 260, 260, 594, 594, 594, 594, 594,
- 560, 559, 324, 324, 324, 324, 324, 324, 405, 405,
- 405, 405, 405, 323, 326, 558, 327, 557, 324, 324,
- 324, 324, 324, 324, 323, 594, 594, 594, 594, 594,
- 556, 555, 381, 202, 382, 554, 260, 260, 260, 260,
- 260, 383, 323, 553, 328, 384, 329, 323, 324, 324,
- 324, 324, 324, 324, 594, 594, 594, 594, 594, 594,
- 594, 594, 594, 594, 324, 324, 324, 324, 324, 324,
+ 357, 358, 359, 360, 363, 363, 363, 363, 363, 363,
+ 363, 363, 364, 364, 364, 364, 364, 364, 364, 364,
+ 364, 364, 435, 436, 437, 438, 439, 440, 624, 623,
+ 622, 621, 24, 24, 149, 149, 149, 149, 149, 149,
+ 149, 149, 150, 150, 619, 618, 617, 615, 397, 614,
+ 201, 151, 151, 151, 151, 151, 151, 398, 616, 473,
+ 613, 612, 611, 399, 610, 609, 608, 607, 606, 151,
+ 151, 151, 151, 151, 151, 226, 227, 226, 443, 443,
+ 443, 443, 443, 443, 443, 443, 605, 173, 167, 151,
+ 151, 151, 151, 151, 151, 151, 151, 151, 151, 227,
- 323, 465, 465, 462, 550, 401, 462, 462, 462, 463,
- 463, 549, 594, 594, 594, 594, 594, 594, 594, 594,
- 594, 594, 401, 548, 326, 547, 546, 327, 401, 463,
- 463, 463, 463, 463, 594, 594, 594, 594, 594, 545,
- 594, 594, 594, 594, 594, 401, 544, 328, 543, 542,
- 329, 401, 511, 511, 508, 537, 401, 594, 594, 594,
- 594, 594, 535, 334, 334, 334, 334, 334, 594, 594,
- 594, 594, 594, 534, 533, 402, 402, 402, 402, 402,
- 402, 508, 508, 508, 509, 509, 509, 509, 509, 509,
- 509, 402, 402, 402, 402, 402, 402, 538, 538, 538,
+ 599, 598, 597, 596, 595, 594, 228, 228, 228, 228,
+ 228, 229, 230, 230, 230, 230, 230, 230, 230, 230,
+ 230, 230, 230, 593, 228, 228, 228, 228, 228, 228,
+ 230, 230, 230, 230, 230, 230, 230, 230, 230, 230,
+ 230, 230, 230, 230, 230, 230, 230, 230, 230, 270,
+ 270, 270, 270, 270, 270, 270, 270, 271, 271, 203,
+ 592, 591, 588, 411, 587, 412, 272, 272, 272, 272,
+ 272, 272, 413, 586, 585, 584, 414, 583, 582, 581,
+ 580, 575, 573, 572, 272, 272, 272, 272, 272, 272,
+ 335, 444, 444, 444, 444, 444, 444, 444, 444, 444,
- 539, 539, 539, 539, 539, 539, 539, 541, 541, 538,
- 563, 563, 563, 564, 564, 564, 564, 564, 564, 564,
- 566, 566, 563, 563, 563, 563, 566, 566, 563, 82,
- 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
- 82, 87, 87, 87, 87, 87, 87, 87, 87, 87,
- 87, 87, 87, 136, 136, 136, 136, 136, 136, 136,
- 136, 136, 136, 136, 136, 138, 532, 138, 147, 531,
- 530, 529, 147, 147, 147, 147, 150, 528, 150, 163,
- 527, 163, 163, 163, 163, 163, 163, 163, 163, 163,
- 163, 164, 526, 164, 164, 164, 221, 196, 221, 523,
+ 444, 571, 272, 272, 272, 272, 272, 272, 272, 272,
+ 272, 272, 570, 569, 568, 567, 566, 565, 564, 336,
+ 336, 336, 336, 336, 336, 337, 337, 337, 337, 337,
+ 337, 337, 337, 337, 337, 337, 197, 336, 336, 336,
+ 336, 336, 336, 337, 337, 337, 337, 337, 337, 337,
+ 337, 337, 337, 337, 337, 337, 337, 337, 337, 337,
+ 337, 337, 362, 362, 362, 362, 362, 362, 362, 362,
+ 363, 363, 561, 560, 559, 558, 557, 556, 555, 364,
+ 364, 364, 364, 364, 364, 498, 498, 498, 498, 498,
+ 498, 498, 498, 554, 551, 550, 544, 364, 364, 364,
- 221, 221, 221, 221, 221, 221, 221, 221, 223, 522,
- 223, 223, 223, 223, 223, 223, 223, 223, 223, 223,
- 229, 229, 251, 521, 251, 251, 251, 251, 251, 251,
- 251, 251, 251, 251, 252, 520, 252, 252, 252, 255,
- 519, 255, 255, 255, 256, 256, 256, 256, 256, 257,
- 257, 257, 257, 257, 260, 518, 260, 325, 517, 516,
- 513, 512, 325, 506, 325, 325, 334, 505, 334, 400,
- 503, 501, 500, 400, 400, 403, 499, 311, 498, 497,
- 403, 496, 403, 403, 406, 495, 406, 457, 457, 459,
- 494, 493, 459, 459, 464, 492, 464, 502, 502, 504,
+ 364, 364, 364, 431, 501, 501, 501, 501, 501, 501,
+ 501, 501, 543, 541, 539, 364, 364, 364, 364, 364,
+ 364, 364, 364, 364, 364, 538, 537, 323, 536, 535,
+ 534, 533, 432, 432, 432, 432, 432, 432, 433, 433,
+ 433, 433, 433, 433, 433, 433, 433, 433, 433, 532,
+ 432, 432, 432, 432, 432, 432, 433, 433, 433, 433,
+ 433, 433, 433, 433, 433, 433, 433, 433, 433, 433,
+ 433, 433, 433, 433, 433, 442, 442, 442, 442, 442,
+ 442, 442, 442, 443, 443, 531, 530, 529, 528, 527,
+ 526, 525, 444, 444, 444, 444, 444, 444, 502, 502,
- 491, 490, 489, 504, 504, 507, 507, 510, 488, 510,
- 536, 536, 540, 487, 540, 562, 562, 565, 486, 565,
- 582, 582, 485, 484, 483, 482, 481, 480, 479, 478,
- 477, 476, 475, 474, 473, 472, 471, 470, 469, 468,
- 467, 466, 461, 461, 458, 456, 455, 454, 453, 452,
- 451, 450, 449, 448, 447, 446, 445, 444, 443, 442,
- 441, 440, 439, 438, 437, 436, 435, 434, 433, 432,
- 431, 430, 429, 428, 427, 424, 423, 422, 421, 420,
- 419, 418, 417, 416, 415, 414, 413, 412, 411, 410,
- 409, 408, 399, 398, 397, 396, 395, 394, 393, 392,
+ 502, 502, 502, 502, 502, 502, 502, 502, 524, 523,
+ 444, 444, 444, 444, 444, 444, 500, 500, 500, 500,
+ 500, 500, 500, 500, 501, 501, 522, 521, 520, 519,
+ 518, 517, 516, 502, 502, 502, 502, 502, 502, 547,
+ 547, 547, 547, 547, 547, 547, 547, 515, 514, 513,
+ 512, 502, 502, 502, 502, 502, 502, 546, 546, 546,
+ 546, 546, 546, 546, 546, 547, 547, 511, 510, 509,
+ 508, 507, 506, 505, 548, 548, 548, 548, 548, 548,
+ 548, 548, 548, 548, 548, 548, 548, 548, 548, 548,
+ 504, 499, 548, 548, 548, 548, 548, 548, 576, 576,
- 391, 390, 389, 386, 385, 380, 379, 378, 377, 376,
- 375, 374, 373, 372, 366, 365, 364, 363, 362, 361,
- 360, 359, 358, 357, 356, 355, 354, 353, 352, 351,
- 348, 347, 346, 345, 342, 341, 340, 339, 268, 338,
- 337, 336, 263, 262, 331, 330, 594, 322, 321, 318,
- 317, 314, 311, 310, 309, 304, 303, 302, 301, 300,
- 299, 298, 295, 294, 293, 292, 291, 290, 289, 288,
- 287, 286, 285, 280, 277, 276, 275, 274, 273, 270,
- 269, 268, 267, 266, 265, 264, 263, 155, 154, 153,
- 156, 156, 248, 247, 246, 245, 238, 235, 232, 235,
+ 576, 576, 576, 576, 576, 576, 577, 577, 499, 496,
+ 494, 493, 492, 491, 490, 578, 578, 578, 578, 578,
+ 578, 577, 577, 577, 577, 577, 577, 577, 577, 489,
+ 488, 487, 486, 578, 578, 578, 578, 578, 578, 578,
+ 578, 578, 578, 578, 578, 578, 578, 578, 578, 601,
+ 601, 601, 601, 601, 601, 601, 601, 602, 602, 485,
+ 484, 483, 482, 481, 480, 479, 603, 603, 603, 603,
+ 603, 603, 602, 602, 602, 602, 602, 602, 602, 602,
+ 478, 477, 476, 475, 603, 603, 603, 603, 603, 603,
+ 603, 603, 603, 603, 603, 603, 603, 603, 603, 603,
- 232, 594, 220, 219, 218, 206, 201, 192, 186, 185,
- 156, 162, 161, 158, 157, 156, 155, 154, 594, 23,
- 594, 594, 594, 594, 594, 594, 594, 594, 594, 594,
- 594, 594, 594, 594, 594, 594, 594, 594, 594, 594,
- 594, 594, 594, 594, 594, 594, 594, 594, 594, 594,
- 594, 594, 594, 594, 594, 594, 594, 594, 594, 594,
- 594, 594, 594, 594, 594, 594, 594, 594, 594, 594,
- 594, 594, 594, 594, 594, 594, 594, 594, 594, 594,
- 594, 594, 594, 594, 594, 594, 594, 594, 594, 594
+ 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
+ 24, 24, 82, 82, 82, 82, 82, 82, 82, 82,
+ 82, 82, 82, 82, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 132, 132, 132, 132,
+ 132, 132, 132, 132, 132, 132, 132, 132, 137, 137,
+ 137, 137, 137, 137, 137, 137, 137, 137, 137, 137,
+ 139, 474, 139, 148, 473, 472, 471, 148, 148, 148,
+ 148, 164, 470, 164, 164, 164, 164, 164, 164, 164,
+ 164, 164, 164, 165, 469, 165, 165, 165, 222, 468,
+ 222, 467, 222, 222, 222, 222, 222, 222, 222, 222,
+
+ 224, 466, 224, 224, 224, 224, 224, 224, 224, 224,
+ 224, 224, 230, 230, 263, 465, 263, 263, 263, 26...
[truncated message content] |
|
From: <no...@us...> - 2008-07-20 17:59:29
|
Revision: 19059
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=19059&view=rev
Author: nojoopa
Date: 2008-07-20 17:59:30 +0000 (Sun, 20 Jul 2008)
Log Message:
-----------
x64dtv merge
Modified Paths:
--------------
branches/viceplus/v2.0-x64dtv/vice/Makefile.am
branches/viceplus/v2.0-x64dtv/vice/configure.in
branches/viceplus/v2.0-x64dtv/vice/data/Makefile.am
branches/viceplus/v2.0-x64dtv/vice/po/POTFILES.in
branches/viceplus/v2.0-x64dtv/vice/src/6510core.c
branches/viceplus/v2.0-x64dtv/vice/src/Makefile.am
branches/viceplus/v2.0-x64dtv/vice/src/arch/unix/Makefile.am
branches/viceplus/v2.0-x64dtv/vice/src/arch/unix/gui/Makefile.am
branches/viceplus/v2.0-x64dtv/vice/src/arch/unix/gui/uidrive.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/unix/gui/uidrive.h
branches/viceplus/v2.0-x64dtv/vice/src/arch/unix/gui/uisid.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/unix/icon.h
branches/viceplus/v2.0-x64dtv/vice/src/arch/unix/x11/Makefile.am
branches/viceplus/v2.0-x64dtv/vice/src/arch/unix/x11/xaw/Makefile.am
branches/viceplus/v2.0-x64dtv/vice/src/autostart.c
branches/viceplus/v2.0-x64dtv/vice/src/c64/Makefile.am
branches/viceplus/v2.0-x64dtv/vice/src/c64/c64mem.h
branches/viceplus/v2.0-x64dtv/vice/src/c64ui.h
branches/viceplus/v2.0-x64dtv/vice/src/machine.h
branches/viceplus/v2.0-x64dtv/vice/src/maincpu.c
branches/viceplus/v2.0-x64dtv/vice/src/maincpu.h
branches/viceplus/v2.0-x64dtv/vice/src/monitor/Makefile.am
branches/viceplus/v2.0-x64dtv/vice/src/monitor/mon_drive.c
branches/viceplus/v2.0-x64dtv/vice/src/monitor/mon_file.c
branches/viceplus/v2.0-x64dtv/vice/src/monitor/mon_lex.l
branches/viceplus/v2.0-x64dtv/vice/src/monitor/mon_memory.c
branches/viceplus/v2.0-x64dtv/vice/src/monitor/mon_parse.y
branches/viceplus/v2.0-x64dtv/vice/src/monitor/mon_register.h
branches/viceplus/v2.0-x64dtv/vice/src/monitor/monitor.c
branches/viceplus/v2.0-x64dtv/vice/src/monitor/montypes.h
branches/viceplus/v2.0-x64dtv/vice/src/monitor.h
branches/viceplus/v2.0-x64dtv/vice/src/resid/Makefile.am
branches/viceplus/v2.0-x64dtv/vice/src/resid/envelope.cc
branches/viceplus/v2.0-x64dtv/vice/src/resid/envelope.h
branches/viceplus/v2.0-x64dtv/vice/src/resid/sid.cc
branches/viceplus/v2.0-x64dtv/vice/src/resid/sid.h
branches/viceplus/v2.0-x64dtv/vice/src/resid/siddefs.h
branches/viceplus/v2.0-x64dtv/vice/src/resid/siddefs.h.in
branches/viceplus/v2.0-x64dtv/vice/src/resid/voice.cc
branches/viceplus/v2.0-x64dtv/vice/src/resid/wave.cc
branches/viceplus/v2.0-x64dtv/vice/src/resid/wave.h
branches/viceplus/v2.0-x64dtv/vice/src/sid/fastsid.c
branches/viceplus/v2.0-x64dtv/vice/src/sid/resid.cc
branches/viceplus/v2.0-x64dtv/vice/src/sid/sid-cmdline-options.c
branches/viceplus/v2.0-x64dtv/vice/src/sid/sid-resources.c
branches/viceplus/v2.0-x64dtv/vice/src/sid/sid.h
branches/viceplus/v2.0-x64dtv/vice/src/translate.c
branches/viceplus/v2.0-x64dtv/vice/src/translate.txt
branches/viceplus/v2.0-x64dtv/vice/src/traps.c
branches/viceplus/v2.0-x64dtv/vice/src/vicii/Makefile.am
branches/viceplus/v2.0-x64dtv/vice/src/vicii/vicii-badline.c
branches/viceplus/v2.0-x64dtv/vice/src/vicii/vicii-fetch.c
branches/viceplus/v2.0-x64dtv/vice/src/vicii/vicii-irq.c
branches/viceplus/v2.0-x64dtv/vice/src/vicii/vicii-mem.c
branches/viceplus/v2.0-x64dtv/vice/src/vicii/vicii-mem.h
branches/viceplus/v2.0-x64dtv/vice/src/vicii/vicii.c
branches/viceplus/v2.0-x64dtv/vice/src/vicii/viciitypes.h
branches/viceplus/v2.0-x64dtv/vice/src/vicii.h
branches/viceplus/v2.0-x64dtv/vice/src/video.h
Added Paths:
-----------
branches/viceplus/v2.0-x64dtv/vice/data/C64DTV/
branches/viceplus/v2.0-x64dtv/vice/data/C64DTV/Makefile.am
branches/viceplus/v2.0-x64dtv/vice/data/C64DTV/ROdflt.vkm
branches/viceplus/v2.0-x64dtv/vice/data/C64DTV/amiga_pos.vkm
branches/viceplus/v2.0-x64dtv/vice/data/C64DTV/amiga_sym.vkm
branches/viceplus/v2.0-x64dtv/vice/data/C64DTV/basic
branches/viceplus/v2.0-x64dtv/vice/data/C64DTV/beos_pos.vkm
branches/viceplus/v2.0-x64dtv/vice/data/C64DTV/beos_sym.vkm
branches/viceplus/v2.0-x64dtv/vice/data/C64DTV/c64hq.vpl
branches/viceplus/v2.0-x64dtv/vice/data/C64DTV/c64mem.sym
branches/viceplus/v2.0-x64dtv/vice/data/C64DTV/c64s.vpl
branches/viceplus/v2.0-x64dtv/vice/data/C64DTV/ccs64.vpl
branches/viceplus/v2.0-x64dtv/vice/data/C64DTV/chargen
branches/viceplus/v2.0-x64dtv/vice/data/C64DTV/default.vpl
branches/viceplus/v2.0-x64dtv/vice/data/C64DTV/default.vrs
branches/viceplus/v2.0-x64dtv/vice/data/C64DTV/dos_pos.vkm
branches/viceplus/v2.0-x64dtv/vice/data/C64DTV/dos_sym.vkm
branches/viceplus/v2.0-x64dtv/vice/data/C64DTV/frodo.vpl
branches/viceplus/v2.0-x64dtv/vice/data/C64DTV/godot.vpl
branches/viceplus/v2.0-x64dtv/vice/data/C64DTV/kernal
branches/viceplus/v2.0-x64dtv/vice/data/C64DTV/os2.vkm
branches/viceplus/v2.0-x64dtv/vice/data/C64DTV/os2_sym.vkm
branches/viceplus/v2.0-x64dtv/vice/data/C64DTV/osx_pos.vkm
branches/viceplus/v2.0-x64dtv/vice/data/C64DTV/osx_sym_de.vkm
branches/viceplus/v2.0-x64dtv/vice/data/C64DTV/osx_sym_us.vkm
branches/viceplus/v2.0-x64dtv/vice/data/C64DTV/pc64.vpl
branches/viceplus/v2.0-x64dtv/vice/data/C64DTV/vice.vpl
branches/viceplus/v2.0-x64dtv/vice/data/C64DTV/win_pos.vkm
branches/viceplus/v2.0-x64dtv/vice/data/C64DTV/win_shortcuts.vsc
branches/viceplus/v2.0-x64dtv/vice/data/C64DTV/win_sym_de.vkm
branches/viceplus/v2.0-x64dtv/vice/data/C64DTV/win_sym_us.vkm
branches/viceplus/v2.0-x64dtv/vice/data/C64DTV/x11_pos.vkm
branches/viceplus/v2.0-x64dtv/vice/data/C64DTV/x11_sym.vkm
branches/viceplus/v2.0-x64dtv/vice/src/arch/unix/gui/c64dtvui.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/unix/gui/uic64dtv.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/unix/gui/uic64dtv.h
branches/viceplus/v2.0-x64dtv/vice/src/arch/unix/gui/uidrivec64dtv.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/unix/gui/uidrivec64dtv.h
branches/viceplus/v2.0-x64dtv/vice/src/arch/unix/gui/uips2mouse.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/unix/gui/uips2mouse.h
branches/viceplus/v2.0-x64dtv/vice/src/arch/unix/x11/c64dtvicon.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/resc64dtv.rc
branches/viceplus/v2.0-x64dtv/vice/src/c64dtv/
branches/viceplus/v2.0-x64dtv/vice/src/c64dtv/Makefile.am
branches/viceplus/v2.0-x64dtv/vice/src/c64dtv/c64dtv-cmdline-options.c
branches/viceplus/v2.0-x64dtv/vice/src/c64dtv/c64dtv-cmdline-options.h
branches/viceplus/v2.0-x64dtv/vice/src/c64dtv/c64dtv-resources.c
branches/viceplus/v2.0-x64dtv/vice/src/c64dtv/c64dtv-resources.h
branches/viceplus/v2.0-x64dtv/vice/src/c64dtv/c64dtv-snapshot.c
branches/viceplus/v2.0-x64dtv/vice/src/c64dtv/c64dtv-snapshot.h
branches/viceplus/v2.0-x64dtv/vice/src/c64dtv/c64dtv.c
branches/viceplus/v2.0-x64dtv/vice/src/c64dtv/c64dtv.h
branches/viceplus/v2.0-x64dtv/vice/src/c64dtv/c64dtvblitter.c
branches/viceplus/v2.0-x64dtv/vice/src/c64dtv/c64dtvblitter.h
branches/viceplus/v2.0-x64dtv/vice/src/c64dtv/c64dtvcart.c
branches/viceplus/v2.0-x64dtv/vice/src/c64dtv/c64dtvcia1.c
branches/viceplus/v2.0-x64dtv/vice/src/c64dtv/c64dtvcia2.c
branches/viceplus/v2.0-x64dtv/vice/src/c64dtv/c64dtvcpu.c
branches/viceplus/v2.0-x64dtv/vice/src/c64dtv/c64dtvdma.c
branches/viceplus/v2.0-x64dtv/vice/src/c64dtv/c64dtvdma.h
branches/viceplus/v2.0-x64dtv/vice/src/c64dtv/c64dtvflash.c
branches/viceplus/v2.0-x64dtv/vice/src/c64dtv/c64dtvflash.h
branches/viceplus/v2.0-x64dtv/vice/src/c64dtv/c64dtviec.c
branches/viceplus/v2.0-x64dtv/vice/src/c64dtv/c64dtvmem.c
branches/viceplus/v2.0-x64dtv/vice/src/c64dtv/c64dtvmem.h
branches/viceplus/v2.0-x64dtv/vice/src/c64dtv/c64dtvmeminit.c
branches/viceplus/v2.0-x64dtv/vice/src/c64dtv/c64dtvmeminit.h
branches/viceplus/v2.0-x64dtv/vice/src/c64dtv/c64dtvmemrom.c
branches/viceplus/v2.0-x64dtv/vice/src/c64dtv/c64dtvmemsnapshot.c
branches/viceplus/v2.0-x64dtv/vice/src/c64dtv/c64dtvmemsnapshot.h
branches/viceplus/v2.0-x64dtv/vice/src/c64dtv/c64dtvpla.c
branches/viceplus/v2.0-x64dtv/vice/src/c64dtv/c64dtvsound.c
branches/viceplus/v2.0-x64dtv/vice/src/c64dtv/c64dtvtfe.c
branches/viceplus/v2.0-x64dtv/vice/src/c64dtv/flash-trap.c
branches/viceplus/v2.0-x64dtv/vice/src/c64dtv/flash-trap.h
branches/viceplus/v2.0-x64dtv/vice/src/c64dtv/hummeradc.c
branches/viceplus/v2.0-x64dtv/vice/src/c64dtv/hummeradc.h
branches/viceplus/v2.0-x64dtv/vice/src/monitor/asm6502dtv.c
branches/viceplus/v2.0-x64dtv/vice/src/monitor/mon_register6502dtv.c
branches/viceplus/v2.0-x64dtv/vice/src/mos6510dtv.h
branches/viceplus/v2.0-x64dtv/vice/src/ps2mouse.c
branches/viceplus/v2.0-x64dtv/vice/src/ps2mouse.h
branches/viceplus/v2.0-x64dtv/vice/src/vicii/vicii-stubs.c
branches/viceplus/v2.0-x64dtv/vice/src/vicii/viciidtv-color.c
branches/viceplus/v2.0-x64dtv/vice/src/vicii/viciidtv-draw.c
branches/viceplus/v2.0-x64dtv/vice/src/vicii/viciidtv-snapshot.c
Removed Paths:
-------------
branches/viceplus/v2.0-x64dtv/vice/data/C64DTV/Makefile.am
branches/viceplus/v2.0-x64dtv/vice/data/C64DTV/ROdflt.vkm
branches/viceplus/v2.0-x64dtv/vice/data/C64DTV/amiga_pos.vkm
branches/viceplus/v2.0-x64dtv/vice/data/C64DTV/amiga_sym.vkm
branches/viceplus/v2.0-x64dtv/vice/data/C64DTV/basic
branches/viceplus/v2.0-x64dtv/vice/data/C64DTV/beos_pos.vkm
branches/viceplus/v2.0-x64dtv/vice/data/C64DTV/beos_sym.vkm
branches/viceplus/v2.0-x64dtv/vice/data/C64DTV/c64hq.vpl
branches/viceplus/v2.0-x64dtv/vice/data/C64DTV/c64mem.sym
branches/viceplus/v2.0-x64dtv/vice/data/C64DTV/c64s.vpl
branches/viceplus/v2.0-x64dtv/vice/data/C64DTV/ccs64.vpl
branches/viceplus/v2.0-x64dtv/vice/data/C64DTV/chargen
branches/viceplus/v2.0-x64dtv/vice/data/C64DTV/default.vpl
branches/viceplus/v2.0-x64dtv/vice/data/C64DTV/default.vrs
branches/viceplus/v2.0-x64dtv/vice/data/C64DTV/dos_pos.vkm
branches/viceplus/v2.0-x64dtv/vice/data/C64DTV/dos_sym.vkm
branches/viceplus/v2.0-x64dtv/vice/data/C64DTV/frodo.vpl
branches/viceplus/v2.0-x64dtv/vice/data/C64DTV/godot.vpl
branches/viceplus/v2.0-x64dtv/vice/data/C64DTV/kernal
branches/viceplus/v2.0-x64dtv/vice/data/C64DTV/os2.vkm
branches/viceplus/v2.0-x64dtv/vice/data/C64DTV/os2_sym.vkm
branches/viceplus/v2.0-x64dtv/vice/data/C64DTV/osx_pos.vkm
branches/viceplus/v2.0-x64dtv/vice/data/C64DTV/osx_sym_de.vkm
branches/viceplus/v2.0-x64dtv/vice/data/C64DTV/osx_sym_us.vkm
branches/viceplus/v2.0-x64dtv/vice/data/C64DTV/pc64.vpl
branches/viceplus/v2.0-x64dtv/vice/data/C64DTV/vice.vpl
branches/viceplus/v2.0-x64dtv/vice/data/C64DTV/win_pos.vkm
branches/viceplus/v2.0-x64dtv/vice/data/C64DTV/win_shortcuts.vsc
branches/viceplus/v2.0-x64dtv/vice/data/C64DTV/win_sym_de.vkm
branches/viceplus/v2.0-x64dtv/vice/data/C64DTV/win_sym_us.vkm
branches/viceplus/v2.0-x64dtv/vice/data/C64DTV/x11_pos.vkm
branches/viceplus/v2.0-x64dtv/vice/data/C64DTV/x11_sym.vkm
Modified: branches/viceplus/v2.0-x64dtv/vice/Makefile.am
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/Makefile.am 2008-07-20 16:45:37 UTC (rev 19058)
+++ branches/viceplus/v2.0-x64dtv/vice/Makefile.am 2008-07-20 17:59:30 UTC (rev 19059)
@@ -11,13 +11,16 @@
vice.spec \
vice-mint.spec
-.PHONY: x64 x128 xvic xpet xplus4 xcbm2
+.PHONY: x64 x128 x64dtv xvic xpet xplus4 xcbm2
x64:
(cd src; $(MAKE) x64-all)
x128:
(cd src; $(MAKE) x128-all)
+x64dtv:
+ (cd src; $(MAKE) x64dtv-all)
+
xvic:
(cd src; $(MAKE) xvic-all)
Modified: branches/viceplus/v2.0-x64dtv/vice/configure.in
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/configure.in 2008-07-20 16:45:37 UTC (rev 19058)
+++ branches/viceplus/v2.0-x64dtv/vice/configure.in 2008-07-20 17:59:30 UTC (rev 19059)
@@ -1773,6 +1773,7 @@
xcbm2_LDFLAGS="-mwindows"
X64_WINRES="\$(top_builddir)/src/arch/win32/resc64.o"
+ X64DTV_WINRES="\$(top_builddir)/src/arch/win32/resc64dtv.o"
X128_WINRES="\$(top_builddir)/src/arch/win32/resc128.o"
XVIC_WINRES="\$(top_builddir)/src/arch/win32/resvic20.o"
XPET_WINRES="\$(top_builddir)/src/arch/win32/respet.o"
@@ -1821,6 +1822,7 @@
AC_SUBST(xcbm2_LDFLAGS)
AC_SUBST(X64_WINRES)
+AC_SUBST(X64DTV_WINRES)
AC_SUBST(X128_WINRES)
AC_SUBST(XVIC_WINRES)
AC_SUBST(XPET_WINRES)
@@ -2285,6 +2287,7 @@
data/Makefile
data/C128/Makefile
data/C64/Makefile
+ data/C64DTV/Makefile
data/CBM-II/Makefile
data/DRIVES/Makefile
data/PET/Makefile
@@ -2326,6 +2329,7 @@
src/c128/Makefile
src/c64/Makefile
src/c64/cart/Makefile
+ src/c64dtv/Makefile
src/cbm2/Makefile
src/core/Makefile
src/crtc/Makefile
Deleted: branches/viceplus/v2.0-x64dtv/vice/data/C64DTV/Makefile.am
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/data/C64/Makefile.am 2008-07-19 16:25:43 UTC (rev 19055)
+++ branches/viceplus/v2.0-x64dtv/vice/data/C64DTV/Makefile.am 2008-07-20 17:59:30 UTC (rev 19059)
@@ -1,37 +0,0 @@
-c64dir = $(VICEDIR)/C64
-
-c64_DATA = \
- amiga_sym.vkm \
- amiga_pos.vkm \
- basic \
- beos_sym.vkm \
- beos_pos.vkm \
- c64hq.vpl \
- c64mem.sym \
- c64s.vpl \
- ccs64.vpl \
- chargen \
- default.vpl \
- default.vrs \
- dos_sym.vkm \
- dos_pos.vkm \
- frodo.vpl \
- godot.vpl \
- kernal \
- os2.vkm \
- os2_sym.vkm \
- osx_pos.vkm \
- osx_sym_de.vkm \
- osx_sym_us.vkm \
- pc64.vpl \
- ROdflt.vkm \
- vice.vpl \
- win_shortcuts.vsc \
- win_sym_de.vkm \
- win_sym_us.vkm \
- win_pos.vkm \
- x11_sym.vkm \
- x11_pos.vkm
-
-EXTRA_DIST = $(c64_DATA)
-
Copied: branches/viceplus/v2.0-x64dtv/vice/data/C64DTV/Makefile.am (from rev 19058, branches/viceplus/v2.0-x64dtv/vice/data/C64/Makefile.am)
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/data/C64DTV/Makefile.am (rev 0)
+++ branches/viceplus/v2.0-x64dtv/vice/data/C64DTV/Makefile.am 2008-07-20 17:59:30 UTC (rev 19059)
@@ -0,0 +1,37 @@
+c64dtvdir = $(VICEDIR)/C64DTV
+
+c64dtv_DATA = \
+ amiga_sym.vkm \
+ amiga_pos.vkm \
+ basic \
+ beos_sym.vkm \
+ beos_pos.vkm \
+ c64hq.vpl \
+ c64mem.sym \
+ c64s.vpl \
+ ccs64.vpl \
+ chargen \
+ default.vpl \
+ default.vrs \
+ dos_sym.vkm \
+ dos_pos.vkm \
+ frodo.vpl \
+ godot.vpl \
+ kernal \
+ os2.vkm \
+ os2_sym.vkm \
+ osx_pos.vkm \
+ osx_sym_de.vkm \
+ osx_sym_us.vkm \
+ pc64.vpl \
+ ROdflt.vkm \
+ vice.vpl \
+ win_shortcuts.vsc \
+ win_sym_de.vkm \
+ win_sym_us.vkm \
+ win_pos.vkm \
+ x11_sym.vkm \
+ x11_pos.vkm
+
+EXTRA_DIST = $(c64dtv_DATA)
+
Deleted: branches/viceplus/v2.0-x64dtv/vice/data/C64DTV/ROdflt.vkm
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/data/C64/ROdflt.vkm 2008-07-19 16:25:43 UTC (rev 19055)
+++ branches/viceplus/v2.0-x64dtv/vice/data/C64DTV/ROdflt.vkm 2008-07-20 17:59:30 UTC (rev 19059)
@@ -1,133 +0,0 @@
-# VICE keyboard mapping file for RISC OS
-#
-# Different file format due to heavy dependency of Vice's on X11
-#
-# File format:
-# - comment lines start with '#'
-# - clear table using !CLEAR
-# - lineformat is keynum row col ['s' [srow scol ['s']]] ["keystr"]
-# where 's' means activate shift key and srow/scol are keyboard
-# positions for shifted keys (these should only be used if you want
-# to map characters that need shift on your RISC OS machine to an
-# unshifted position on the emulated machine (e.g. '*').
-# Use row=15, col=15 or no specification to disable a key
-#
-# keynum is the internal key number (see RO3 PRM1-849). keystr is the
-# optional string representation for that key on an english keyboard.
-
-!CLEAR
-
- 0 1 7 "Shft"
- 1 7 2 "Ctrl"
- 2 7 5 "Alt"
- 3 1 7 "ShftL"
- 4 7 2 "CtrlL"
- 5 7 5 "AltL"
- 6 6 4 "ShftR"
- 7 7 2 "CtrlR"
- 8 7 5 "AltR"
- 9 15 15 "Slct"
- 10 15 15 "Menu"
- 11 15 15 "Adjst"
- 16 7 6 "q"
- 17 1 0 "3"
- 18 1 3 "4"
- 19 2 0 "5"
- 20 0 3 "F4"
- 21 3 3 "8"
- 22 15 15 "F7"
- 23 5 3 "-"
- 24 2 3 "6"
- 25 0 2 s "CrsrL"
- 26 15 15 "num6"
- 27 15 15 "num7"
- 28 15 15 "F11"
- 29 15 15 "F12"
- 30 15 15 "F10"
- 31 15 15 "ScrLck"
- 32 15 15 "Print"
- 33 1 1 "w"
- 34 1 6 "e"
- 35 2 6 "t"
- 36 3 0 "7"
- 37 4 1 "i"
- 38 4 0 "9"
- 39 4 3 "0"
- 40 5 3 "-"
- 41 0 7 "CrsrD"
- 42 15 15 "num8"
- 43 15 15 "num9"
- 44 7 7 "Break"
- 45 7 1 "`"
- 46 6 0 "\xA3"
- 47 0 0 "BackSpc"
- 48 7 0 "1"
- 49 7 3 "2"
- 50 2 2 "d"
- 51 2 1 "r"
- 52 2 3 "6"
- 53 3 6 "u"
- 54 4 6 "o"
- 55 5 1 "p"
- 56 5 6 "["
- 57 0 7 s "CrsrU"
- 58 5 0 "num+"
- 59 5 3 "num-"
- 60 15 15 "numEntr"
- 61 0 0 s "Insert"
- 62 6 3 "Home"
- 63 15 15 "PgUp"
- 64 1 7 "CpsLck"
- 65 1 2 "a"
- 66 2 7 "x"
- 67 2 5 "f"
- 68 3 1 "y"
- 69 4 2 "j"
- 70 4 5 "k"
- 71 7 3 "2"
- 72 5 5 ";"
- 73 0 1 "Return"
- 74 15 15 "num/"
- 76 15 15 "num."
- 77 15 15 "numLck"
- 78 15 15 "PgDown"
- 79 6 2 "'"
- 81 1 5 "s"
- 82 2 4 "c"
- 83 3 2 "g"
- 84 3 5 "h"
- 85 4 7 "n"
- 86 5 2 "l"
- 87 5 5 ";"
- 88 6 1 "]"
- 89 0 0 "Delete"
- 90 15 15 "num#"
- 91 15 15 "num*"
- 93 6 5 "="
- 94 15 15 "Extra"
- 96 7 2 "Tab"
- 97 1 4 "z"
- 98 7 4 "Space"
- 99 3 7 "v"
-100 3 4 "b"
-101 4 4 "m"
-102 5 7 ","
-103 5 4 "."
-104 6 7 "/"
-105 15 15 "Copy"
-106 15 15 "num0"
-107 15 15 "num1"
-108 15 15 "num3"
-112 7 7 "Esc"
-113 0 4 "F1"
-114 0 5 "F2"
-115 0 6 "F3"
-116 15 15 "F5"
-117 15 15 "F6"
-118 15 15 "F8"
-119 15 15 "F9"
-120 6 6 "\"
-121 0 2 "CrsrR"
-122 15 15 "num4"
-123 15 15 "num5"
-124 15 15 "num2"
Copied: branches/viceplus/v2.0-x64dtv/vice/data/C64DTV/ROdflt.vkm (from rev 19058, branches/viceplus/v2.0-x64dtv/vice/data/C64/ROdflt.vkm)
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/data/C64DTV/ROdflt.vkm (rev 0)
+++ branches/viceplus/v2.0-x64dtv/vice/data/C64DTV/ROdflt.vkm 2008-07-20 17:59:30 UTC (rev 19059)
@@ -0,0 +1,133 @@
+# VICE keyboard mapping file for RISC OS
+#
+# Different file format due to heavy dependency of Vice's on X11
+#
+# File format:
+# - comment lines start with '#'
+# - clear table using !CLEAR
+# - lineformat is keynum row col ['s' [srow scol ['s']]] ["keystr"]
+# where 's' means activate shift key and srow/scol are keyboard
+# positions for shifted keys (these should only be used if you want
+# to map characters that need shift on your RISC OS machine to an
+# unshifted position on the emulated machine (e.g. '*').
+# Use row=15, col=15 or no specification to disable a key
+#
+# keynum is the internal key number (see RO3 PRM1-849). keystr is the
+# optional string representation for that key on an english keyboard.
+
+!CLEAR
+
+ 0 1 7 "Shft"
+ 1 7 2 "Ctrl"
+ 2 7 5 "Alt"
+ 3 1 7 "ShftL"
+ 4 7 2 "CtrlL"
+ 5 7 5 "AltL"
+ 6 6 4 "ShftR"
+ 7 7 2 "CtrlR"
+ 8 7 5 "AltR"
+ 9 15 15 "Slct"
+ 10 15 15 "Menu"
+ 11 15 15 "Adjst"
+ 16 7 6 "q"
+ 17 1 0 "3"
+ 18 1 3 "4"
+ 19 2 0 "5"
+ 20 0 3 "F4"
+ 21 3 3 "8"
+ 22 15 15 "F7"
+ 23 5 3 "-"
+ 24 2 3 "6"
+ 25 0 2 s "CrsrL"
+ 26 15 15 "num6"
+ 27 15 15 "num7"
+ 28 15 15 "F11"
+ 29 15 15 "F12"
+ 30 15 15 "F10"
+ 31 15 15 "ScrLck"
+ 32 15 15 "Print"
+ 33 1 1 "w"
+ 34 1 6 "e"
+ 35 2 6 "t"
+ 36 3 0 "7"
+ 37 4 1 "i"
+ 38 4 0 "9"
+ 39 4 3 "0"
+ 40 5 3 "-"
+ 41 0 7 "CrsrD"
+ 42 15 15 "num8"
+ 43 15 15 "num9"
+ 44 7 7 "Break"
+ 45 7 1 "`"
+ 46 6 0 "\xA3"
+ 47 0 0 "BackSpc"
+ 48 7 0 "1"
+ 49 7 3 "2"
+ 50 2 2 "d"
+ 51 2 1 "r"
+ 52 2 3 "6"
+ 53 3 6 "u"
+ 54 4 6 "o"
+ 55 5 1 "p"
+ 56 5 6 "["
+ 57 0 7 s "CrsrU"
+ 58 5 0 "num+"
+ 59 5 3 "num-"
+ 60 15 15 "numEntr"
+ 61 0 0 s "Insert"
+ 62 6 3 "Home"
+ 63 15 15 "PgUp"
+ 64 1 7 "CpsLck"
+ 65 1 2 "a"
+ 66 2 7 "x"
+ 67 2 5 "f"
+ 68 3 1 "y"
+ 69 4 2 "j"
+ 70 4 5 "k"
+ 71 7 3 "2"
+ 72 5 5 ";"
+ 73 0 1 "Return"
+ 74 15 15 "num/"
+ 76 15 15 "num."
+ 77 15 15 "numLck"
+ 78 15 15 "PgDown"
+ 79 6 2 "'"
+ 81 1 5 "s"
+ 82 2 4 "c"
+ 83 3 2 "g"
+ 84 3 5 "h"
+ 85 4 7 "n"
+ 86 5 2 "l"
+ 87 5 5 ";"
+ 88 6 1 "]"
+ 89 0 0 "Delete"
+ 90 15 15 "num#"
+ 91 15 15 "num*"
+ 93 6 5 "="
+ 94 15 15 "Extra"
+ 96 7 2 "Tab"
+ 97 1 4 "z"
+ 98 7 4 "Space"
+ 99 3 7 "v"
+100 3 4 "b"
+101 4 4 "m"
+102 5 7 ","
+103 5 4 "."
+104 6 7 "/"
+105 15 15 "Copy"
+106 15 15 "num0"
+107 15 15 "num1"
+108 15 15 "num3"
+112 7 7 "Esc"
+113 0 4 "F1"
+114 0 5 "F2"
+115 0 6 "F3"
+116 15 15 "F5"
+117 15 15 "F6"
+118 15 15 "F8"
+119 15 15 "F9"
+120 6 6 "\"
+121 0 2 "CrsrR"
+122 15 15 "num4"
+123 15 15 "num5"
+124 15 15 "num2"
Deleted: branches/viceplus/v2.0-x64dtv/vice/data/C64DTV/amiga_pos.vkm
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/data/C64/amiga_pos.vkm 2008-07-19 16:25:43 UTC (rev 19055)
+++ branches/viceplus/v2.0-x64dtv/vice/data/C64DTV/amiga_pos.vkm 2008-07-20 17:59:30 UTC (rev 19059)
@@ -1,146 +0,0 @@
-# VICE keyboard mapping file
-#
-# A Keyboard map is read in as patch to the current map.
-#
-# File format:
-# - comment lines start with '#'
-# - keyword lines start with '!keyword'
-# - normal line has 'keysym/scancode row column shiftflag'
-#
-# Keywords and their lines are:
-# '!CLEAR' clear whole table
-# '!INCLUDE filename' read file as mapping file
-# '!LSHIFT row col' left shift keyboard row/column
-# '!RSHIFT row col' right shift keyboard row/column
-# '!VSHIFT shiftkey' virtual shift key (RSHIFT or LSHIFT)
-# '!UNDEF keysym' remove keysym from table
-#
-# Shiftflag can have the values:
-# 0 key is not shifted for this keysym
-# 1 key is shifted for this keysym
-# 2 left shift
-# 4 right shift
-# 8 key can be shifted or not with this keysym
-#
-# Negative row values:
-# 'keysym -1 n' joystick #1, direction n
-# 'keysym -2 n' joystick #2, direction n
-# 'keysym -3 0' first RESTORE key
-# 'keysym -3 1' second RESTORE key
-# 'keysym -4 0' 40/80 column key
-# 'keysym -4 1' CAPS (ASCII/DIN) key
-#
-
-!CLEAR
-!LSHIFT 1 7
-!RSHIFT 6 4
-!VSHIFT RSHIFT
-
-0 7 1 8 /* ` -> Left Arrow */
-1 7 0 8 /* 1 -> 1 */
-2 7 3 8 /* 2 -> 2 */
-3 1 0 8 /* 3 -> 3 */
-4 1 3 8 /* 4 -> 4 */
-5 2 0 8 /* 5 -> 5 */
-6 2 3 8 /* 6 -> 6 */
-7 3 0 8 /* 7 -> 7 */
-8 3 3 8 /* 8 -> 8 */
-9 4 0 8 /* 9 -> 9 */
-10 4 3 8 /* 0 -> 0 */
-11 5 0 8 /* Plus -> Plus */
-12 5 3 8 /* \xB4 -> Minus */
-13 6 3 8 /* \ -> CLR/HOME */
-#14 -1 -1 0 /* -> (no key) */
-#15 -1 -1 0 /* KEYPAD 0 -> (no key) */
-16 7 6 8 /* Q -> Q */
-17 1 1 8 /* W -> W */
-18 1 6 8 /* E -> E */
-19 2 1 8 /* R -> R */
-20 2 6 8 /* T -> T */
-21 3 1 8 /* Y -> Y */
-22 3 6 8 /* U -> U */
-23 4 1 8 /* I -> I */
-24 4 6 8 /* O -> O */
-25 5 1 8 /* P -> P */
-26 5 6 8 /* (\xE5) [ -> @ */
-27 6 1 8 /* (\xA8) ] -> * */
-#28 -1 -1 0 /* -> (no key) */
-#29 -1 -1 0 /* KEYPAD 1 -> (no key) */
-#30 -1 -1 0 /* KEYPAD 2 -> (no key) */
-#31 -1 -1 0 /* KEYPAD 3 -> (no key) */
-32 1 2 8 /* A -> A */
-33 1 5 8 /* S -> S */
-34 2 2 8 /* D -> D */
-35 2 5 8 /* F -> F */
-36 3 2 8 /* G -> G */
-37 3 5 8 /* H -> H */
-38 4 2 8 /* J -> J */
-39 4 5 8 /* K -> K */
-40 5 2 8 /* L -> L */
-41 5 5 8 /* ; -> : */
-42 6 2 8 /* ' -> ; */
-43 6 5 8 /* \ -> = */
-#44 -1 -1 0 /* -> (no key) */
-#45 -1 -1 0 /* KEYPAD 4 -> (no key) */
-#46 -1 -1 0 /* KEYPAD 5 -> (no key) */
-#47 -1 -1 0 /* KEYPAD 6 -> (no key) */
-48 6 5 8 /* < -> = */
-49 1 4 8 /* Z -> Z */
-50 2 7 8 /* X -> X */
-51 2 4 8 /* C -> C */
-52 3 7 8 /* V -> V */
-53 3 4 8 /* B -> B */
-54 4 7 8 /* N -> N */
-55 4 4 8 /* M -> M */
-56 5 7 8 /* , -> , */
-57 5 4 8 /* . -> . */
-58 6 7 8 /* / -> / */
-#59 -1 -1 0 /* -> (no key) */
-#60 -1 -1 0 /* KEYPAD DEL -> (no key) */
-#61 -1 -1 0 /* KEYPAD 7 -> (no key) */
-#62 -1 -1 0 /* KEYPAD 8 -> (no key) */
-#63 -1 -1 0 /* KEYPAD 9 -> (no key) */
-64 7 4 8 /* Space -> Space */
-65 0 0 8 /* Backspace -> Del */
-66 7 2 8 /* TAB -> Ctrl */
-#67 -1 -1 0 /* KEYPAD ENTER -> (no key) */
-68 0 1 8 /* Return -> Return */
-69 7 7 8 /* ESC -> Run/Stop */
-70 6 0 8 /* DEL -> Pound */
-#71 -1 -1 0 /* -> (no key) */
-#72 -1 -1 0 /* -> (no key) */
-#73 -1 -1 0 /* -> (no key) */
-#74 -1 -1 0 /* KEYPAD - -> (no key) */
-#75 -1 -1 0 /* -> (no key) */
-76 0 7 1 /* Up -> CRSR UP */
-77 0 7 8 /* Down -> CRSR DOWN */
-78 0 2 8 /* Right -> CRSR RIGHT */
-79 0 2 1 /* Left -> CRSR LEFT */
-80 0 4 8 /* F1 -> F1 */
-81 0 4 1 /* F2 -> F2 */
-82 0 5 8 /* F3 -> F3 */
-83 0 5 1 /* F4 -> F4 */
-84 0 6 8 /* F5 -> F5 */
-85 0 6 1 /* F6 -> F6 */
-86 0 3 8 /* F7 -> F7 */
-87 0 3 1 /* F8 -> F8 */
-#88 -1 -1 0 /* F9 -> (no key) */
-#89 -1 -1 0 /* F10 -> (no key) */
-#90 -1 -1 0 /* NUMLOCK -> (no key) */
-#91 -1 -1 0 /* SCRLOCK -> (no key) */
-#92 -1 -1 0 /* KEYPAD SLASH -> (no key) */
-#93 -1 -1 0 /* KEYPAD * -> (no key) */
-#94 -1 -1 0 /* KEYPAD + -> (no key) */
-95 6 6 8 /* HELP -> Up Arrow */
-96 1 7 2 /* Left Shift -> Left Shift */
-97 6 4 4 /* Right Shift -> Right Shift */
-#98 -1 -1 0 /* CAPSLOCK -> (no key) */
-99 7 5 8 /* Ctrl -> CBM */
-#100 -1 -1 0 /* LEFT ALT -> (no key) */
-#101 -1 -1 0 /* RIGHT ALT -> (no key) */
-#102 -1 -1 0 /* LEFT AMIGA -> (no key) */
-#103 -1 -1 0 /* RIGHT AMIGA -> (no key) */
-
-# Restore key mappings
-89 -3 0 /* F10 -> RESTORE */
-
Copied: branches/viceplus/v2.0-x64dtv/vice/data/C64DTV/amiga_pos.vkm (from rev 19058, branches/viceplus/v2.0-x64dtv/vice/data/C64/amiga_pos.vkm)
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/data/C64DTV/amiga_pos.vkm (rev 0)
+++ branches/viceplus/v2.0-x64dtv/vice/data/C64DTV/amiga_pos.vkm 2008-07-20 17:59:30 UTC (rev 19059)
@@ -0,0 +1,146 @@
+# VICE keyboard mapping file
+#
+# A Keyboard map is read in as patch to the current map.
+#
+# File format:
+# - comment lines start with '#'
+# - keyword lines start with '!keyword'
+# - normal line has 'keysym/scancode row column shiftflag'
+#
+# Keywords and their lines are:
+# '!CLEAR' clear whole table
+# '!INCLUDE filename' read file as mapping file
+# '!LSHIFT row col' left shift keyboard row/column
+# '!RSHIFT row col' right shift keyboard row/column
+# '!VSHIFT shiftkey' virtual shift key (RSHIFT or LSHIFT)
+# '!UNDEF keysym' remove keysym from table
+#
+# Shiftflag can have the values:
+# 0 key is not shifted for this keysym
+# 1 key is shifted for this keysym
+# 2 left shift
+# 4 right shift
+# 8 key can be shifted or not with this keysym
+#
+# Negative row values:
+# 'keysym -1 n' joystick #1, direction n
+# 'keysym -2 n' joystick #2, direction n
+# 'keysym -3 0' first RESTORE key
+# 'keysym -3 1' second RESTORE key
+# 'keysym -4 0' 40/80 column key
+# 'keysym -4 1' CAPS (ASCII/DIN) key
+#
+
+!CLEAR
+!LSHIFT 1 7
+!RSHIFT 6 4
+!VSHIFT RSHIFT
+
+0 7 1 8 /* ` -> Left Arrow */
+1 7 0 8 /* 1 -> 1 */
+2 7 3 8 /* 2 -> 2 */
+3 1 0 8 /* 3 -> 3 */
+4 1 3 8 /* 4 -> 4 */
+5 2 0 8 /* 5 -> 5 */
+6 2 3 8 /* 6 -> 6 */
+7 3 0 8 /* 7 -> 7 */
+8 3 3 8 /* 8 -> 8 */
+9 4 0 8 /* 9 -> 9 */
+10 4 3 8 /* 0 -> 0 */
+11 5 0 8 /* Plus -> Plus */
+12 5 3 8 /* \xB4 -> Minus */
+13 6 3 8 /* \ -> CLR/HOME */
+#14 -1 -1 0 /* -> (no key) */
+#15 -1 -1 0 /* KEYPAD 0 -> (no key) */
+16 7 6 8 /* Q -> Q */
+17 1 1 8 /* W -> W */
+18 1 6 8 /* E -> E */
+19 2 1 8 /* R -> R */
+20 2 6 8 /* T -> T */
+21 3 1 8 /* Y -> Y */
+22 3 6 8 /* U -> U */
+23 4 1 8 /* I -> I */
+24 4 6 8 /* O -> O */
+25 5 1 8 /* P -> P */
+26 5 6 8 /* (\xE5) [ -> @ */
+27 6 1 8 /* (\xA8) ] -> * */
+#28 -1 -1 0 /* -> (no key) */
+#29 -1 -1 0 /* KEYPAD 1 -> (no key) */
+#30 -1 -1 0 /* KEYPAD 2 -> (no key) */
+#31 -1 -1 0 /* KEYPAD 3 -> (no key) */
+32 1 2 8 /* A -> A */
+33 1 5 8 /* S -> S */
+34 2 2 8 /* D -> D */
+35 2 5 8 /* F -> F */
+36 3 2 8 /* G -> G */
+37 3 5 8 /* H -> H */
+38 4 2 8 /* J -> J */
+39 4 5 8 /* K -> K */
+40 5 2 8 /* L -> L */
+41 5 5 8 /* ; -> : */
+42 6 2 8 /* ' -> ; */
+43 6 5 8 /* \ -> = */
+#44 -1 -1 0 /* -> (no key) */
+#45 -1 -1 0 /* KEYPAD 4 -> (no key) */
+#46 -1 -1 0 /* KEYPAD 5 -> (no key) */
+#47 -1 -1 0 /* KEYPAD 6 -> (no key) */
+48 6 5 8 /* < -> = */
+49 1 4 8 /* Z -> Z */
+50 2 7 8 /* X -> X */
+51 2 4 8 /* C -> C */
+52 3 7 8 /* V -> V */
+53 3 4 8 /* B -> B */
+54 4 7 8 /* N -> N */
+55 4 4 8 /* M -> M */
+56 5 7 8 /* , -> , */
+57 5 4 8 /* . -> . */
+58 6 7 8 /* / -> / */
+#59 -1 -1 0 /* -> (no key) */
+#60 -1 -1 0 /* KEYPAD DEL -> (no key) */
+#61 -1 -1 0 /* KEYPAD 7 -> (no key) */
+#62 -1 -1 0 /* KEYPAD 8 -> (no key) */
+#63 -1 -1 0 /* KEYPAD 9 -> (no key) */
+64 7 4 8 /* Space -> Space */
+65 0 0 8 /* Backspace -> Del */
+66 7 2 8 /* TAB -> Ctrl */
+#67 -1 -1 0 /* KEYPAD ENTER -> (no key) */
+68 0 1 8 /* Return -> Return */
+69 7 7 8 /* ESC -> Run/Stop */
+70 6 0 8 /* DEL -> Pound */
+#71 -1 -1 0 /* -> (no key) */
+#72 -1 -1 0 /* -> (no key) */
+#73 -1 -1 0 /* -> (no key) */
+#74 -1 -1 0 /* KEYPAD - -> (no key) */
+#75 -1 -1 0 /* -> (no key) */
+76 0 7 1 /* Up -> CRSR UP */
+77 0 7 8 /* Down -> CRSR DOWN */
+78 0 2 8 /* Right -> CRSR RIGHT */
+79 0 2 1 /* Left -> CRSR LEFT */
+80 0 4 8 /* F1 -> F1 */
+81 0 4 1 /* F2 -> F2 */
+82 0 5 8 /* F3 -> F3 */
+83 0 5 1 /* F4 -> F4 */
+84 0 6 8 /* F5 -> F5 */
+85 0 6 1 /* F6 -> F6 */
+86 0 3 8 /* F7 -> F7 */
+87 0 3 1 /* F8 -> F8 */
+#88 -1 -1 0 /* F9 -> (no key) */
+#89 -1 -1 0 /* F10 -> (no key) */
+#90 -1 -1 0 /* NUMLOCK -> (no key) */
+#91 -1 -1 0 /* SCRLOCK -> (no key) */
+#92 -1 -1 0 /* KEYPAD SLASH -> (no key) */
+#93 -1 -1 0 /* KEYPAD * -> (no key) */
+#94 -1 -1 0 /* KEYPAD + -> (no key) */
+95 6 6 8 /* HELP -> Up Arrow */
+96 1 7 2 /* Left Shift -> Left Shift */
+97 6 4 4 /* Right Shift -> Right Shift */
+#98 -1 -1 0 /* CAPSLOCK -> (no key) */
+99 7 5 8 /* Ctrl -> CBM */
+#100 -1 -1 0 /* LEFT ALT -> (no key) */
+#101 -1 -1 0 /* RIGHT ALT -> (no key) */
+#102 -1 -1 0 /* LEFT AMIGA -> (no key) */
+#103 -1 -1 0 /* RIGHT AMIGA -> (no key) */
+
+# Restore key mappings
+89 -3 0 /* F10 -> RESTORE */
+
Deleted: branches/viceplus/v2.0-x64dtv/vice/data/C64DTV/amiga_sym.vkm
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/data/C64/amiga_sym.vkm 2008-07-19 16:25:43 UTC (rev 19055)
+++ branches/viceplus/v2.0-x64dtv/vice/data/C64DTV/amiga_sym.vkm 2008-07-20 17:59:30 UTC (rev 19059)
@@ -1,146 +0,0 @@
-# VICE keyboard mapping file
-#
-# A Keyboard map is read in as patch to the current map.
-#
-# File format:
-# - comment lines start with '#'
-# - keyword lines start with '!keyword'
-# - normal line has 'keysym/scancode row column shiftflag'
-#
-# Keywords and their lines are:
-# '!CLEAR' clear whole table
-# '!INCLUDE filename' read file as mapping file
-# '!LSHIFT row col' left shift keyboard row/column
-# '!RSHIFT row col' right shift keyboard row/column
-# '!VSHIFT shiftkey' virtual shift key (RSHIFT or LSHIFT)
-# '!UNDEF keysym' remove keysym from table
-#
-# Shiftflag can have the values:
-# 0 key is not shifted for this keysym
-# 1 key is shifted for this keysym
-# 2 left shift
-# 4 right shift
-# 8 key can be shifted or not with this keysym
-#
-# Negative row values:
-# 'keysym -1 n' joystick #1, direction n
-# 'keysym -2 n' joystick #2, direction n
-# 'keysym -3 0' first RESTORE key
-# 'keysym -3 1' second RESTORE key
-# 'keysym -4 0' 40/80 column key
-# 'keysym -4 1' CAPS (ASCII/DIN) key
-#
-
-!CLEAR
-!LSHIFT 1 7
-!RSHIFT 6 4
-!VSHIFT RSHIFT
-
-0 7 1 8 /* ` -> Left Arrow */
-1 7 0 8 /* 1 -> 1 */
-2 7 3 8 /* 2 -> 2 */
-3 1 0 8 /* 3 -> 3 */
-4 1 3 8 /* 4 -> 4 */
-5 2 0 8 /* 5 -> 5 */
-6 2 3 8 /* 6 -> 6 */
-7 3 0 8 /* 7 -> 7 */
-8 3 3 8 /* 8 -> 8 */
-9 4 0 8 /* 9 -> 9 */
-10 4 3 8 /* 0 -> 0 */
-11 5 0 8 /* Plus -> Plus */
-12 5 3 8 /* \xB4 -> Minus */
-13 6 3 8 /* \ -> CLR/HOME */
-#14 -1 -1 0 /* -> (no key) */
-#15 -1 -1 0 /* KEYPAD 0 -> (no key) */
-16 7 6 8 /* Q -> Q */
-17 1 1 8 /* W -> W */
-18 1 6 8 /* E -> E */
-19 2 1 8 /* R -> R */
-20 2 6 8 /* T -> T */
-21 3 1 8 /* Y -> Y */
-22 3 6 8 /* U -> U */
-23 4 1 8 /* I -> I */
-24 4 6 8 /* O -> O */
-25 5 1 8 /* P -> P */
-26 5 6 8 /* (\xE5) [ -> @ */
-27 6 1 8 /* (\xA8) ] -> * */
-#28 -1 -1 0 /* -> (no key) */
-#29 -1 -1 0 /* KEYPAD 1 -> (no key) */
-#30 -1 -1 0 /* KEYPAD 2 -> (no key) */
-#31 -1 -1 0 /* KEYPAD 3 -> (no key) */
-32 1 2 8 /* A -> A */
-33 1 5 8 /* S -> S */
-34 2 2 8 /* D -> D */
-35 2 5 8 /* F -> F */
-36 3 2 8 /* G -> G */
-37 3 5 8 /* H -> H */
-38 4 2 8 /* J -> J */
-39 4 5 8 /* K -> K */
-40 5 2 8 /* L -> L */
-41 5 5 8 /* ; -> : */
-42 6 2 8 /* ' -> ; */
-43 6 5 8 /* \ -> = */
-#44 -1 -1 0 /* -> (no key) */
-#45 -1 -1 0 /* KEYPAD 4 -> (no key) */
-#46 -1 -1 0 /* KEYPAD 5 -> (no key) */
-#47 -1 -1 0 /* KEYPAD 6 -> (no key) */
-48 6 5 8 /* < -> = */
-49 1 4 8 /* Z -> Z */
-50 2 7 8 /* X -> X */
-51 2 4 8 /* C -> C */
-52 3 7 8 /* V -> V */
-53 3 4 8 /* B -> B */
-54 4 7 8 /* N -> N */
-55 4 4 8 /* M -> M */
-56 5 7 8 /* , -> , */
-57 5 4 8 /* . -> . */
-58 6 7 8 /* / -> / */
-#59 -1 -1 0 /* -> (no key) */
-#60 -1 -1 0 /* KEYPAD DEL -> (no key) */
-#61 -1 -1 0 /* KEYPAD 7 -> (no key) */
-#62 -1 -1 0 /* KEYPAD 8 -> (no key) */
-#63 -1 -1 0 /* KEYPAD 9 -> (no key) */
-64 7 4 8 /* Space -> Space */
-65 0 0 8 /* Backspace -> Del */
-66 7 2 8 /* TAB -> Ctrl */
-#67 -1 -1 0 /* KEYPAD ENTER -> (no key) */
-68 0 1 8 /* Return -> Return */
-69 7 7 8 /* ESC -> Run/Stop */
-70 6 0 8 /* DEL -> Pound */
-#71 -1 -1 0 /* -> (no key) */
-#72 -1 -1 0 /* -> (no key) */
-#73 -1 -1 0 /* -> (no key) */
-#74 -1 -1 0 /* KEYPAD - -> (no key) */
-#75 -1 -1 0 /* -> (no key) */
-76 0 7 1 /* Up -> CRSR UP */
-77 0 7 8 /* Down -> CRSR DOWN */
-78 0 2 8 /* Right -> CRSR RIGHT */
-79 0 2 1 /* Left -> CRSR LEFT */
-80 0 4 8 /* F1 -> F1 */
-81 0 4 1 /* F2 -> F2 */
-82 0 5 8 /* F3 -> F3 */
-83 0 5 1 /* F4 -> F4 */
-84 0 6 8 /* F5 -> F5 */
-85 0 6 1 /* F6 -> F6 */
-86 0 3 8 /* F7 -> F7 */
-87 0 3 1 /* F8 -> F8 */
-#88 -1 -1 0 /* F9 -> (no key) */
-#89 -1 -1 0 /* F10 -> (no key) */
-#90 -1 -1 0 /* NUMLOCK -> (no key) */
-#91 -1 -1 0 /* SCRLOCK -> (no key) */
-#92 -1 -1 0 /* KEYPAD SLASH -> (no key) */
-#93 -1 -1 0 /* KEYPAD * -> (no key) */
-#94 -1 -1 0 /* KEYPAD + -> (no key) */
-95 6 6 8 /* HELP -> Up Arrow */
-96 1 7 2 /* Left Shift -> Left Shift */
-97 6 4 4 /* Right Shift -> Right Shift */
-#98 -1 -1 0 /* CAPSLOCK -> (no key) */
-99 7 5 8 /* Ctrl -> CBM */
-#100 -1 -1 0 /* LEFT ALT -> (no key) */
-#101 -1 -1 0 /* RIGHT ALT -> (no key) */
-#102 -1 -1 0 /* LEFT AMIGA -> (no key) */
-#103 -1 -1 0 /* RIGHT AMIGA -> (no key) */
-
-# Restore key mappings
-89 -3 0 /* F10 -> RESTORE */
-
Copied: branches/viceplus/v2.0-x64dtv/vice/data/C64DTV/amiga_sym.vkm (from rev 19058, branches/viceplus/v2.0-x64dtv/vice/data/C64/amiga_sym.vkm)
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/data/C64DTV/amiga_sym.vkm (rev 0)
+++ branches/viceplus/v2.0-x64dtv/vice/data/C64DTV/amiga_sym.vkm 2008-07-20 17:59:30 UTC (rev 19059)
@@ -0,0 +1,146 @@
+# VICE keyboard mapping file
+#
+# A Keyboard map is read in as patch to the current map.
+#
+# File format:
+# - comment lines start with '#'
+# - keyword lines start with '!keyword'
+# - normal line has 'keysym/scancode row column shiftflag'
+#
+# Keywords and their lines are:
+# '!CLEAR' clear whole table
+# '!INCLUDE filename' read file as mapping file
+# '!LSHIFT row col' left shift keyboard row/column
+# '!RSHIFT row col' right shift keyboard row/column
+# '!VSHIFT shiftkey' virtual shift key (RSHIFT or LSHIFT)
+# '!UNDEF keysym' remove keysym from table
+#
+# Shiftflag can have the values:
+# 0 key is not shifted for this keysym
+# 1 key is shifted for this keysym
+# 2 left shift
+# 4 right shift
+# 8 key can be shifted or not with this keysym
+#
+# Negative row values:
+# 'keysym -1 n' joystick #1, direction n
+# 'keysym -2 n' joystick #2, direction n
+# 'keysym -3 0' first RESTORE key
+# 'keysym -3 1' second RESTORE key
+# 'keysym -4 0' 40/80 column key
+# 'keysym -4 1' CAPS (ASCII/DIN) key
+#
+
+!CLEAR
+!LSHIFT 1 7
+!RSHIFT 6 4
+!VSHIFT RSHIFT
+
+0 7 1 8 /* ` -> Left Arrow */
+1 7 0 8 /* 1 -> 1 */
+2 7 3 8 /* 2 -> 2 */
+3 1 0 8 /* 3 -> 3 */
+4 1 3 8 /* 4 -> 4 */
+5 2 0 8 /* 5 -> 5 */
+6 2 3 8 /* 6 -> 6 */
+7 3 0 8 /* 7 -> 7 */
+8 3 3 8 /* 8 -> 8 */
+9 4 0 8 /* 9 -> 9 */
+10 4 3 8 /* 0 -> 0 */
+11 5 0 8 /* Plus -> Plus */
+12 5 3 8 /* \xB4 -> Minus */
+13 6 3 8 /* \ -> CLR/HOME */
+#14 -1 -1 0 /* -> (no key) */
+#15 -1 -1 0 /* KEYPAD 0 -> (no key) */
+16 7 6 8 /* Q -> Q */
+17 1 1 8 /* W -> W */
+18 1 6 8 /* E -> E */
+19 2 1 8 /* R -> R */
+20 2 6 8 /* T -> T */
+21 3 1 8 /* Y -> Y */
+22 3 6 8 /* U -> U */
+23 4 1 8 /* I -> I */
+24 4 6 8 /* O -> O */
+25 5 1 8 /* P -> P */
+26 5 6 8 /* (\xE5) [ -> @ */
+27 6 1 8 /* (\xA8) ] -> * */
+#28 -1 -1 0 /* -> (no key) */
+#29 -1 -1 0 /* KEYPAD 1 -> (no key) */
+#30 -1 -1 0 /* KEYPAD 2 -> (no key) */
+#31 -1 -1 0 /* KEYPAD 3 -> (no key) */
+32 1 2 8 /* A -> A */
+33 1 5 8 /* S -> S */
+34 2 2 8 /* D -> D */
+35 2 5 8 /* F -> F */
+36 3 2 8 /* G -> G */
+37 3 5 8 /* H -> H */
+38 4 2 8 /* J -> J */
+39 4 5 8 /* K -> K */
+40 5 2 8 /* L -> L */
+41 5 5 8 /* ; -> : */
+42 6 2 8 /* ' -> ; */
+43 6 5 8 /* \ -> = */
+#44 -1 -1 0 /* -> (no key) */
+#45 -1 -1 0 /* KEYPAD 4 -> (no key) */
+#46 -1 -1 0 /* KEYPAD 5 -> (no key) */
+#47 -1 -1 0 /* KEYPAD 6 -> (no key) */
+48 6 5 8 /* < -> = */
+49 1 4 8 /* Z -> Z */
+50 2 7 8 /* X -> X */
+51 2 4 8 /* C -> C */
+52 3 7 8 /* V -> V */
+53 3 4 8 /* B -> B */
+54 4 7 8 /* N -> N */
+55 4 4 8 /* M -> M */
+56 5 7 8 /* , -> , */
+57 5 4 8 /* . -> . */
+58 6 7 8 /* / -> / */
+#59 -1 -1 0 /* -> (no key) */
+#60 -1 -1 0 /* KEYPAD DEL -> (no key) */
+#61 -1 -1 0 /* KEYPAD 7 -> (no key) */
+#62 -1 -1 0 /* KEYPAD 8 -> (no key) */
+#63 -1 -1 0 /* KEYPAD 9 -> (no key) */
+64 7 4 8 /* Space -> Space */
+65 0 0 8 /* Backspace -> Del */
+66 7 2 8 /* TAB -> Ctrl */
+#67 -1 -1 0 /* KEYPAD ENTER -> (no key) */
+68 0 1 8 /* Return -> Return */
+69 7 7 8 /* ESC -> Run/Stop */
+70 6 0 8 /* DEL -> Pound */
+#71 -1 -1 0 /* -> (no key) */
+#72 -1 -1 0 /* -> (no key) */
+#73 -1 -1 0 /* -> (no key) */
+#74 -1 -1 0 /* KEYPAD - -> (no key) */
+#75 -1 -1 0 /* -> (no key) */
+76 0 7 1 /* Up -> CRSR UP */
+77 0 7 8 /* Down -> CRSR DOWN */
+78 0 2 8 /* Right -> CRSR RIGHT */
+79 0 2 1 /* Left -> CRSR LEFT */
+80 0 4 8 /* F1 -> F1 */
+81 0 4 1 /* F2 -> F2 */
+82 0 5 8 /* F3 -> F3 */
+83 0 5 1 /* F4 -> F4 */
+84 0 6 8 /* F5 -> F5 */
+85 0 6 1 /* F6 -> F6 */
+86 0 3 8 /* F7 -> F7 */
+87 0 3 1 /* F8 -> F8 */
+#88 -1 -1 0 /* F9 -> (no key) */
+#89 -1 -1 0 /* F10 -> (no key) */
+#90 -1 -1 0 /* NUMLOCK -> (no key) */
+#91 -1 -1 0 /* SCRLOCK -> (no key) */
+#92 -1 -1 0 /* KEYPAD SLASH -> (no key) */
+#93 -1 -1 0 /* KEYPAD * -> (no key) */
+#94 -1 -1 0 /* KEYPAD + -> (no key) */
+95 6 6 8 /* HELP -> Up Arrow */
+96 1 7 2 /* Left Shift -> Left Shift */
+97 6 4 4 /* Right Shift -> Right Shift */
+#98 -1 -1 0 /* CAPSLOCK -> (no key) */
+99 7 5 8 /* Ctrl -> CBM */
+#100 -1 -1 0 /* LEFT ALT -> (no key) */
+#101 -1 -1 0 /* RIGHT ALT -> (no key) */
+#102 -1 -1 0 /* LEFT AMIGA -> (no key) */
+#103 -1 -1 0 /* RIGHT AMIGA -> (no key) */
+
+# Restore key mappings
+89 -3 0 /* F10 -> RESTORE */
+
Deleted: branches/viceplus/v2.0-x64dtv/vice/data/C64DTV/beos_pos.vkm
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/data/C64/beos_pos.vkm 2008-07-19 16:25:43 UTC (rev 19055)
+++ branches/viceplus/v2.0-x64dtv/vice/data/C64DTV/beos_pos.vkm 2008-07-20 17:59:30 UTC (rev 19059)
@@ -1,177 +0,0 @@
-# VICE keyboard mapping file
-#
-# A Keyboard map is read in as patch to the current map.
-#
-# File format:
-# - comment lines start with '#'
-# - keyword lines start with '!keyword'
-# - normal line has 'keysym/scancode row column shiftflag'
-#
-# Keywords and their lines are:
-# '!CLEAR' clear whole table
-# '!INCLUDE filename' read file as mapping file
-# '!LSHIFT row col' left shift keyboard row/column
-# '!RSHIFT row col' right shift keyboard row/column
-# '!VSHIFT shiftkey' virtual shift key (RSHIFT or LSHIFT)
-# '!UNDEF keysym' remove keysym from table
-#
-# Shiftflag can have the values:
-# 0 key is not shifted for this keysym/scancode
-# 1 key is shifted for this keysym/scancode
-# 2 left shift
-# 4 right shift
-# 8 key can be shifted or not with this keysym/scancode
-# 16 deshift key for this keysym/scancode
-# 32 another definition for this keysym/scancode follows
-#
-# Negative row values:
-# 'keysym -1 n' joystick #1, direction n
-# 'keysym -2 n' joystick #2, direction n
-# 'keysym -3 0' first RESTORE key
-# 'keysym -3 1' second RESTORE key
-# 'keysym -4 0' 40/80 column key
-# 'keysym -4 1' CAPS (ASCII/DIN) key
-#
-
-!CLEAR
-!LSHIFT 1 7
-!RSHIFT 6 4
-!VSHIFT RSHIFT
-
-#0 -1 -1 0 /* (no key) */
-1 7 7 8 /* ESC -> Run/Stop */
-2 0 4 8 /* F1 -> F1 */
-3 0 4 1 /* F2 -> F2 */
-4 0 5 8 /* F3 -> F3 */
-5 0 5 1 /* F4 -> F4 */
-6 0 6 8 /* F5 -> F5 */
-7 0 6 1 /* F6 -> F6 */
-8 0 3 8 /* F7 -> F7 */
-9 0 3 1 /* F8 -> F8 */
-#10 -1 -1 0 /* F9 -> (no key) */
-#11 -1 -1 0 /* F10 -> (no key) */
-#12 -1 -1 0 /* F11 -> (no key) */
-#13 -1 -1 0 /* F12 -> (no key) */
-#14 -1 -1 0 /* PrtScr -> (no key) */
-#15 -1 -1 0 /* Scroll Lock -> (no key) */
-#16 -1 -1 0 /* 16 -> (no key) */
-17 7 1 8 /* ` -> Left Arrow */
-18 7 0 8 /* 1 -> 1 */
-19 7 3 8 /* 2 -> 2 */
-20 1 0 8 /* 3 -> 3 */
-21 1 3 8 /* 4 -> 4 */
-22 2 0 8 /* 5 -> 5 */
-23 2 3 8 /* 6 -> 6 */
-24 3 0 8 /* 7 -> 7 */
-25 3 3 8 /* 8 -> 8 */
-26 4 0 8 /* 9 -> 9 */
-27 4 3 8 /* 0 -> 0 */
-28 5 0 8 /* Minus -> Plus */
-29 5 3 8 /* Equal -> Minus */
-30 0 0 8 /* Backspace -> Del */
-31 6 0 8 /* Ins -> Pound */
-32 6 3 8 /* Home -> CLR/HOME */
-#33 -1 -1 0 /* PgUp -> (no key) */
-#34 -1 -1 0 /* Num Lock -> (no key) */
-#35 -1 -1 0 /* Numpad / -> (no key) */
-36 6 1 8 /* Grey * -> * */
-#37 -1 -1 0 /* Numpad - -> (no key) */
-38 7 2 8 /* TAB -> Ctrl */
-39 7 6 8 /* Q -> Q */
-40 1 1 8 /* W -> W */
-41 1 6 8 /* E -> E */
-42 2 1 8 /* R -> R */
-43 2 6 8 /* T -> T */
-44 3 1 8 /* Y -> Y */
-45 3 6 8 /* U -> U */
-46 4 1 8 /* I -> I */
-47 4 6 8 /* O -> O */
-48 5 1 8 /* p -> P */
-49 5 6 8 /* [ -> @ */
-50 6 1 8 /* ] -> * */
-51 6 5 8 /* \ -> = */
-52 6 6 8 /* Del -> Up Arrow */
-#53 -1 -1 0 /* End -> (no key) */
-#54 -1 -1 0 /* PgDown -> (no key) */
-#55 -1 -1 0 /* Numpad 7 -> (no key) */
-#56 -1 -1 0 /* Numpad 8 -> (no key) */
-#57 -1 -1 0 /* Numpad 9 -> (no key) */
-#58 -1 -1 0 /* Numpad + -> (no key) */
-59 7 7 8 /* Caps Lock -> Run/Stop */
-60 1 2 8 /* A -> A */
-61 1 5 8 /* S -> S */
-62 2 2 8 /* D -> D */
-63 2 5 8 /* F -> F */
-64 3 2 8 /* G -> G */
-65 3 5 8 /* H -> H */
-66 4 2 8 /* J -> J */
-67 4 5 8 /* K -> K */
-68 5 2 8 /* L -> L */
-69 5 5 8 /* ; -> : */
-70 6 2 8 /* ' -> ; */
-71 0 1 8 /* Return -> Return */
-#72 -1 -1 0 /* Numpad 4 -> (no key) */
-#73 -1 -1 0 /* Numpad 5 -> (no key) */
-#74 -1 -1 0 /* Numpad 6 -> (no key) */
-75 1 7 2 /* Left Shift -> Left Shift */
-76 1 4 8 /* Z -> Z */
-77 2 7 8 /* X -> X */
-78 2 4 8 /* C -> C */
-79 3 7 8 /* V -> V */
-80 3 4 8 /* B -> B */
-81 4 7 8 /* N -> N */
-82 4 4 8 /* M -> M */
-83 5 7 8 /* , -> , */
-84 5 4 8 /* . -> . */
-85 6 7 8 /* / -> / */
-86 6 4 4 /* Right Shift -> Right Shift */
-87 0 7 1 /* Up -> CRSR UP */
-#88 -1 -1 0 /* Numpad 1 -> (no key) */
-#89 -1 -1 0 /* Numpad 2 -> (no key) */
-#90 -1 -1 0 /* Numpad 3 -> (no key) */
-#91 -1 -1 0 /* Numpad Enter -> (no key) */
-92 7 5 8 /* Left Ctrl -> CBM */
-#93 -1 -1 0 /* Left Alt -> (no key) */
-94 7 4 8 /* Space -> Space */
-#95 -1 -1 0 /* Right Alt -> (no key) */
-#96 -1 -1 0 /* Right Ctrl -> (no key) */
-97 0 2 1 /* Left -> CRSR LEFT */
-98 0 7 8 /* Down -> CRSR DOWN */
-99 0 2 8 /* Right -> CRSR RIGHT */
-#100 -1 -1 0 /* Numpad 0 -> (no key) */
-#101 -1 -1 0 /* Numpad . -> (no key) */
-#102 -1 -1 0 /* Left Win95 -> (no key) */
-#103 -1 -1 0 /* Right Win95 -> (no key) */
-#104 -1 -1 0 /* SysReq -> (no key) */
-
-#
-# Joystick 1
-#
-#KP_0 -1 0
-#KP_1 -1 1
-#KP_2 -1 2
-#KP_3 -1 3
-#KP_4 -1 4
-#KP_5 -1 5
-#KP_6 -1 6
-#KP_7 -1 7
-#KP_8 -1 8
-#KP_9 -1 9
-
-#
-# Joystick 2
-#
-#w -2 7
-#e -2 8
-#r -2 9
-#s -2 4
-#d -2 5
-#f -2 6
-#x -2 1
-#c -2 2
-#v -2 3
-#space -2 0
-
-# Restore key mappings
-33 -3 0 /* PgUp -> RESTORE */
-
Copied: branches/viceplus/v2.0-x64dtv/vice/data/C64DTV/beos_pos.vkm (from rev 19058, branches/viceplus/v2.0-x64dtv/vice/data/C64/beos_pos.vkm)
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/data/C64DTV/b...
[truncated message content] |
|
From: <cnv...@us...> - 2008-07-20 16:45:30
|
Revision: 19058
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=19058&view=rev
Author: cnvogelg
Date: 2008-07-20 16:45:37 +0000 (Sun, 20 Jul 2008)
Log Message:
-----------
mac: fix to compile a 10.3/10.4 binary with the correct X11 headers/libs on 10.5 OSX
Modified Paths:
--------------
branches/chris/cocoa-port/vice/build/macosx/build-gtk.sh
branches/chris/cocoa-port/vice/build/macosx/build-inc.sh
branches/chris/cocoa-port/vice/build/macosx/build-vice-dist.sh
branches/chris/cocoa-port/vice/src/arch/unix/x11/gnome/x11ui.c
Modified: branches/chris/cocoa-port/vice/build/macosx/build-gtk.sh
===================================================================
--- branches/chris/cocoa-port/vice/build/macosx/build-gtk.sh 2008-07-20 13:22:16 UTC (rev 19057)
+++ branches/chris/cocoa-port/vice/build/macosx/build-gtk.sh 2008-07-20 16:45:37 UTC (rev 19058)
@@ -20,6 +20,7 @@
make_dirs bin lib include man share
# setup compiler environment
+USE_X11=1
set_compiler_env
echo "===== gtk+ build for $ARCH ====="
@@ -61,6 +62,7 @@
# glib
configure_make_install glib-2.14.5.tar.bz2 glib-2.14.5 lib/libglib-2.0.dylib install \
"http://www.gtk.org/"
+
# cairo
configure_make_install cairo-1.4.14.tar.gz cairo-1.4.14 lib/libcairo.dylib install \
"http://cairographics.org/"
Modified: branches/chris/cocoa-port/vice/build/macosx/build-inc.sh
===================================================================
--- branches/chris/cocoa-port/vice/build/macosx/build-inc.sh 2008-07-20 13:22:16 UTC (rev 19057)
+++ branches/chris/cocoa-port/vice/build/macosx/build-inc.sh 2008-07-20 16:45:37 UTC (rev 19058)
@@ -177,6 +177,11 @@
# EXTRA_OPT="--host=$ARCH-apple-darwin`uname -r`"
#fi
+ # use X11 from SDK
+ if [ "$USE_X11" = "1" ]; then
+ EXTRA_OPT="--x-includes=$SDK/usr/X11R6/include --x-libraries=$SDK/usr/X11R6/lib"
+ fi
+
export COMPILE_TAG="-arch $ARCH -isysroot $SDK -mmacosx-version-min=$SDK_VERSION"
export CC="gcc $COMPILE_TAG"
export CXX="g++ $COMPILE_TAG"
Modified: branches/chris/cocoa-port/vice/build/macosx/build-vice-dist.sh
===================================================================
--- branches/chris/cocoa-port/vice/build/macosx/build-vice-dist.sh 2008-07-20 13:22:16 UTC (rev 19057)
+++ branches/chris/cocoa-port/vice/build/macosx/build-vice-dist.sh 2008-07-20 16:45:37 UTC (rev 19058)
@@ -217,7 +217,8 @@
CC="gcc -arch $BUILD_ARCH -isysroot $BUILD_SDK -mmacosx-version-min=$BUILD_SDK_VERSION" \
CXX="g++ -arch $BUILD_ARCH -isysroot $BUILD_SDK -mmacosx-version-min=$BUILD_SDK_VERSION" \
LD="gcc -arch $BUILD_ARCH -isysroot $BUILD_SDK -mmacosx-version-min=$BUILD_SDK_VERSION" \
- $VICE_SRC/configure --host=$BUILD_ARCH2-apple-darwin $CONFIGURE_FLAGS
+ $VICE_SRC/configure --host=$BUILD_ARCH2-apple-darwin $CONFIGURE_FLAGS \
+ --x-includes=$BUILD_SDK/usr/X11R6/include --x-libraries=$BUILD_SDK/usr/X11R6/lib
set +x
make
popd
Modified: branches/chris/cocoa-port/vice/src/arch/unix/x11/gnome/x11ui.c
===================================================================
--- branches/chris/cocoa-port/vice/src/arch/unix/x11/gnome/x11ui.c 2008-07-20 13:22:16 UTC (rev 19057)
+++ branches/chris/cocoa-port/vice/src/arch/unix/x11/gnome/x11ui.c 2008-07-20 16:45:37 UTC (rev 19058)
@@ -2736,12 +2736,22 @@
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
- glEnable (GL_TEXTURE_RECTANGLE_ARB);
- glBindTexture (GL_TEXTURE_RECTANGLE_ARB, canvas->screen_texture);
+#ifdef GL_TEXTURE_RECTANGLE_NV
+#define GL_TEX_RECT GL_TEXTURE_RECTANGLE_NV
+#else
+#ifdef GL_TEXTURE_RECTANGLE_ARB
+#define GL_TEX_RECT GL_TEXTURE_RECTANGLE_ARB
+#else
+#error GL_TEXTURE_RECTANGLE not supported in your OpenGL headers
+#endif
+#endif
- glTexParameteri (GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
- glTexParameteri (GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
- glTexImage2D (GL_TEXTURE_RECTANGLE_ARB, 0, GL_RGB,
+ glEnable (GL_TEX_RECT);
+ glBindTexture (GL_TEX_RECT, canvas->screen_texture);
+
+ glTexParameteri (GL_TEX_RECT, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+ glTexParameteri (GL_TEX_RECT, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+ glTexImage2D (GL_TEX_RECT, 0, GL_RGB,
canvas->gdk_image_size.width, canvas->gdk_image_size.height,
0, GL_RGB, GL_UNSIGNED_BYTE, canvas->gdk_image);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pot...@us...> - 2008-07-20 13:23:13
|
Revision: 19057
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=19057&view=rev
Author: pottendo
Date: 2008-07-20 13:22:16 +0000 (Sun, 20 Jul 2008)
Log Message:
-----------
created pottendos work branch for 2.0
Added Paths:
-----------
branches/pottendo/v2.0-work/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bla...@us...> - 2008-07-19 19:10:04
|
Revision: 19056
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=19056&view=rev
Author: blackystardust
Date: 2008-07-19 19:07:06 +0000 (Sat, 19 Jul 2008)
Log Message:
-----------
Set the palmode default to fast pal, this change will be available as a patch for gnomeui users for the release of VICE 2.0
Modified Paths:
--------------
trunk/vice/src/video/video-resources-pal.c
Modified: trunk/vice/src/video/video-resources-pal.c
===================================================================
--- trunk/vice/src/video/video-resources-pal.c 2008-07-19 16:25:43 UTC (rev 19055)
+++ trunk/vice/src/video/video-resources-pal.c 2008-07-19 19:07:06 UTC (rev 19056)
@@ -180,7 +180,7 @@
&video_resources.pal_scanlineshade, set_pal_scanlineshade, NULL },
{ "PALBlur", 500, RES_EVENT_NO, NULL,
&video_resources.pal_blur, set_pal_blur, NULL },
- { "PALMode", VIDEO_RESOURCE_PAL_MODE_TRUE, RES_EVENT_NO, NULL,
+ { "PALMode", VIDEO_RESOURCE_PAL_MODE_FAST, RES_EVENT_NO, NULL,
&video_resources.pal_mode, set_pal_mode, NULL },
{ "PALOddLinePhase", 1250, RES_EVENT_NO, NULL,
&video_resources.pal_oddlines_phase, set_pal_oddlinesphase, NULL },
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <no...@us...> - 2008-07-19 16:26:32
|
Revision: 19055
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=19055&view=rev
Author: nojoopa
Date: 2008-07-19 16:25:43 +0000 (Sat, 19 Jul 2008)
Log Message:
-----------
new branch for x64dtv merge
Added Paths:
-----------
branches/viceplus/v2.0-x64dtv/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <st...@us...> - 2008-07-19 07:39:35
|
Revision: 19054
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=19054&view=rev
Author: strik
Date: 2008-07-19 07:39:44 +0000 (Sat, 19 Jul 2008)
Log Message:
-----------
Retired old-style ChangeLog files, will be replaced by svn2cl generated file.
Added Paths:
-----------
trunk/vice/ChangeLog.1
trunk/vice/po/ChangeLog
trunk/vice/po/ChangeLog.1
trunk/vice/src/ChangeLog
trunk/vice/src/ChangeLog.6
Removed Paths:
-------------
trunk/vice/ChangeLog
trunk/vice/po/ChangeLog
trunk/vice/src/ChangeLog
Deleted: trunk/vice/ChangeLog
===================================================================
--- trunk/vice/ChangeLog 2008-07-19 00:11:56 UTC (rev 19053)
+++ trunk/vice/ChangeLog 2008-07-19 07:39:44 UTC (rev 19054)
@@ -1,6712 +0,0 @@
-2008-07-18 Spiro Trikaliotis <spi...@gm...>
-
- * Version 2.0
-
-2008-07-18 Christian Vogelgsang <ch...@vo...>
-
- * build/macosx/build-vice-release.sh: use provided autogen.sh
-
- * doc/ReadmeMacOSX.txt: updated mac docs
-
- * doc/html/macosx.html: Prepared for release of 2.0
-
-2008-07-17 Spiro Trikaliotis <spi...@gm...>
-
- * doc/vice.texi, doc/html/plain/NEWS, doc/html/index.html,
- doc/Win32-Cygwin-HOWTO.txt: Prepared for upcoming 2.0 release.
-
-2008-07-16 Spiro Trikaliotis <spi...@gm...>
-
- * Version 1.22.27
-
-2008-07-15 Marco van den Heuvel <bla...@ya...>
-
- * Makefile.am: Reverted the skyos make bindist(zip) part back to
- what is used to be.
-
-2008-07-14 Marco van den Heuvel <bla...@ya...>
-
- * README: Updated for the 2.0 release.
-
-2008-07-13 Spiro Trikaliotis <spi...@gm...>
-
- * Version 1.22.26
-
-2008-07-12 Marco van den Heuvel <bla...@ya...>
-
- * build/riscos/build-cross.sh: Added a missing 'cd ..'.
-
- * configure.in: Corrected a typo.
-
- * doc/Readme.beos: Updated.
-
- * vice-mint.spec, vice.spec: Release version updated to 2.0.
-
-2008-07-10 Spiro Trikaliotis <spi...@gm...>
-
- * Version 1.22.25
-
-2008-07-07 Spiro Trikaliotis <spi...@gm...>
-
- * Version 1.22.24
-
-2008-07-07 Marco van den Heuvel <bla...@ya...>
-
- * doc/html/plain/NEWS: Updated.
-
-2008-07-04 Spiro Trikaliotis <spi...@gm...>
-
- * Version 1.22.23
-
-2008-07-04 Spiro Trikaliotis <spi...@gm...>
-
- * Makefile.am: Make sure the file Doxyfile is included in the
- distribution.
-
- * doc/html/Makefile.am: Make sure the files hpux.html and
- sco.html are included in the distribution.
-
-2008-07-01 Marco van den Heuvel <bla...@ya...>
-
- * doc/GP2X-Howto.txt, doc/Makefile.am: Added a GP2X compile
- howto text file.
-
-2008-07-02 Andreas Matthies <and...@gm...>
-
- * doc/html/plain/BUGS, NEWS: Updated.
-
-2008-07-01 Spiro Trikaliotis <spi...@gm...>
-
- * Version 1.22.22
-
-2008-06-30 Marco van den Heuvel <bla...@ya...>
-
- * doc/html/plain/NEWS: Added mint and sol11 ports and corrected
- a typo.
-
- * doc/html/solaris.html: Added sol11 port.
-
-2008-06-29 Spiro Trikaliotis <spi...@gm...>
-
- * Version 1.22.21
-
-2008-06-28 Spiro Trikaliotis <spi...@gm...>
-
- * data/CBM-II/win_shortcuts.vsc, data/VIC20/win_shortcuts.vsc,
- data/PLUS4/win_shortcuts.vsc, data/PET/win_shortcuts.vsc,
- data/C64/win_shortcuts.vsc, data/C128/win_shortcuts.vsc: Set
- default shortcuts Ctrl+C and Ctrl+V for Edit/Copy and Edit/Paste
-
- * doc/html/plain/NEWS: Updated
-
-2008-06-23 Spiro Trikaliotis <spi...@gm...>
-
- * Version 1.22.20
-
-2008-06-23 Spiro Trikaliotis <spi...@gm...>
-
- * vice-mint.spec: Added (was forgotten in the previous version)
-
-2008-06-22 Marco van den Heuvel <bla...@ya...>
-
- * Makefile.am: Improved some of the make-bindist.sh scripts.
-
-2008-06-19 Marco van den Heuvel <bla...@ya...>
-
- * vice-mint.spec, Makefile.am: Added Atari Mint specific rpm
-
-2008-06-19 Marco van den Heuvel <bla...@ya...>
-
- * vice-mint.spec, Makefile.am: Added Atari Mint specific rpm
- spec file.
-
- * AUTHORS, README: Added Fabrizio to the VICE core members.
-
- * config.guess, config.sub: Added preliminary support for
- avr32-linux.
-
- * doc/vice.texi: Added Fabrizio to the VICE core members, got
- rid of a duplicate Christian Vogelgsang entry and added/updated
- external contributors entries.
-
- * doc/html/plain/NEWS, doc/html/index.html: Updated for the
- VICE 2.0 release.
-
-2008-06-22 Spiro Trikaliotis <spi...@gm...>
-
- * Version 1.22.19
-
-2008-06-17 Spiro Trikaliotis <spi...@gm...>
-
- * Doxyfile: new file to allow to auto-generate doxygen
- documentation.
-
-2008-06-15 Spiro Trikaliotis <spi...@gm...>
-
- * Version 1.22.18
-
-2008-06-08 Marco van den Heuvel <bla...@ya...>
-
- * configure.in: Added a check for the minix version for the
- prototypes of recv and send in network.c.
-
- * doc/html/solaris.html, doc/html/amigaos.html,
- doc/html/sco.html, doc/html/hpux.html, doc/html/beos.html,
- doc/html/qnx.html, doc/html/Makefile.am, doc/html/index.html:
- Updated for the upcoming 2.0 release.
-
-2008-06-03 Spiro Trikaliotis <spi...@gm...>
-
- * Version 1.22.17.
-
- * configure.in: Test for libnet 1.1 and set VICE_USE_LIBNET_1_1
- if it exists. This adds support for libnet 1.1 for TFE/RR-net
- emulation.
-
-2008-06-03 Spiro Trikaliotis <spi...@gm...>
-
- * configure.in: Changed bash'ism (if [...]) to more general code
- (if test ...).
-
-2008-06-01 Marco van den Heuvel <bla...@ya...>
-
- * configure.in: Added extra defines needed for minix, alligned
- the printout of configure and added the --enable-memmap
- configure option for the memmap feature from VICEplus as
- provided by Hannu Nuotio <han...@tu...>.
-
- * build/qnx4/build.sh: Fixed the qnx 4.x build script.
-
-2008-05-25 Spiro Trikaliotis <spi...@gm...>
-
- * Version 1.22.16.
-
-2008-05-25 Christian Vogelgsang <ch...@vo...>
-
- * configure.in: honor OBJCFLAGS if available. added Carbon lib
- for Cocoa linking.
-
- * build/Makefile.am, build/macosx/build-vice-release.sh: added
- build-vice-release script
-
- * Makefile.am: make bindist on Macs need the bash
-
- * data/C64/Makefile.am, data/C64/osx_sym_de.vkm,
- data/C64/osx_pos.vkm, data/C64/osx_sym_us.vkm: fixed Cocoa key
- maps
-
-2008-05-24 Marco van den Heuvel <bla...@ya...>
-
- * Makefile.am: Added a '@' in front of the 'make install' echo.
-
-2008-05-19 Spiro Trikaliotis <spi...@gm...>
-
- * autogen.sh: Removed "bash-ism" from script (compare with "=="
- instead of "=").
-
-2008-05-19 Spiro Trikaliotis <spi...@gm...>
-
- * depcomp, missing, aclocal.m4, po/stamp-cat-id, po/vice.pot,
- po/fr.gmo, po/nl.gmo, po/pl.gmo, po/hu.gmo, po/it.gmo,
- po/de.gmo, po/sv.gmo: Removed some more auto-generated or
- unnecessary files.
-
-2008-05-18 Spiro Trikaliotis <spi...@gm...>
-
- * Version 1.22.15.
-
-2008-05-16 Marco van den Heuvel <bla...@ya...>
-
- * doc/html/Makefile.am, doc/Makefile.am: Changed the way the
- docdir is dealt with, old way made some autotools versions end
- up with an error.
-
-2008-05-13 Spiro Trikaliotis <spi...@gm...>
-
- * autogen.sh: generates (almost) all files which can be
- auto-generated. Exceptions: Files which are needed for platforms
- which cannot built them themselves, or which are deliberately
- changed from the auto-generated forms. These files are:
- config.guess, config.sub (deliberately changed), and
- src/monitor/mon_parse.c, src/monitor/mon_parse.h,
- src/monitor/mon_lex.c (their absense would break compilation for
- some platforms).
-
- * src/config.h.in, doc/texinfo.tex, po/cat-id-tbl.c,
- */Makefile.in: removed files which can be auto-generated.
-
-2008-05-07 Spiro Trikaliotis <spi...@gm...>
-
- * Version 1.22.14.
-
-2008-05-01 Marco van den Heuvel <bla...@ya...>
-
- * configure.in, data/fonts/vice-cbm.bdf,
- data/fonts/Makefile.am: Added a check for the 'fc-cache'
- command, and use the .bdf font if not present.
-
- * doc/html/Makefile.am, doc/Makefile.am: Fixed the
- ALTERNATE_DOCDIR problems with automake.
-
-2008-04-27 Spiro Trikaliotis <spi...@gm...>
-
- * Version 1.22.13.
-
- * build/mingw32/build-cross.sh: Fix so the compiler is added to
- the path even if it is already installed on the system.
-
-2008-04-20 Christian Vogelgsang <ch...@vo...>
-
- * build/macosx/build-inc.sh, build/macosx/build-ffmpeglame.sh:
- updated Mac OS X build scripts.
-
-2008-04-26 Spiro Trikaliotis <spi...@gm...>
-
- * Version 1.22.12.
-
-2008-04-20 Spiro Trikaliotis <spi...@gm...>
-
- * Version 1.22.11.
-
-2008-04-20 Spiro Trikaliotis <spi...@gm...>
-
- * doc/vice.texi: Updates manual to reflect latest monitor
- changes.
-
-2008-04-09 Spiro Trikaliotis <spi...@gm...>
-
- * Version 1.22.10.
-
-2008-04-08 Andreas Matthies <and...@gm...>
-
- * data/<machine>/Makefile.am: Added new file
- win_shortcuts.vsc.
-
-2008-03-24 Andreas Boose <vic...@t-...>
-
- * Version 1.22.9.
-
-2008-02-26 Marco van den Heuvel <bla...@ya...>
-
- * build/vms/build.sh, doc/OpenVMS-Howto.txt: Updated to
- include the building for vax, alpha and ia64 vms.
-
-2008-02-11 Marco van den Heuvel <bla...@ya...>
-
- * build/Makefile.am, build/vms/build.sh, doc/Makefile.am,
- doc/OpenVMS-Howto.txt: Added preliminary OpenVMS support.
-
-2008-02-11 Andreas Matthies <and...@gm...>
-
- * data/c64/Makefile.am, win_shortcuts.vsc: Added new file.
-
-2008-02-10 Christian Vogelgsang <ch...@vo...>
-
- * configure.in: fix to make gtkglext query handle missing lib
-
-2008-02-10 Christian Vogelgsang <ch...@vo...>
-
- * build/macosx/build-*: updated to recent library versions
-
-2008-02-08 Marco van den Heuvel <bla...@ya...>
-
- * configure.in: Added initial nextstep/openstep support.
-
-2008-02-04 Marco van den Heuvel <bla...@ya...>
-
- * Makefile.am, configure.in: Added support for SkyOS.
-
-2008-02-02 pottendo <pot...@ut...>
-
- * data/fonts/Makefile.am (install): Create directory ~/.fonts
- if not existing before installing.
-
-2008-01-31 Fabrizio Gennari <fab...@ti...>
-
- * configure.in: Do not fail if gtkglext is not present.
-
-2008-01-31 pottendo <pot...@ut...>
-
- * data/fonts/Makefile.am (install): Install CBM font in
- ${HOME}/.fonts and run `fc-cache'.
-
-2008-01-27 Andreas Boose <vic...@t-...>
-
- * Version 1.22.8.
-
-2008-01-25 Marco van den Heuvel <bla...@ya...>
-
- * Makefile.am, build/Makefile.am, build/qnx4/build.sh,
- configure.in: Added qnx4 support.
-
-2008-01-23 Marco van den Heuvel <bla...@ya...>
-
- * Makefile.am, configure.in: Finalized the hpux support.
-
-2008-01-20 Marco van den Heuvel <bla...@ya...>
-
- * Makefile.am, configure.in: Added preliminary hpux support.
-
-2008-01-18 Marco van den Heuvel <bla...@ya...>
-
- * Makefile.am: Fixed the man and info directories for the
- solaris, openserver and unixware binary distributions.
-
- * configure.in: Fixed the detection of libXv and its header.
-
-2008-01-12 Marco van den Heuvel <bla...@ya...>
-
- * acinclude.m4: Added the pkg.m4 code.
-
-2008-01-02 pottendo <pot...@ut...>
-
- * doc/html/plain/NEWS: Updated.
-
- * configure.in (HAVE_FULLSCREEN): New global macro to compile
- conditional fullscreen support.
-
- * doc/html/plain/BUGS: Updated.
- * doc/openGLsync-howto.txt: Updated.
-
-2008-01-02 Marco van den Heuvel <bla...@ya...>
-
- * doc/html/plain/cbm_basic_tokens.txt: Updated with WSF and
- game basic tokens.
-
-2008-01-01 Marco van den Heuvel <bla...@ya...>
-
- * README, doc/Readme.dos, doc/vice.texi: Updated '2007' to
- '2008'.
-
-2007-12-30 Andreas Boose <vic...@t-...>
-
- * Version 1.22.7.
-
-2007-12-28 Marco van den Heuvel <bla...@ya...>
-
- * petcat.c: Added support for WS basic final.
-
-2007-12-28 pottendo <pot...@ut...>
-
- * configure.in: If openGL_sync is found also set
- `USE_XF86_EXTENSIONS' as some X11 specifics are needed for
- openGL.
- (USE_XF86_EXTENSIONS): Removed DGA1, DGA2 checks.
-
-2007-12-18 Marco van den Heuvel <bla...@ya...>
-
- * configure.in: Added aros64 support and disabled netplay for
- ppc-aros.
-
-2007-12-09 Andreas Boose <vic...@t-...>
-
- * Version 1.22.6.
-
-2007-11-22 Marco van den Heuvel <bla...@ya...>
-
- * configure.in: Fixed an -lICE check issue.
-
-2007-11-08 Marco van den Heuvel <bla...@ya...>
-
- * configure.in: Changed the M68K AmigaOS3 compile to use 68020
- optimized code.
-
-2007-11-04 Andreas Boose <vic...@t-...>
-
- * Version 1.22.5.
-
-2007-10-30 Christian Vogelgsang <ch...@vo...>
-
- * build/macosx/build-vice-dist.sh: adapted to new Mac OS X
- 10.5
-
-2007-10-21 Andreas Boose <vic...@t-...>
-
- * Version 1.22.4.
-
- * doc/Makefile.am: Added `Win32-Cygwin-HOWTO.txt' file
- contributed by Chris Pressey.
-
-2007-10-15 Marco van den Heuvel <bla...@ya...>
-
- * configure.in: Changed the 'SYNC' keyword to 'VICE_SYNC' to
- make the source compile ok on gentoo.
-
-2007-09-16 Andreas Boose <vic...@t-...>
-
- * Version 1.22.3.
-
-2007-09-06 Marco van den Heuvel <bla...@ya...>
-
- * README: Updated.
-
-2007-09-02 Andreas Boose <vic...@t-...>
-
- * Version 1.22.2.
-
-2007-08-19 Andreas Boose <vic...@t-...>
-
- * Version 1.22.1.
-
- * configure.in: Define `UNSTABLE'.
-
-2007-08-17 Marco van den Heuvel <bla...@ya...>
-
- * Makefile.am, config.guess, configure.in: Added SCO
- Openserver and Unixware support.
-
-2007-08-05 Andreas Boose <vic...@t-...>
-
- * Version 1.22.
-
- * configure.in: Do not define `UNSTABLE'.
-
- * README, vice.spec, doc/html/plain/BUGS, doc/vice.texi:
- Updated.
-
-2007-08-05 Christian Vogelgsang <ch...@vo...>
-
- * doc/html/index.html: removed obsolete Mac patch
-
-2007-08-04 Andreas Boose <vic...@t-...>
-
- * Version 1.21.13.
-
- * doc/html/plain/NEWS: Updated.
-
-2007-08-02 Andreas Matthies <and...@gm...>
-
- * doc/html/index.html, doc/html/plain/NEWS: Some additions.
-
-2007-07-29 Christian Vogelgsang <ch...@vo...>
-
- * doc/html/macosx.html: updated for 1.22 release
-
-2007-07-27 Christian Vogelgsang <ch...@vo...>
-
- * build/macosx/build-vice-dist.sh: fixed lib refs in ppc and
- non-ub compilation
-
-2007-07-16 Andreas Boose <vic...@t-...>
-
- * Version 1.21.12.
-
-2007-07-15 Marco van den Heuvel <bla...@ya...>
-
- * build/amigaos/build-vbcc.sh: Fixed.
-
- * configure.in, config.sub: Added gcc warpos compile support.
-
-2007-07-11 Marco van den Heuvel <bla...@ya...>
-
- * doc/html/amigaos.html, doc/html/beos.html,
- doc/html/index.html, doc/html/plain/NEWS,
- doc/html/solaris.html, doc/vice.texi: Updated for the 1.22
- release.
-
-2007-07-10 Marco van den Heuvel <bla...@ya...>
-
- * configure.in: Fixed some library and function detection
- issues.
-
-2007-07-01 Andreas Boose <vic...@t-...>
-
- * Version 1.21.11.
-
-2007-06-28 Marco van den Heuvel <bla...@ya...>
-
- * configure.in: Added an extra check for the type/version of
- the win32 prefered resource compile (wrc).
-
-2007-06-17 Christian Vogelgsang <ch...@vo...>
-
- * configure.in: added new cocoa directories
-
-2007-06-10 Andreas Boose <vic...@t-...>
-
- * Version 1.21.10.
-
-2007-05-22 Marco van den Heuvel <bla...@ya...>
-
- * configure.in: Added netplay support to Amiga OS3 and AROS
- ports.
-
-2007-05-20 Andreas Boose <vic...@t-...>
-
- * Version 1.21.9.
-
-2007-05-05 Andreas Boose <vic...@t-...>
-
- * Version 1.21.8.
-
-2007-04-29 Andreas Boose <vic...@t-...>
-
- * Version 1.21.7.
-
- * data/C128/x11_sym.vkm, data/C128/x11_pos.vkm,
- data/C128/win_pos.vkm, data/C128/win_sym.vkm,
- data/C128/osx_pos.vkm, data/C128/osx_sym.vkm,
- data/C128/dos_pos.vkm, data/C128/dos_sym.vkm,
- data/C128/beos_pos.vkm, data/C128/beos_sym.vkm,
- data/C128/amiga_pos.vkm, data/C128/amiga_sym.vkm: Use C64
- cursor keys in C64 mode (alternative keyboard mapping).
-
-2007-04-29 Andreas Boose <vic...@t-...>
-
- * Version 1.21.6.
-
-2007-04-25 Christian Vogelgsang <ch...@vo...>
-
- * Makefile.am: pass the UI type for the mac port to the
- bindist script
-
- * configure.in: added --with-cocoa switch and more Cocoa
- specific code
-
- * data/C128/Makefile.am, data/C128/osx_pos.vkm,
- data/C128/osx_sym.vkm, data/C64/Makefile.am,
- data/C64/osx_pos.vkm, data/C64/osx_sym.vkm:
- added Max OS X native keymaps
-
- * doc/Makefile.am: changed info line since old version breaks
- my local make dist
-
-2007-04-25 Marco van den Heuvel <bla...@ya...>
-
- * configure.in: Fixed a problem with SYNC and netbsd joystick
- support.
-
-2007-04-22 Andreas Boose <vic...@t-...>
-
- * Version 1.21.5.
-
-2007-04-09 Andreas Boose <vic...@t-...>
-
- * Version 1.21.4.
-
-2007-04-02 Marco van den Heuvel <bla...@ya...>
-
- * build/amigaos/build-vbcc.sh: Started the c128 2mhz mode
- support.
-
-2007-04-01 Andreas Boose <vic...@t-...>
-
- * Version 1.21.3.
-
-2007-03-23 Christian Vogelgsang <ch...@vo...>
-
- * configure.in: added --disable-bundle switch and
- MACOSX_BUNDLE define to disable application bundle creation on
- Macs.
-
-2007-03-22 Christian Vogelgsang <ch...@vo...>
-
- * build/Makefile.am, build/macosx/build-ffmpeglame.h: added
- builder script for FFMPEG and Lame.
-
- * build/macosx/build-vice-dist.sh: new presets
-
- * arch/unix/macosx/x11-launcher.sh: fixed typo in EMU selector
-
-2007-03-22 Christian Vogelgsang <ch...@vo...>
-
- * configure.in, src/Makefile.am: introduced xxx_LIBS per
- module and emu_extlibs. link executables against minimal set
- of required libs.
-
-2007-03-22 Marco van den Heuvel <bla...@ya...>
-
- * configure.in: Added sys/joystick.h header check, and changed
- the preferred libdir and docdir for netbsd and freebsd.
-
- * doc/Makefile.am, doc/html/Makefile.am: Changed the preferred
- docdir for netbsd and freebsd.
-
-2007-03-22 Marco van den Heuvel <bla...@ya...>
-
- * Makefile.am, configure.in: Added 'use make bindist instead
- of make install' message for platforms that don't use 'make
- install'.
-
-2007-03-19 Andreas Boose <vic...@t-...>
-
- * Version 1.21.2.
-
-2007-03-17 Andreas Boose <vic...@t-...>
-
- * Version 1.21.1.
-
- * configure.in: Define `UNSTABLE'.
- Added missing `; then' operator to usb joystick detection.
-
- * doc/html/Makefile.am: Added `macosx.html'.
-
-2007-03-14 Marco van den Heuvel <bla...@ya...>
-
- * AUTHORS: Added Christian to the list.
-
- * Makefile.am: Added 'make bindist(zip)' functionality for the
- riscos port.
-
- * build/Makefile.am, build/riscos/build-cross.sh: Added riscos
- cross compiler based build script.
-
- * data/C128/Makefile.am, data/C128/ROdflt.vkm,
- data/C64/Makefile.am, data/C64/ROdflt.vkm,
- data/CBM-II/Makefile.am, data/CBM-II/ROdflt.vkm,
- data/PET/Makefile.am, data/PET/RObusi.vkm,
- data/PET/ROgrph.vkm, data/PLUS4/Makefile.am,
- data/PLUS4/ROdflt.vkm, data/VIC20/Makefile.am,
- data/VIC20/ROdflt.vkm: Added riscos specific .vkm files.
-
-2007-03-12 Marco van den Heuvel <bla...@ya...>
-
- * build/amigaos/build-vbcc.sh: Changed the names of the WarpOS
- and PowerUP binary distributions.
-
- * build/beos/ppc-build.sh: Fixed a typo.
-
- * configure.in: Added extra usb lib/header checks.
-
-2007-03-04 Andreas Boose <vic...@t-...>
-
- * Version 1.21.
-
- * configure.in: Do not define `UNSTABLE'.
-
-2007-03-03 Andreas Boose <vic...@t-...>
-
- * Version 1.20.24.
-
- * doc/vice.texi: Fixed some syntax bugs.
-
- * doc/html/plain/NEWS, README, vice.spec: Updated.
-
-2007-03-03 Marco van den Heuvel <bla...@ya...>
-
- * doc/html/plain/NEWS: Added a news item for the release of
- 1.21.
-
-2007-03-02 Christian Vogelgsang <ch...@vo...>
-
- * doc/html/index.html, doc/vice.texi: added myself to VICE
- team
-
-2007-03-02 Christian Vogelgsang <ch...@vo...>
-
- * doc/html/index.html, doc/html/macosx.html: created new Mac
- OS X download page with links for both X11 AW and Gtk+ version
-
- * doc/html/plain/NEWS: updated with my contributions
-
- * doc/ReadmeMacOSX.txt: added missing FFMPEG
-
-2007-02-27 Marco van den Heuvel <bla...@ya...>
-
- * doc/html/index.html, doc/vice.texi: Updated for the 1.21
- release.
-
-2007-02-25 Christian Vogelgsang <ch...@vo...>
-
- * build/macosx/build-allext.sh,
- build/macosx/build-ffmpeglame.sh,
- build/macosx/build-inc.sh, build/macosx/build-vice-dist.sh:
- added and integrated build of FFMpeg + Lame for Macs
-
-2007-02-25 Christian Vogelgsang <ch...@vo...>
-
- * configure.in: move SOUND_LIBS to LIBS for all ports
-
-2007-02-25 Andreas Boose <vic...@t-...>
-
- * Version 1.20.23.
-
-2007-02-24 Marco van den Heuvel <bla...@ya...>
-
- * Makefile.am: Added the 'make cleantrans' rule.
-
-2007-02-24 Christian Vogelgsang <ch...@vo...>
-
- * configure.in: fixed checks for unix ffmpeg detection
-
-2007-02-21 Marco van den Heuvel <bla...@ya...>
-
- * configure.in: Fixed a typo.
-
-2007-02-21 Marco van den Heuvel <bla...@ya...>
-
- * build/beos/ppc-build.sh: Added '-inclpaths nosys' to get
- #include <config.h> function properly.
-
- * build/minix3/build-package.sh: Updated to build from the
- root or build directory.
-
- * configure.in: Changed the behaviour of SOUND_LIBS for beos
- and solaris to avoid build problems.
-
- * doc/html/Makefile.am, doc/html/beos.html: Added new BeOS
- ports page.
-
- * doc/html/amigaos.html, doc/html/solaris.html: Updated for
- the 1.21 release.
-
- * doc/html/plain/NEWS: Updated with the things I was involved
- in.
-
-2007-02-11 Andreas Boose <vic...@t-...>
-
- * Version 1.20.22.
-
-2007-02-10 Marco van den Heuvel <bla...@ya...>
-
- * build/amigaos/build-vbcc.sh: Added the new sound drivers.
-
- * configure.in: Added checking for libmp3lame for mp3 sound
- record support and fixed the amiga graphics headers check.
-
-2007-02-05 Marco van den Heuvel <bla...@ya...>
-
- * build/Makefile.am, build/amigaos/build-os4-native.sh,
- configure.in: Added native AmigaOS4 compile support, based on
- the suggestions provided by Peter Gordon
- <pe...@pe...>.
-
- * build/amigaos/build-vbcc.sh: Added digimax support.
-
-2007-02-03 Marco van den Heuvel <bla...@ya...>
-
- * Makefile.am, build/Makefile.am, build/beos/ppc-build.sh,
- configure.in: Added ppc-beos support.
-
-2007-01-28 Andreas Boose <vic...@t-...>
-
- * Version 1.20.21.
-
-2007-01-23 Marco van den Heuvel <bla...@ya...>
-
- * build/Makefile.am, build/amigaos/build-vbcc.sh: Added amiga
- vbcc compiler support.
-
-2007-01-07 Andreas Boose <vic...@t-...>
-
- * Version 1.20.20.
-
-2007-01-01 Marco van den Heuvel <bla...@ya...>
-
- * README, doc/Readme.dos, doc/vice.texi: Changed the '2006'
- year references to '2007'.
-
-2006-12-31 pottendo <pot...@ut...>
-
- * doc/openGLsync-howto.txt: Updated.
-
- * configure.in: Added check for `glXWaitVideoSyncSGI'
-
- * configure.in: Added check for XRandR as fullscreen device.
-
-2006-12-25 pottendo <pot...@ut...>
-
- * doc/openGLsync-howto.txt: New file.
-
- * configure.in: Added intermediate solution for X11 vblank sync
- support based on openGL. Enable currently with `--enable-vblank'
- at configure time. Autodetection is still missing.
-
-2006-12-24 Andreas Boose <vic...@t-...>
-
- * Version 1.20.19.
-
-2006-12-24 Christian Vogelgsang <ch...@vo...>
-
- * doc/ReadmeMacOSX.txt: updated Mac OS X port documentation.
-
-2006-12-10 Christian Vogelgsang <ch...@vo...>
-
- * build/macosx/build-vice-dist.sh: fixes for gtk bundling on
- mac. changed to bundling a single mac app with all emulators
- inside. added command line launcher for emulators.
-
-2006-12-03 Andreas Boose <vic...@t-...>
-
- * Version 1.20.18.
-
-2006-11-29 Christian Vogelgsang <ch...@vo...>
-
- * build/macosx/build-vice-dist.sh: correctly handle and embed
- dynamic libs in mac os x bundling process
-
-2006-11-27 Marco van den Heuvel <bla...@ya...>
-
- * configure.in: Added a check for the inttypes.h include.
-
-2006-11-17 Christian Vogelgsang <ch...@vo...>
-
- * build/Makefile.am: added new mac build scripts
-
- * build/macosx/build*.sh: new modularized mac binary
- distribution tools with helper scripts for the required
- external libraries (including gtk+ and libpcap/libnet for
- ethernet support)
-
-2006-11-15 Marco van den Heuvel <bla...@ya...>
-
- * configure.in: Got rid of the sidcart directory.
-
-2006-11-13 Andreas Boose <vic...@t-...>
-
- * Version 1.20.17.
-
-2006-11-12 Christian Vogelgsang <ch...@vo...>
-
- * configure.in: extended tests for gnome-ui to compile cleanly
- on mac os x.
-
-2006-11-06 Marco van den Heuvel <bla...@ya...>
-
- * configure.in: Added sidcart support.
-
-2006-11-05 Andreas Boose <vic...@t-...>
-
- * Version 1.20.16.
-
-2006-10-22 Andreas Boose <vic...@t-...>
-
- * Version 1.20.15.
-
- * configure.in: Added new subdirectories.
-
-2006-10-22 Christian Vogelgsang <ch...@vo...>
-
- * configure.in: fetch includes for --with-gnomeui from gtk+2.0
- package (same as for the libs)
-
-2006-10-21 Andreas Boose <vic...@t-...>
-
- * Version 1.20.14.
-
-2006-10-19 Andreas Boose <vic...@t-...>
-
- * Version 1.20.13.
-
-2006-10-16 Andreas Boose <vic...@t-...>
-
- * Version 1.20.12.
-
-2006-10-15 Andreas Boose <vic...@t-...>
-
- * Version 1.20.11.
-
- * doc/html/plain/BUGS: Updated.
-
-2006-10-15 Marco van den Heuvel <bla...@ya...>
-
- * configure.in: Added automatic generation of the intl header
- files.
-
-2006-10-14 Andreas Boose <vic...@t-...>
-
- * Version 1.20.10.
-
-2006-10-01 Andreas Boose <vic...@t-...>
-
- * Version 1.20.9.
-
-2006-09-30 Andreas Boose <vic...@t-...>
-
- * Version 1.20.8.
-
- * build/Makefile.am: Removed `mingw32/linux-cross.sh'.
-
-2006-09-25 Andreas Boose <vic...@t-...>
-
- * Version 1.20.7.
-
-2006-09-23 Andreas Boose <vic...@t-...>
-
- * Version 1.20.6.
-
-2006-09-17 Andreas Boose <vic...@t-...>
-
- * Version 1.20.5.
-
-2006-09-16 Andreas Boose <vic...@t-...>
-
- * Version 1.20.4.
-
- * build/mingw32/build-cross.sh: New file.
-
- * build/Makefile.am: Added new file.
-
-2006-09-10 Andreas Boose <vic...@t-...>
-
- * Version 1.20.3.
-
-2006-09-09 Andreas Boose <vic...@t-...>
-
- * Version 1.20.2.
-
- * config.guess, config.sub, depcomp, install-sh, missing,
- mkinstalldirs: Updated to automake 1.9.
-
-2006-09-09 pottendo <pot...@ut...>
-
- * configure.in (gnomeui): depend only on gtk+-2.0 as
- libgnomeui is marked to be deprecated.
-
-2006-09-09 Marco van den Heuvel <bla...@ya...>
-
- * doc/html/amigaos.html, doc/html/index.html,
- doc/html/solaris.html: Updated.
-
-2006-09-03 Andreas Boose <vic...@t-...>
-
- * Version 1.20.1.
-
- * configure.in: Define `UNSTABLE'.
- Do not add `-Wstrict-prototypes' to `CXXFLAGS'.
-
- * doc/html/index.html: Added link to BeOS patch.
-
-2006-09-02 pottendo <pot...@ut...>
-
- * configure.in: (ALL_LINGUAS) added hu.
-
-2006-08-27 Andreas Boose <vic...@t-...>
-
- * Version 1.20.
-
- * configure.in: Do not define `UNSTABLE'.
-
- * doc/vice.texi, doc/html/index.html, doc/html/amigaos.html,
- doc/html/solaris.html: Fixed some minor issues.
-
-2006-08-26 Andreas Boose <vic...@t-...>
-
- * Version 1.19.28.
-
-2006-08-21 Christian Vogelgsang <ch...@vo...>
-
- * build/macosx/make-ub.sh: Added support to cross-compile on a
- PowerPC platform
-
-2006-08-19 Marco van den Heuvel <bla...@ya...>
-
- * doc/vice.texi: Updated.
-
-2006-08-17 Marco van den Heuvel <bla...@ya...>
-
- * doc/html/plain/NEWS: Cosmetic fix.
-
-2006-08-14 Andreas Boose <vic...@t-...>
-
- * Version 1.19.27.
-
- * doc/html/plain/NEWS, doc/Readme.dos, doc/vice.texi, README,
- vice.spec, doc/html/index.html: Updated.
-
-2006-08-11 Marco van den Heuvel <bla...@ya...>
-
- * doc/html/plain/cbm_basic_tokens.txt: Cosmetic fix.
-
-2006-08-07 Marco van den Heuvel <bla...@ya...>
-
- * doc/html/plain/NEWS, doc/vice.texi: Updated.
-
-2006-08-06 Andreas Boose <vic...@t-...>
-
- * Version 1.19.26.
-
-2006-07-31 Christian Vogelgsang <ch...@vo...>
-
- * configure.in, src/arch/unix/Makefile.am:
- Added new variable ARCH_EXTRA_SUBDIR to define extra build
- subdirs of unix build.
-
- * build/macosx/make-ub.sh: Build PPC and Intel Code now in
- different temp dirs and keep final VICE build.
-
- * doc/ReadmeMacOSX.txt: Added section on X11 xinitrc
- setupmodo:~/Projects cnvogelg$
-
-2006-07-31 Marco van den Heuvel <bla...@ya...>
-
- * Makefile.am: Added automatic solaris binary package creation
- support.
-
-2006-07-29 Marco van den Heuvel <bla...@ya...>
-
- * Makefile.am: Added support for doing a make bindist*
- out-of-source for the ports that didn't support it yet.
-
- * build/Makefile.am, build/minix3/build-package.sh,
- build/minix3/build.sh: Added minix-3.x build scripts.
-
- * configure.in: Added the cygwin/X11 target, changed the NLS
- check to only check on unix platforms.
-
-2006-07-22 Andreas Boose <vic...@t-...>
-
- * Version 1.19.25.
-
-2006-07-14 Christian Vogelgsang <ch...@vo...>
-
- * build/macosx/make-ub.sh, build/Makefile.am: added script to
- automatically compile and bundle a universal binary
- distribution for Macs.
-
- * doc/ReadmeMacOSX.txt: added section on Universal Binaries
- and description on make-ub.sh usage
-
-2006-07-12 Christian Vogelgsang <ch...@vo...>
-
- * configure.in, Makefile.am: Introduced ARCH_SRC_DIR to locate
- make-bindist.sh in out-of-source-compiles.
-
-2006-07-12 Spiro Trikaliotis <Spi...@gm...>
-
- * doc/html/index.html: Changed links to VICE KB.
-
-2006-07-11 Marco van den Heuvel <bla...@ya...>
-
- * doc/html/amigaos.html: Updated.
-
-2006-07-10 Andreas Boose <vic...@t-...>
-
- * Version 1.19.24.
-
- * doc/html/index.html: Updated.
-
- * doc/html/amigaos.html, doc/html/solaris.html: New files.
-
- * doc/html/Makefile.am: Added new files.
-
- * Makefile.am: Use `ARCH_DIR'.
-
- * build/mingw32/linux-cross.sh: Added `STRIP' definition.
-
-2006-07-10 Marco van den Heuvel <bla...@ya...>
-
- * Makefile.am: Added the makebindist* for the gp2x port.
-
-2006-07-09 Christian Vogelgsang <ch...@vo...>
-
- * Makefile.am, configure.in, src/config.h.in:
- Added Mac OS X support. Defines MACOSX_SUPPORT in config.h and
- MACOSX_COMPILE for automake.
- Mac sound and joystick driver is only probed on Macs.
-
- * doc/ReadmeMacOSX.txt: Updated to official port.
-
-2006-07-09 Andreas Boose <vic...@t-...>
-
- * Version 1.19.23.
-
- * build/mingw32/linux-cross.sh, build/Makefile.am: New files.
-
- * configure.in, Makefile.am: Added new directory.
-
- * Makefile.am: Use `ARCH_DIR'.
-
-2006-07-05 Andreas Boose <vic...@t-...>
-
- * Version 1.19.22.
-
- * configure.in: Fixed some typos.
-
-2006-07-04 Marco van den Heuvel <bla...@ya...>
-
- * configure.in: Fixes, test for ahi only for amiga, test
- parsid only for unix but not gp2x.
-
-2006-07-04 Andreas Boose <vic...@t-...>
-
- * Version 1.19.21.
-
- * configure.in: Added USB joystick patch by Christian
- Vogelgsang.
-
- * Makefile.am, configure.in: Renamed Solaris and QNX compile
- switches.
-
-2006-07-03 Andreas Boose <vic...@t-...>
-
- * Version 1.19.20.
-
- * configure.in: Unified XAW and GNOME library search section.
- Removed conditional `DOS_OR_WIN'.
-
- * data/Makefile.am: Changed not to use `DOS_OR_WIN'.
-
-2006-06-26 Andreas Boose <vic...@t-...>
-
- * Version 1.19.19.
-
- * configure.in: Rewritten to use the flags `is_unix',
- `is_unix_x11' and `is_unix_gp2x'.
-
-2006-06-25 Marco van den Heuvel <bla...@ya...>
-
- * configure.in: Added GP2X support.
-
-2006-06-25 Andreas Boose <vic...@t-...>
-
- * Version 1.19.18.
-
- * configure.in: Added `arch/unix/gui' directory.
-
-2006-06-24 Andreas Boose <vic...@t-...>
-
- * Version 1.19.17.
-
-2006-06-23 Andreas Boose <vic...@t-...>
-
- * Version 1.19.16.
-
-2006-06-21 Andreas Boose <vic...@t-...>
-
- * Version 1.19.15.
-
-2006-06-17 Marco van den Heuvel <bla...@ya...>
-
- * configure.in: Fixed a small issue for $have_ss_family.
-
-2006-06-11 Andreas Boose <vic...@t-...>
-
- * Version 1.19.14.
-
-2006-06-07 Marco van den Heuvel <bla...@ya...>
-
- * configure.in: Fixed for older shells that cannot handle '=='
- in tests.
-
-2006-05-30 Marco van den Heuvel <bla...@ya...>
-
- * configure.in: Added MorphOS overlay support, patch provided
- by Harry Sintonen <sin...@ik...>.
-
-2006-05-28 Andreas Boose <vic...@t-...>
-
- * Version 1.19.13.
-
-2006-05-26 Marco van den Heuvel <bla...@ya...>
-
- * configure.in: Added MorphOS netplay support, patch provided
- by Harry Sintonen <sin...@ik...>.
-
-2006-05-18 Marco van den Heuvel <bla...@ya...>
-
- * Makefile.am: Added $(SHELL) to the 'make bindist' to ensure
- that the scripts get executed.
-
-2006-05-16 Marco van den Heuvel <bla...@ya...>
-
- * configure.in: Added a swab() function check.
-
-2006-05-14 Andreas Boose <vic...@t-...>
-
- * Version 1.19.12.
-
-2006-05-11 Marco van den Heuvel <bla...@ya...>
-
- * Makefile.am, config.sub, configure.in: Added AROS Support
- for the AmigaOS port.
-
-2006-05-11 Marco van den Heuvel <bla...@ya...>
-
- * configure.in: Added MorphOS support for the AmigaOS port.
-
-2006-05-11 Marco van den Heuvel <bla...@ya...>
-
- * Makefile.am: Added support for some cross-compilers that add
- the .exe extension to the produced executable files of the
- AmigaOS port.
-
- * configure.in: Added 'classic amigaos' support and
- preliminary morphos, aros and amithlon support.
-
-2006-05-02 Marco van den Heuvel <bla...@ya...>
-
- * Makefile.am: Added the 'make bindistzip' target.
-
-2006-05-01 Andreas Boose <vic...@t-...>
-
- * Version 1.19.11.
-
-2006-04-30 Marco van den Heuvel <bla...@ya...>
-
- * configure.in: Added the HAVE_NTOHx defines for win32.
-
-2006-04-28 Andreas Boose <vic...@t-...>
-
- * Version 1.19.10.
-
-2006-04-28 Marco van den Heuvel <bla...@ya...>
-
- * Makefile.am, configure.in: Added binary distribution making
- functionality.
-
- * doc/MSDOS-Ethernet-Howto.txt, doc/MSDOS-Howto.txt,
- doc/Readme.beos, doc/Win32-Howto.txt: Changed the
- documentation to include the new binary distribution making
- functionality.
-
-2006-04-27 Marco van den Heuvel <bla...@ya...>
-
- * configure.in: Added a fix for the optionally missing
- htons/htonl functions.
-
-2006-04-25 Marco van den Heuvel <bla...@ya...>
-
- * doc/cartconv.txt: Added support for the Mikro Assembler
- cartridge.
-
-2006-04-23 Andreas Boose <vic...@t-...>
-
- * Version 1.19.9.
-
-2006-04-22 Marco van den Heuvel <bla...@ya...>
-
- * configure.in: Added a check for the strings.h header.
-
-2006-04-19 Marco van den Heuvel <bla...@ya...>
-
- * configure.in: Fixed some sound-driver problems.
-
-2006-04-19 Marco van den Heuvel <bla...@ya...>
-
- * doc/Makefile.am, doc/cartconv.txt: Added the cartconv
- documentation.
-
-2006-04-12 Marco van den Heuvel <bla...@ya...>
-
- * doc/Makefile.am, doc/Minix-Howto.txt,
- doc/MinixVmd-Howto.txt: Added minix-3.x information and
- changed the minixvmd-howto to minix-howto.
-
-2006-04-06 Marco van den Heuvel <bla...@ya...>
-
- * configure.in: Added support for minix3.
-
-2006-04-02 Andreas Boose <vic...@t-...>
-
- * Version 1.19.8.
-
-2006-03-12 Andreas Boose <vic...@t-...>
-
- * Version 1.19.7.
-
-2006-02-19 Andreas Boose <vic...@t-...>
-
- * Version 1.19.6.
-
-2006-02-19 Marco van den Heuvel <bla...@ya...>
-
- * doc/html/plain/cbm_basic_tokens.txt: Added VIC20 Basic 4.0
- and 5.0 extension support.
-
-2006-02-18 Marco van den Heuvel <bla...@ya...>
-
- * configure.in: Added experimental ParSID support.
-
-2006-02-13 Marco van den Heuvel <bla...@ya...>
-
- * doc/Makefile.am, doc/delaep64.pl: Moved the delaep64.pl
- script to src/c64/cart.
-
-2006-02-11 Andreas Boose <vic...@t-...>
-
- * Version 1.19.5.
-
-2006-02-11 Michael Klein <mic...@pu...>
-
- * doc/Makefile.am: Added new files.
-
- * doc/delaep64.pl: New files.
-
-2006-02-05 Michael Klein <mic...@pu...>
-
- * configure.in: Corrected handling of VICEDIR variable.
-
-2006-02-03 Marco van den Heuvel <bla...@ya...>
-
- * doc/html/plain/cbm_basic_tokens.txt: Added Blarg support.
-
-2006-02-02 Marco van den Heuvel <bla...@ya...>
-
- * doc/html/plain/cbm_basic_tokens.txt: Added Easy Basic
- support.
-
-2006-02-02 Marco van den Heuvel <bla...@ya...>
-
- * doc/html/plain/cbm_basic_tokens.txt: Added Magic Basic
- support.
-
-2006-01-30 Andreas Boose <vic...@t-...>
-
- * Version 1.19.4.
-
-2006-01-27 Michael Klein <mic...@pu...>
-
- * configure.in: added VICEDIR variable
-
- * data/C128/Makefile.am data/C64/Makefile.am
- data/CBM-II/Makefile.am data/DRIVES/Makefile.am
- data/PET/Makefile.am data/PLUS4/Makefile.am
- data/PRINTER/Makefile.am data/VIC20/Makefile.am
- data/fonts/Makefile.am doc/Makefile.am
- doc/html/Makefile.am:
- use $(VICEDIR) instead of $(prefix)/lib/vice
-
-2006-01-24 Michael Klein <mic...@pu...>
-
- * configure.in: removed JOY_OBJS
-
-2006-01-24 Marco van den Heuvel <bla...@ya...>
-
- * doc/html/plain/cbm_basic_tokens.txt: Added Basic 7.1
- support.
-
-2006-01-22 Andreas Boose <vic...@t-...>
-
- * Version 1.19.3.
-
- * configure.in: Only add internal ffmpeg header files to
- inlcude path if no external ffmpeg header files are found.
-
-2006-01-21 Andreas Boose <vic...@t-...>
-
- * Version 1.19.2.
-
-2006-01-20 pottendo <pot...@ut...>
-
- * configure.in: Added func check for `mkstemp'.
-
-2006-01-20 Marco van den Heuvel <bla...@ya...>
-
- * INSTALL: Corrected the text that explains where to run the
- configure script.
-
- * configure.in: Added the previously missing '--without-png'
- and '--without-zlib' options.
-
-2006-01-16 pottendo <pot...@ut...>
-
- * configure.in: Replaced gnome-config by pkg-config for
- Gnome2/Gtk2 support.
-
-2006-01-15 Andreas Boose <vic...@t-...>
-
- * Version 1.19.1.
-
- * configure.in: Define `UNSTABLE'.
-
-2006-01-08 Andreas Boose <vic...@t-...>
-
- * Version 1.19.
-
- * configure.in: Do not define `UNSTABLE'.
-
- * doc/html/index.html: Updated.
-
-2006-01-08 pottendo <pot...@ut...>
-
- * doc/html/index.html (Source Distros): Added gnome2 patch
- link.
-
-2006-01-06 Andreas Boose <vic...@t-...>
-
- * Version 1.18.12.
-
-2006-01-05 Andreas Matthies <and...@gm...>
-
- * configure.in: Added test for BeOS socket headers and
- drivers.
-
- * data/C64/beos_pos.vkm: Fixed key code.
-
-2006-01-04 Marco van den Heuvel <bla...@ya...>
-
- * doc/vice.texi: Updated my own info.
-
-2006-01-01 Andreas Boose <vic...@t-...>
-
- * Version 1.18.11.
-
- * doc/Readme.dos, doc/vice.texi, doc/html/plain/NEWS, README,
- vice.spec: Updated.
-
-2006-01-01 Marco van den Heuvel <bla...@ya...>
-
- * doc/Readme.dos, doc/vice.texi: Update 2005 to 2006.
-
-2005-12-31 Andreas Boose <vic...@t-...>
-
- * Version 1.18.10.
-
-2005-12-30 Marco van den Heuvel <bla...@ya...>
-
- * doc/html/plain/NEWS: Added a few items.
-
-2005-12-29 Andreas Boose <vic...@t-...>
-
- * Version 1.18.9.
-
- * doc/html/plain/NEWS: Updated.
-
-2005-12-28 Andreas Boose <vic...@t-...>
-
- * Version 1.18.8.
-
-2005-12-28 Marco van den Heuvel <bla...@ya...>
-
- * configure.in: Added checking for the getdtablesize and
- getrlimit functions.
-
-2005-12-26 Marco van den Heuvel <bla...@ya...>
-
- * configure.in: Added support for IPV6 for netplay.
-
-2005-12-23 Andreas Boose <vic...@t-...>
-
- * Version 1.18.7.
-
-2005-12-22 Andreas Boose <vic...@t-...>
-
- * Version 1.18.6.
-
-2005-12-20 Andreas Boose <vic...@t-...>
-
- * Version 1.18.5.
-
-2005-12-19 Andreas Boose <vic...@t-...>
-
- * Version 1.18.4.
-
-2005-12-18 Andreas Boose <vic...@t-...>
-
- * Version 1.18.3.
-
-2005-12-11 Andreas Boose <vic...@t-...>
-
- * Version 1.18.2.
-
- * configure.in: Ffmpeg support is default on win32 as
- suggested by AndreasM.
-
-2005-12-06 Marco van den Heuvel <bla...@ya...>
-
- * configure.in: Added checks for libjpeg and its header for
- jpeg screenshot support.
-
-2005-11-29 Andreas Boose <vic...@t-...>
-
- * Version 1.18.1.
-
- * configure.in: Define `UNSTABLE'.
-
-2005-11-20 Andreas Boose <vic...@t-...>
-
- * Version 1.18.
-
- * configure.in: Do not define `UNSTABLE'.
-
- * doc/html/index.html, README: Fixed dates.
-
-2005-11-19 Marco van den Heuvel <bla...@ya...>
-
- * doc/html/index.html: Changed the url's for the solaris
- binaries.
-
-2005-11-19 Andreas Boose <vic...@t-...>
-
- * Version 1.17.7.
-
- * doc/html/index.html, doc/vice.texi, vice.spec, README:
- Updated.
-
-2005-11-18 Marco van den Heuvel <bla...@ya...>
-
- * doc/html/plain/NEWS: Updated the items a bit.
-
-2005-11-17 Andreas Matthies <and...@gm...>
-
- * doc/html/plain/NEWS: Updated.
-
-2005-11-14 Marco van den Heuvel <bla...@ya...>
-
- * doc/html/plain/NEWS: Added some more new items, and changed
- the libpng/zlib entries a bit.
-
- * doc/vice.texi: Changed my own info a bit.
-
-2005-11-12 Andreas Boose <vic...@t-...>
-
- * Version 1.17.6.
-
- * doc/html/plain/NEWS: Updated.
-
-2005-11-12 Marco van den Heuvel <bla...@ya...>
-
- * configure.in: Added unix/msdos tests for netplay support.
-
-2005-11-07 Marco van den Heuvel <bla...@ya...>
-
- * configure.in: Added Minix-Vmd platform support.
-
- * doc/Makefile.am, doc/MinixVmd-Howto.txt: Added a text file
- describing how to compile VICE on Minix-Vmd.
-
-2005-11-07 Andreas Dehmel <za...@t-...>
-
- * configure.in: added --disable-zlibtest option for
- crosscompiling.
-
-2005-11-06 Andreas Boose <vic...@t-...>
-
- * Version 1.17.5.
-
- * doc/html/index.html: Changed download links to http access.
-
-2005-10-29 Andreas Boose <vic...@t-...>
-
- * Version 1.17.4.
-
- * configure.in: Moved definition of `HAS_NETWORK' to win32
- section.
-
-2005-10-27 Marco van den Heuvel <bla...@ya...>
-
- * configure.in: Added built-in support for libpng and libz.
-
-2005-10-25 Marco van den Heuvel <bla...@ya...>
-
- * doc/html/index.html: Resurrected the OS/2 port and made a
- download link to the OS/2 VICE 1.17 binary file.
-
-2005-10-23 Marco van den Heuvel <bla...@ya...>
-
- * doc/html/plain/cbm_basic_tokens.txt: Cosmetic fix.
-
-2005-10-23 Andreas Boose <vic...@t-...>
-
- * Version 1.17.3.
-
-2005-10-10 Andreas Boose <vic...@t-...>
-
- * Version 1.17.2.
-
- * configure.in: Detect hardsid header file.
-
-2005-10-09 Andreas Boose <vic...@t-...>
-
- * Version 1.17.1.
-
- * configure.in: Define `UNSTABLE'.
-
- * doc/html/index.html: Updated ffmpeg libaray URL.
-
-2005-10-02 Andreas Boose <vic...@t-...>
-
- * Version 1.17.
-
- * doc/html/index.html: Updated.
-
-2005-10-01 Marco van den Heuvel <bla...@ya...>
-
- * doc/html/plain/cbm_basic_tokens.txt: Cosmetic fixes.
-
-2005-10-01 Andreas Boose <vic...@t-...>
-
- * Version 1.16.21.
-
- * configure.in: Do not define `UNSTABLE'.
-
- * doc/vice.texi, doc/html/index.html, README, vice.spec:
- Updated.
-
-2005-09-29 Marco van den Heuvel <bla...@ya...>
-
- * README: Added QNX 6.x.
-
- * doc/html/index.html, doc/html/plain/NEWS, doc/vice.texi:
- Added Solaris binary packages.
-
-2005-09-26 Marco van den Heuvel <bla...@ya...>
-
- * configure.in: Fixed a typo that lead to a bogus configure
- script.
-
-2005-09-26 Marco van den Heuvel <bla...@ya...>
-
- * configure.in: Added the configure option --without-oss and
- added checking of <soundcard.h> for openbsd.
-
-2005-09-25 Marco van den Heuvel <bla...@ya...>
-
- * configure.in: Fixed several sound driver checking problems
-
-2005-09-15 Marco van den Heuvel <bla...@ya...>
-
- * doc/html/plain/NEWS: Added items that I have been involved
- in for the release of VICE 1.17.
-
-2005-09-14 Andreas Boose <vic...@t-...>
-
- * Version 1.16.20.
-
-2005-09-11 Marco van den Heuvel <bla...@ya...>
-
- * configure.in: Added the configure options --without-alsa and
- --without-esd.
-
-2005-09-08 Marco van den Heuvel <bla...@ya...>
-
- * doc/html/plain/cbm_basic_tokens.txt: Added Pegasus basic
- 4.0.
-
-2005-09-06 Marco van den Heuvel <bla...@ya...>
-
- * doc/html/plain/cbm_basic_tokens.txt: Added Mighty basic.
-
-2005-09-04 Marco van den Heuvel <bla...@ya...>
-
- * doc/html/plain/cbm_basic_tokens.txt: Added WS basic.
-
-2005-09-04 Marco van den Heuvel <bla...@ya...>
-
- * doc/html/plain/cbm_basic_tokens.txt: Added graphics basic.
-
-2005-08-30 Marco van den Heuvel <bla...@ya...>
-
- * doc/html/plain/cbm_basic_tokens.txt: Added Ultrabasic-64.
-
-2005-08-21 Andreas Boose <vic...@t-...>
-
- * Version 1.16.19.
-
-2005-08-14 Michael Klein <mic...@pu...>
-
- * configure.in: check for gettext in libintl
-
-2005-08-14 Michael Klein <mic...@pu...>
-
- * configure.in: Added checking for CoreAudio environment (Mac
- OS X)
-
-2005-08-10 Marco van den Heuvel <bla...@ya...>
-
- * AUTHORS, doc/Readme.dos, doc/vice.texi, man/vice.1: Added
- myself to the member list.
-
- * README: Added myself to the member list and updated some
- documentation information.
-
- * doc/html/index.html: Added myself to the member list and
- added QNX 6.x binary package link.
-
-2005-08-07 martin <pot...@ut...>
-
- * acinclude.m4: New file. Contains local helper macro. This
- should fix aclocal on newer installations.
-
- * data/fonts/Makefile.am (EXTRA_DIST): Separated
- cbm-directory-charset.fon from `fonts_DATA' to avoid
- unnecessary installation warnings under Unix.
-
-2005-07-30 Andreas Boose <vic...@t-...>
-
- * Version 1.16.18.
-
-2005-07-24 Andreas Boose <vic...@t-...>
-
- * Version 1.16.17.
-
-2005-07-14 Marco van den Heuvel <bla...@ya...>
-
- * configure.in: Fixed libnsl libsocket combination assumption,
- and changed the libXext function check to XShmAttach.
-
-2005-07-10 Andreas Boose <vic...@t-...>
-
- * Version 1.16.16.
-
-2005-06-21 Andreas Boose <vic...@t-...>
-
- * Version 1.16.15.
-
-2005-06-20 Marco van den Heuvel <bla...@ya...>
-
- * configure.in: Fixed the detection of a cross-compiler
- environment when using genwinres.
-
-2005-06-14 Marco van den Heuvel <bla...@ya...>
-
- * configure.in: Put checking of libXpm before checking libXaw,
- this fixes the dependancy problem on some openbsd hardware
- platforms.
-
-2005-06-12 Marco van den Heuvel <bla...@ya...>
-
- * configure.in: Added u_short, libbsd, telldir and seekdir
- checking.
-
-2005-06-08 Marco van den Heuvel <bla...@ya...>
-
- * configure.in: Added cross-compile mode detection for
- genwinres.
-
-2005-06-05 Andreas Boose <vic...@t-...>
-
- * Version 1.16.14.
-
-2005-06-03 Marco van den Heuvel <bla...@ya...>
-
- * configure.in: Added a autoconf bug workaround.
-
-2005-05-30 Marco van den Heuvel <bla...@ya...>
-
- * configure.in: Fixed windres and wrc checking.
-
-2005-05-29 Andreas Boose <vic...@t-...>
-
- * Version 1.16.13.
-
-2005-05-23 Andreas Boose <vic...@t-...>
-
- * Version 1.16.12.
-
-2005-05-15 Andreas Boose <vic...@t-...>
-
- * Version 1.16.11.
-
-2005-05-13 Marco van den Heuvel <bla...@ya...>
-
- * configure.in: Added HAS_TRANSLATION for platforms that
- support the new internationalization scheme (currently only
- win32).
-
-2005-05-08 Andreas Boose <vic...@t-...>
-
- * Version 1.16.10.
-
-2005-05-04 Marco van den Heuvel <bla...@ya...>
-
- * configure.in: Added wrc as the prefered win32 resource
- compiler.
-
-2005-04-24 Andreas Boose <vic...@t-...>
-
- * Version 1.16.9.
-
-2005-04-23 Andreas Boose <vic...@t-...>
-
- * Version 1.16.8.
-
-2005-04-20 Andreas Boose <vic...@t-...>
-
- * Version 1.16.7.
-
-2005-04-17 Andreas Boose <vic...@t-...>
-
- * Version 1.16.6.
-
-2005-04-12 Andreas Boose <vic...@t-...>
-
- * Version 1.16.5.
-
-2005-04-09 Andreas Boose <vic...@t-...>
-
- * Version 1.16.4.
-
- * doc/Makefile.am: Added `MSDOS-Ethernet-Howto.txt'.
-
-2005-04-03 Marco van den Heuvel <bla...@ya...>
-
- * configure.in, po/nl.po: Added dutch translation.
-
-2005-03-28 Andreas Boose <vic...@t-...>
-
- * Version 1.16.3.
-
-2005-03-12 Andreas Boose <vic...@t-...>
-
- * Version 1.16.2.
-
-2005-03-09 Dag Lem <re...@ni...>
-
- * configure.in: Check for ALSA sound library.
-
-2005-02-13 Andreas Boose <vic...@t-...>
-
- * Version 1.16.1.
-
- * configure.in: Define `UNSTABLE'.
-
- * data/PET/x11_bdep.vkm, data/PET/x11_bdes.vkm: Fixed
- includes.
-
-2005-01-23 Andreas Boose <vic...@t-...>
-
- * Version 1.16.
-
- * doc/vice.texi, doc/html/index.html: Updated.
-
-2005-01-22 Andreas Boose <vic...@t-...>
-
- * Version 1.15.15.
-
- * configure.in: Do not define `UNSTABLE'.
-
- * doc/vice.texi, doc/html/index.html, doc/Readme.dos, README,
- vice.spec: Updated.
-
-2004-12-29 Andreas Boose <vic...@t-...>
-
- * Version 1.15.14.
-
- * doc/html/plain/NEWS: Updated.
-
-2004-12-25 Andreas Boose <vic...@t-...>
-
- * Version 1.15.13.
-
-2004-12-19 Andreas Boose <vic...@t-...>
-
- * Version 1.15.12.
-
- * data/C64/win_sym.vkm, data/PET/win_bgrs.vkm,
- data/PET/win_buks.vkm, data/CBM-II/win_buks.vkm,
- data/CBM-II/win_buks.vkm: Renamed.
-
- * data/C64/Makefile.am, data/PET/Makefile.am,
- data/CBM-II/Makefile.am: Updated.
-
- * data/C64/win_pos.vkm, data/C64/win_sym.vkm,
- data/C64/win_sym_de.vkm, data/C128/win_pos.vkm,
- data/C128/win_sym.vkm, data/VIC20/win_pos.vkm,
- data/VIC20/win_sym.vkm, data/PET/win_bgrs.vkm,
- data/PET/win_buks.vkm, data/PLUS4/win_pos.vkm,
- data/PLUS4/win_sym.vkm, data/CBM-II/win_buks.vkm,
- data/CBM-II/win_bukp.vkm, data/C64/dos_pos.vkm,
- data/C64/dos_sym.vkm, data/C128/dos_pos.vkm,
- data/C128/dos_sym.vkm, data/VIC20/dos_sym.vkm,
- data/VIC20/dos_pos.vkm, data/PET/dos_bgrs.vkm,
- data/PET/dos_buks.vkm, data/PLUS4/dos_sym.vkm,
- data/PLUS4/dos_pos.vkm, data/CBM-II/dos_bukp.vkm,
- data/CBM-II/dos_buks.vkm, data/C64/x11_pos.vkm,
- data/C64/x11_sym.vkm, data/C128/x11_pos.vkm,
- data/C128/x11_sym.vkm, data/VIC20/x11_pos.vkm,
- data/VIC20/x11_sym.vkm, data/PET/x11_bgrs.vkm,
- data/PET/x11_buks.vkm, data/PLUS4/x11_pos.vkm,
- data/PLUS4/x11_sym.vkm, data/CBM-II/x11_buks.vkm,
- data/C64/beos_pos.vkm, data/C64/beos_sym.vkm,
- data/C128/beos_pos.vkm, data/C128/beos_sym.vkm,
- data/VIC20/beos_pos.vkm, data/VIC20/beos_sym.vkm,
- data/PET/beos_bgrs.vkm, data/PET/beos_buks.vkm,
- data/PLUS4/beos_pos.vkm, data/PLUS4/beos_sym.vkm,
- data/CBM-II/beos_bukp.vkm, data/CBM-II/beos_buks.vkm:
- Added new shift flags comments.
-
-2004-12-05 Andreas Boose <vic...@t-...>
-
- * Version 1.15.11.
-
- * data/C64/win_sym_de.vkm: New file.
-
- * data/C64/Makefile.am: Added new file.
-
-2004-11-30 Andreas Dehmel <za...@t-...>
-
- * configure.in: don't build sounduss on RISC OS either
-
-2004-11-21 Andreas Boose <vic...@t-...>
-
- * Version 1.15.10.
-
-2004-11-06 Andreas Boose <vic...@t-...>
-
- * Version 1.15.9.
-
-2004-10-17 Andreas Boose <vic...@t-...>
-
- * Version 1.15.8.
-
-2004-10-09 Andreas Boose <vic...@t-...>
-
- * Version 1.15.7.
-
- * configure.in: Removed trailing slash in arch include path
- definition.
-
-2004-10-02 Andreas Boose <vic...@t-...>
-
- * Version 1.15.6.
-
-2004-09-26 Andreas Boose <vic...@t-...>
-
- * Version 1.15.5.
-
-2004-09-25 Andreas Boose <vic...@t-...>
-
- * Version 1.15.4.
-
-2004-09-12 Andreas Boose <vic...@t-...>
-
- * Version 1.15.3.
-
-2004-09-04 Andreas Boose <vic...@t-...>
-
- * Version 1.15.2.
-
- * configure.in: Renamed VIC20 resource file.
-
-2004-09-01 Andreas Boose <vic...@t-...>
-
- * Version 1.15.1.
-
-2004-08-27 Tibor Biczo <cr...@ax...>
-
- * configure.in: Added libversion to Win32 linking.
-
-2004-08-22 Andreas Boose <vic...@t-...>
-
- * Version 1.15.
-
- * doc/html/plain/NEWS, doc/html/index.html: Updated.
-
-2004-08-21 Andreas Boose <vic...@t-...>
-
- * Version 1.14.40.
-
- * configure.in: Do not define `UNSTABLE'.
- Fixed `--disable-realdevice' configure switch.
-
- * README, vice.spec, doc/vice.texi, doc/html/index.html,
- doc/html/plain/NEWS: Updated.
-
-2004-08-08 Andreas Boose <vic...@t-...>
-
- * Version 1.14.39.
-
- * configure.in: Fixed opencbm definitions.
-
-2004-08-07 Andreas Boose <vic...@t-...>
-
- * Version 1.14.38.
-
-2004-07-26 Dieter Baron <di...@da...>
-
- * configure.in: Added BSD USB joystick support.
-
-2004-07-24 pottendo <pot...@ut...>
-
- * configure.in: Fix to build without opencbm.
-
-2004-07-17 Andreas Boose <vic...@t-...>
-
- * Version 1.14.37.
-
- * configure.in: Define `HAVE_OPENCBM' and `HAVE_REALDEVICE'
- for the win32 port.
-
-2004-07-17 Andreas Boose <vic...@t-...>
-
- * Version 1.14.36.
-
-2004-07-08 <fab...@ti...>
-
- * configure.in: Check for `sys/soundcard.h'.
-
-2004-06-30 Andreas Boose <vic...@t-...>
-
- * Version 1.14.35.
-
-2004-06-28 Andreas Boose <vic...@t-...>
-
- * Version 1.14.34.
-
-2004-06-25 Andreas Boose <vic...@t-...>
-
- * Version 1.14.33.
-
-2004-06-23 Andreas Boose <vic...@t-...>
-
- * Version 1.14.32.
-
-2004-06-20 Andreas Boose <vic...@t-...>
-
- * Version 1.14.31.
-
- * configure.in: Removed check for `sys/param.h'.
-
-2004-06-17 Andreas Boose <vic...@t-...>
-
- * Version 1.14.30.
-
-2004-06-12 Andreas Boose <vic...@t-...>
-
- * Version 1.14.29.
-
- * doc/html/index.html: Added link to 64bit patch.
-
-2004-06-06 Andreas Boose <vic...@t-...>
-
- * Version 1.14.28.
-
-2004-05-31 Andreas Boose <vic...@t-...>
-
- * Version 1.14.27.
-
- * configure.in: Link wsock32 library.
-
-2004-05-23 Andreas Boose <vic...@t-...>
-
- * Version 1.14.26.
-
-2004-05-21 Andreas Boose <vic...@t-...>
-
- * Version 1.14.25.
-
- * doc/html/index.html: Added link to VICEtoPS.
-
-2004-05-20 Andreas Boose <vic...@t-...>
-
- * Version 1.14.24.
-
-2004-05-10 Andreas Boose <vic...@t-...>
-
- * Version 1.14.23.
-
-2004-05-02 Andreas Boose <vic...@t-...>
-
- * Version 1.14.22.
-
-2004-04-24 Andreas Boose <vic...@t-...>
-
- * Version 1.14.21.
-
-2004-04-19 Spiro Trikaliotis <Spi...@gm...>
-
- * configure.in: Now checks for libnet and libpcap when using
- the option --enable-ethernet
-
-2004-04-18 Andreas Boose <vic...@t-...>
-
- * Version 1.14.20.
-
-2004-04-11 Andreas Boose <vic...@t-...>
-
- * Version 1.14.19.
-
-2004-04-10 Andreas Boose <vic...@t-...>
-
- * Version 1.14.18.
-
-2004-04-03 Andreas Boose <vic...@t-...>
-
- * Version 1.14.17.
-
-2004-03-28 Andreas Boose <vic...@t-...>
-
- * Version 1.14.16.
-
-2004-03-27 Andreas Boose <vic...@t-...>
-
- * Version 1.14.15.
-
-2004-03-21 Andreas Boose <vic...@t-...>
-
- * Version 1.14.14.
-
-2004-03-21 Andreas Boose <vic...@t-...>
-
- * Version 1.14.13.
-
-2004-03-15 Andreas Boose <vic...@t-...>
-
- * Version 1.14.12.
-
-2004-03-14 Andreas Boose <vic...@t-...>
-
- * Version 1.14.11.
-
-2004-03-13 Andreas Boose <vic...@t-...>
-
- * Version 1.14.10.
-
- * doc/ReadmeMacOSX.txt: New file.
-
- * doc/Makefile.am: Added new file.
-
- * configure.in: Removed checkes for `sys/time.h'.
-
-2004-03-11 Spiro Trikaliotis <Spi...@gm...>
-
- * configure.in: Added option --enable-ethernet for TFE
- emulation
-
-2004-03-08 Andreas Boose <vic...@t-...>
-
- * Version 1.14.9.
-
-2004-02-29 Andreas Boose <vic...@t-...>
-
- * Version 1.14.8.
-
- * doc/html/index.html: Added MacOSX distribution.
-
-2004-02-28 Andreas Boose <vic...@t-...>
-
- * Version 1.14.7.
-
-2004-02-25 Andreas Boose <vic...@t-...>
-
- * Version 1.14.6.
-
- * man/vice.1, AUTHORS: Updated.
-
-2004-02-22 Andreas Boose <vic...@t-...>
-
- * Version 1.14.5.
-
- * configure.in: Fixed usleep test.
-
-2004-02-15 Andreas Boose <vic...@t-...>
-
- * Version 1.14.4.
-
-2004-02-07 Andreas Boose <vic...@t-...>
-
- * Version 1.14.3.
-
- * configure.in: Check for `process.h'.
-
-2004-02-03 Andreas Boose <vic...@t-...>
-
- * Version 1.14.2.
-
- * configure.in: Added `iec128dcr' library.
-
-2004-02-01 Andreas Boose <vic...@t-...>
-
- * Version 1.14.1.
-
- * configure.in: Define `UNSTABLE'.
-
-2004-01-25 Andreas Boose <vic...@t-...>
-
- * Version 1.14.
-
- * doc/html/index.html, doc/html/plain/NEWS: Updated.
-
-2004-01-24 Andreas Boose <vic...@t-...>
-
- * Version 1.13.49.
-
- * configure.in: Do not define `UNSTABLE'.
-
-2004-01-18 Andreas Boose <vic...@t-...>
-
- * Version 1.13.48.
-
- * AUTHORS, FEEDBACK, README, vice.spec, doc/Readme.dos,
- doc/vice.texi: Updated.
-
- * doc/html/plain/Walkthrough-Howto.txt: Moved here.
-
- * doc/Makefile.am, doc/html/Makefile.am: Updated.
-
-2004-01-18 Andreas Matthies <and...@gm...>
-
- * doc/Walkthrough-Howto.txt: New file.
-
- * doc/Makefile.am: Added new file.
-
-2004-01-16 Andreas Boose <vic...@t-...>
-
- * Version 1.13.47.
-
-2004-01-12 Fabrizio Gennari <fab...@ti...>
-
- * INSTALL, doc/MSDOS-Howto.txt: Some corrections.
-
-2004-01-11 Andreas Boose <vic...@t-...>
-
- * Version 1.13.46.
-
- * data/PLUS4/x11_sym.vkm: New symbolic keyboard mapping
- provided by Csaba Markus.
-
-2004-01-06 Andreas Boose <vic...@t-...>
-
- * Version 1.13.45.
-
- * configure.in: Removed check for `X11/xpm.h'.
-
-2003-12-31 Andreas Boose <vic...@t-...>
-
- * Version 1.13.44.
-
-2003-12-28 Andreas Boose <vic...@t-...>
-
- * Version 1.13.43.
-
-2003-12-25 Andreas Boose <vic...@t-...>
-
- * Version 1.13.42.
-
- * doc/html/plain/NEWS: Updated.
-
-2003-12-23 Andreas Boose <vic...@t-...>
-
- * Version 1.13.41.
-
-2003-12-20 Andreas Boose <vic...@t-...>
-
- * Version 1.13.40.
-
- * doc/html/plain/BUGS: Updated.
-
-20...
[truncated message content] |
|
From: <fa...@us...> - 2008-07-19 00:11:47
|
Revision: 19053
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=19053&view=rev
Author: fabbo
Date: 2008-07-19 00:11:56 +0000 (Sat, 19 Jul 2008)
Log Message:
-----------
Polish up new MS-DOS joystick driver
Modified Paths:
--------------
branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/msdos/uijoystick.c
branches/fabrizio/v1.22.13-newjoydesign/vice/src/joystick.c
branches/fabrizio/v1.22.13-newjoydesign/vice/src/joystickdrv/joy_allegro.c
Modified: branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/msdos/uijoystick.c
===================================================================
--- branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/msdos/uijoystick.c 2008-07-18 20:47:52 UTC (rev 19052)
+++ branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/msdos/uijoystick.c 2008-07-19 00:11:56 UTC (rev 19053)
@@ -258,23 +258,23 @@
return NULL;
}
-static tui_menu_item_def_t joy_device_1_submenu[] = {
+static tui_menu_item_def_t joy_device_submenu[] = {
{ "N_one",
"No joystick device attached",
- set_joy_device_callback, (void *)(0x100 | JOYDEV_NONE), 0,
+ set_joy_device_callback, (void *)(JOYDEV_NONE), 0,
TUI_MENU_BEH_CLOSE, NULL, NULL },
{ "--" },
{ "_Numpad + Right Ctrl",
"Use numeric keypad for movement and right Ctrl for fire",
- set_joy_device_callback, (void *)(0x100 | JOYDEV_NUMPAD), 0,
+ set_joy_device_callback, (void *)(JOYDEV_NUMPAD), 0,
TUI_MENU_BEH_CLOSE, NULL, NULL },
{ "Keyset _A",
"Use keyset A",
- set_joy_device_callback, (void *)(0x100 | JOYDEV_KEYSET1), 0,
+ set_joy_device_callback, (void *)(JOYDEV_KEYSET1), 0,
TUI_MENU_BEH_CLOSE, NULL, NULL },
{ "Keyset _B",
"Use keyset B",
- set_joy_device_callback, (void *)(0x100 | JOYDEV_KEYSET2), 0,
+ set_joy_device_callback, (void *)(JOYDEV_KEYSET2), 0,
TUI_MENU_BEH_CLOSE, NULL, NULL },
{ NULL }
};
@@ -588,14 +588,6 @@
};
-static tui_menu_item_def_t single_joystick_submenu[] = {
- { "Joystick _Device:",
- "Specify device for joystick emulation",
- get_joystick_device_callback, (void *)1, 19,
- TUI_MENU_BEH_CONTINUE, joy_device_1_submenu, "Joystick" },
- { NULL }
-};
-
static tui_menu_item_def_t common_joystick_submenu[] = {
{ "--" },
{ "Configure Keyset _A...",
@@ -614,11 +606,14 @@
{ NULL }
};
-static void joystickui_add_devices(tui_menu_t menu)
+static void joystickui_add_devices(tui_menu_t menu, int port)
{
int numdevs = joystick_device_num(), i;
+
+ for(i=0;joy_device_submenu[i].label!=NULL;i++)
+ joy_device_submenu[i].callback_param = (void*)((int)joy_device_submenu[i].callback_param & 0xFF | (port << 8));
- tui_menu_add(menu, joy_device_1_submenu);
+ tui_menu_add(menu, joy_device_submenu);
if (!numdevs)
return;
@@ -631,9 +626,9 @@
joystick_device_name(i),
joystick_device_name(i),
set_joy_device_callback,
- (void *)(0x100 | JOYDEV_HW_BASE + i),
+ (void *)((port << 8) | (JOYDEV_HW_BASE + i)),
0,
- TUI_MENU_BEH_CONTINUE);
+ TUI_MENU_BEH_CLOSE);
}
}
@@ -659,10 +654,19 @@
"Specify device for emulation of joystick in port #2",
ui_pick_joystick_2_submenu,
get_joystick_device_callback, (void *)2, 19);
+ tui_menu_add_separator(ui_joystick_settings_submenu);
+ tui_menu_add_item(ui_joystick_settings_submenu,
+ "_Swap",
+ "Swap joystick ports",
+ swap_joysticks_callback,
+ NULL,
+ 0,
+ TUI_MENU_BEH_CONTINUE);
+
tui_menu_add(ui_joystick_settings_submenu,
common_joystick_submenu);
- joystickui_add_devices(ui_pick_joystick_1_submenu);
- joystickui_add_devices(ui_pick_joystick_2_submenu);
+ joystickui_add_devices(ui_pick_joystick_1_submenu, 1);
+ joystickui_add_devices(ui_pick_joystick_2_submenu, 2);
}
else /* Just one joystick. */
{
@@ -673,7 +677,7 @@
get_joystick_device_callback, (void *)1, 19);
tui_menu_add(ui_joystick_settings_submenu,
common_joystick_submenu);
- joystickui_add_devices(ui_pick_joystick_submenu);
+ joystickui_add_devices(ui_pick_joystick_submenu, 1);
}
}
}
Modified: branches/fabrizio/v1.22.13-newjoydesign/vice/src/joystick.c
===================================================================
--- branches/fabrizio/v1.22.13-newjoydesign/vice/src/joystick.c 2008-07-18 20:47:52 UTC (rev 19052)
+++ branches/fabrizio/v1.22.13-newjoydesign/vice/src/joystick.c 2008-07-19 00:11:56 UTC (rev 19053)
@@ -238,7 +238,7 @@
static joy_data_t* joy_devices[MAX_HW_JOY_DRIVERS];
-int set_joystick_device(int val, void *param)
+static int set_joystick_device(int val, void *param)
{
joy_data_t* dev;
int port = (int)param;
@@ -375,15 +375,14 @@
{
resources_register_int(resources_int);
+#ifdef MSDOS
+ joystick_allegro_init_resources();
+#endif
+
return 1;
}
#endif
-int joystick_arch_init_resources(void)
-{
- return resources_register_int(resources_int);
-}
-
/* ------------------------------------------------------------------------- */
static const cmdline_option_t cmdline_options[] = {
@@ -421,9 +420,6 @@
old_digital_joystick_init();
#endif
}
-
- {
- }
#ifdef WIN32
#if HAVE_DINPUT
@@ -434,8 +430,8 @@
}
#endif
-#ifdef MSDOS
- joystick_allegro_init();
+#if 0 /*not defined MSDOS and defined ALLEGRO_JOY_DRIVER */
+ joystick_allegro_init(JOY_TYPE_AUTODETECT);
#endif
return 1;
@@ -527,6 +523,10 @@
joy_devices[i]=NULL;
}
}
+ if (joystick_port_map[0] >= JOYDEV_HW_BASE)
+ joystick_port_map[0] = JOYDEV_NONE;
+ if (joystick_port_map[1] >= JOYDEV_HW_BASE)
+ joystick_port_map[1] = JOYDEV_NONE;
}
void joystick_update(void) {
Modified: branches/fabrizio/v1.22.13-newjoydesign/vice/src/joystickdrv/joy_allegro.c
===================================================================
--- branches/fabrizio/v1.22.13-newjoydesign/vice/src/joystickdrv/joy_allegro.c 2008-07-18 20:47:52 UTC (rev 19052)
+++ branches/fabrizio/v1.22.13-newjoydesign/vice/src/joystickdrv/joy_allegro.c 2008-07-19 00:11:56 UTC (rev 19053)
@@ -79,7 +79,7 @@
/* ------------------------------------------------------------------------- */
-static int init_allegro_driver(int type)
+int joystick_allegro_init(int type)
{
int i;
@@ -107,7 +107,7 @@
static int set_joystick_hw_type(int type, void* param)
{
- if (init_allegro_driver(type)){
+ if (joystick_allegro_init(type)){
joystick_hw_type = 0;
return 1;
}
@@ -116,17 +116,14 @@
}
#endif
-int joystick_allegro_init(void)
-{
#ifdef MSDOS
- static const resource_int_t resources_int[] = {
+int joystick_allegro_init_resources(void)
+{
+ const resource_int_t resources_int[] = {
{ "HwJoyType", 0, RES_EVENT_NO, NULL,
&joystick_hw_type, set_joystick_hw_type, NULL },
{ NULL }
};
return resources_register_int(resources_int);
-#else
- init_allegro_driver(JOY_TYPE_AUTODETECT);
-#endif
- return 0;
}
+#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <st...@us...> - 2008-07-18 20:47:44
|
Revision: 19052
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=19052&view=rev
Author: strik
Date: 2008-07-18 20:47:52 +0000 (Fri, 18 Jul 2008)
Log Message:
-----------
Tagged v2.0
Added Paths:
-----------
tags/v2.0/v2.0/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <st...@us...> - 2008-07-18 20:42:45
|
Revision: 19051
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=19051&view=rev
Author: strik
Date: 2008-07-18 20:42:52 +0000 (Fri, 18 Jul 2008)
Log Message:
-----------
Version 2.0 (second try)
Modified Paths:
--------------
trunk/vice/po/de.po
trunk/vice/po/fr.po
trunk/vice/po/hu.po
trunk/vice/po/it.po
trunk/vice/po/nl.po
trunk/vice/po/pl.po
trunk/vice/po/sv.po
Modified: trunk/vice/po/de.po
===================================================================
--- trunk/vice/po/de.po 2008-07-18 20:20:41 UTC (rev 19050)
+++ trunk/vice/po/de.po 2008-07-18 20:42:52 UTC (rev 19051)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: VICE 2.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-18 21:16+0200\n"
+"POT-Creation-Date: 2008-07-18 22:21+0200\n"
"PO-Revision-Date: 2008-07-18 16:38+0200\n"
"Last-Translator: pottendo (pot...@gm...)\n"
"Language-Team: de <de...@li...>\n"
Modified: trunk/vice/po/fr.po
===================================================================
--- trunk/vice/po/fr.po 2008-07-18 20:20:41 UTC (rev 19050)
+++ trunk/vice/po/fr.po 2008-07-18 20:42:52 UTC (rev 19051)
@@ -11,7 +11,7 @@
msgstr ""
"Project-Id-Version: VICE 1.22\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-18 21:16+0200\n"
+"POT-Creation-Date: 2008-07-18 22:21+0200\n"
"PO-Revision-Date: 2007-07-26 11:57+0200\n"
"Last-Translator: Paul Dub\xE9 <dub...@gm...>\n"
"Language-Team: fr <fr...@li...>\n"
Modified: trunk/vice/po/hu.po
===================================================================
--- trunk/vice/po/hu.po 2008-07-18 20:20:41 UTC (rev 19050)
+++ trunk/vice/po/hu.po 2008-07-18 20:42:52 UTC (rev 19051)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: VICE 2.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-18 21:16+0200\n"
+"POT-Creation-Date: 2008-07-18 22:21+0200\n"
"PO-Revision-Date: 2007-07-27 15:58+0200\n"
"Last-Translator: Karai Csaba <cs...@fr...>\n"
"Language-Team: Hungarian <hu...@li...>\n"
Modified: trunk/vice/po/it.po
===================================================================
--- trunk/vice/po/it.po 2008-07-18 20:20:41 UTC (rev 19050)
+++ trunk/vice/po/it.po 2008-07-18 20:42:52 UTC (rev 19051)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: VICE 1.22\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-18 21:16+0200\n"
+"POT-Creation-Date: 2008-07-18 22:21+0200\n"
"PO-Revision-Date: 2007-07-28 14:26+0100\n"
"Last-Translator: Andrea Musuruane <mus...@gm...>\n"
"Language-Team: it <it...@li...>\n"
Modified: trunk/vice/po/nl.po
===================================================================
--- trunk/vice/po/nl.po 2008-07-18 20:20:41 UTC (rev 19050)
+++ trunk/vice/po/nl.po 2008-07-18 20:42:52 UTC (rev 19051)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: VICE 2.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-18 21:16+0200\n"
+"POT-Creation-Date: 2008-07-18 22:21+0200\n"
"PO-Revision-Date: 2008-06-11 11:57+0200\n"
"Last-Translator: Marco van den Heuvel <bla...@ya...>\n"
"Language-Team: nl <nl...@li...>\n"
Modified: trunk/vice/po/pl.po
===================================================================
--- trunk/vice/po/pl.po 2008-07-18 20:20:41 UTC (rev 19050)
+++ trunk/vice/po/pl.po 2008-07-18 20:42:52 UTC (rev 19051)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: VICE 1.22\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-18 21:16+0200\n"
+"POT-Creation-Date: 2008-07-18 22:21+0200\n"
"PO-Revision-Date: 2007-07-26 11:55+0200\n"
"Last-Translator: Mariusz M\xB3ynek <fl...@go...>\n"
"Language-Team: pl <pl...@li...>\n"
Modified: trunk/vice/po/sv.po
===================================================================
--- trunk/vice/po/sv.po 2008-07-18 20:20:41 UTC (rev 19050)
+++ trunk/vice/po/sv.po 2008-07-18 20:42:52 UTC (rev 19051)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: VICE 2.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-18 21:16+0200\n"
+"POT-Creation-Date: 2008-07-18 22:21+0200\n"
"PO-Revision-Date: 2007-07-30 20:49+0100\n"
"Last-Translator: Peter Karlsson <pe...@so...>\n"
"Language-Team: Swedish <tp...@li...>\n"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <st...@us...> - 2008-07-18 20:20:32
|
Revision: 19050
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=19050&view=rev
Author: strik
Date: 2008-07-18 20:20:41 +0000 (Fri, 18 Jul 2008)
Log Message:
-----------
Moved old, wrong v2.0 away.
Added Paths:
-----------
tags/v2.0/v2.0-old/
Removed Paths:
-------------
tags/v2.0/v2.0/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <st...@us...> - 2008-07-18 20:18:31
|
Revision: 19049
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=19049&view=rev
Author: strik
Date: 2008-07-18 20:18:41 +0000 (Fri, 18 Jul 2008)
Log Message:
-----------
VICE 2.0 is not a development release
Modified Paths:
--------------
trunk/vice/configure.in
Modified: trunk/vice/configure.in
===================================================================
--- trunk/vice/configure.in 2008-07-18 19:51:42 UTC (rev 19048)
+++ trunk/vice/configure.in 2008-07-18 20:18:41 UTC (rev 19049)
@@ -15,7 +15,7 @@
AC_SUBST(VICE_VERSION_MINOR)
AC_SUBST(VICE_VERSION_BUILD)
-AC_DEFINE(UNSTABLE,,[Define if this version is unstable.])
+dnl AC_DEFINE(UNSTABLE,,[Define if this version is unstable.])
if test x"$VICE_VERSION_BUILD" = "x" -o x"$VICE_VERSION_BUILD" = "x0" ; then
VICE_VERSION=$VICE_VERSION_MAJOR"."$VICE_VERSION_MINOR
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <st...@us...> - 2008-07-18 19:51:33
|
Revision: 19048
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=19048&view=rev
Author: strik
Date: 2008-07-18 19:51:42 +0000 (Fri, 18 Jul 2008)
Log Message:
-----------
Tagged version 2.0.
Added Paths:
-----------
tags/v2.0/v2.0/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <st...@us...> - 2008-07-18 19:50:27
|
Revision: 19047
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=19047&view=rev
Author: strik
Date: 2008-07-18 19:50:36 +0000 (Fri, 18 Jul 2008)
Log Message:
-----------
Generated new directory for 2.0 line.
Added Paths:
-----------
tags/v2.0/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <st...@us...> - 2008-07-18 19:48:56
|
Revision: 19046
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=19046&view=rev
Author: strik
Date: 2008-07-18 19:49:01 +0000 (Fri, 18 Jul 2008)
Log Message:
-----------
Version 2.0
Modified Paths:
--------------
trunk/vice/ChangeLog
trunk/vice/configure.in
trunk/vice/po/ChangeLog
trunk/vice/po/de.po
trunk/vice/po/fr.po
trunk/vice/po/hu.po
trunk/vice/po/it.po
trunk/vice/po/nl.po
trunk/vice/po/pl.po
trunk/vice/po/sv.po
trunk/vice/src/ChangeLog
trunk/vice/src/version.h
Modified: trunk/vice/ChangeLog
===================================================================
--- trunk/vice/ChangeLog 2008-07-18 19:14:16 UTC (rev 19045)
+++ trunk/vice/ChangeLog 2008-07-18 19:49:01 UTC (rev 19046)
@@ -1,3 +1,7 @@
+2008-07-18 Spiro Trikaliotis <spi...@gm...>
+
+ * Version 2.0
+
2008-07-18 Christian Vogelgsang <ch...@vo...>
* build/macosx/build-vice-release.sh: use provided autogen.sh
Modified: trunk/vice/configure.in
===================================================================
--- trunk/vice/configure.in 2008-07-18 19:14:16 UTC (rev 19045)
+++ trunk/vice/configure.in 2008-07-18 19:49:01 UTC (rev 19046)
@@ -7,9 +7,9 @@
AC_INIT(src/maincpu.c)
-VICE_VERSION_MAJOR=1
-VICE_VERSION_MINOR=22
-VICE_VERSION_BUILD=27
+VICE_VERSION_MAJOR=2
+VICE_VERSION_MINOR=0
+VICE_VERSION_BUILD=0
AC_SUBST(VICE_VERSION_MAJOR)
AC_SUBST(VICE_VERSION_MINOR)
Modified: trunk/vice/po/ChangeLog
===================================================================
--- trunk/vice/po/ChangeLog 2008-07-18 19:14:16 UTC (rev 19045)
+++ trunk/vice/po/ChangeLog 2008-07-18 19:49:01 UTC (rev 19046)
@@ -1,5 +1,9 @@
2008-07-18 Spiro Trikaliotis <spi...@gm...>
+ * Version 2.0
+
+2008-07-18 Spiro Trikaliotis <spi...@gm...>
+
* de.po: Fixed a typo ("StarDIS" -> "StarDOS").
2008-07-18 pottendo <pot...@ao...>
Modified: trunk/vice/po/de.po
===================================================================
--- trunk/vice/po/de.po 2008-07-18 19:14:16 UTC (rev 19045)
+++ trunk/vice/po/de.po 2008-07-18 19:49:01 UTC (rev 19046)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: VICE 2.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-18 17:16+0200\n"
+"POT-Creation-Date: 2008-07-18 21:16+0200\n"
"PO-Revision-Date: 2008-07-18 16:38+0200\n"
"Last-Translator: pottendo (pot...@gm...)\n"
"Language-Team: de <de...@li...>\n"
@@ -104,7 +104,7 @@
#: src/c64/cart/ide64.c:281 src/c64/c64_256k.c:210 src/c64/georam.c:260
#: src/c64/mmc64.c:907 src/c64/mmc64.c:909 src/c64/plus256k.c:175
#: src/c64/plus60k.c:249 src/c64/ramcart.c:284 src/c64/reu.c:478
-#: src/c64/tfe.c:1940 src/cbm2/cbm2-cmdline-options.c:132
+#: src/c64/tfe.c:1942 src/cbm2/cbm2-cmdline-options.c:132
#: src/cbm2/cbm2-cmdline-options.c:134 src/cbm2/cbm2-cmdline-options.c:136
#: src/cbm2/cbm2-cmdline-options.c:139 src/cbm2/cbm2-cmdline-options.c:141
#: src/cbm2/cbm2-cmdline-options.c:143 src/cbm2/cbm2-cmdline-options.c:145
@@ -997,23 +997,23 @@
msgid "Size of the RAM expansion unit"
msgstr "Gr\xF6\xDFe der RAM Speichererweiterung"
-#: src/c64/tfe.c:1936 src/translate.c.po.c:1391
+#: src/c64/tfe.c:1938 src/translate.c.po.c:1391
msgid "Enable the TFE (\"The Final Ethernet\") unit"
msgstr "TFE (\"the final ethernet\") Erweiterung aktivitieren"
-#: src/c64/tfe.c:1938 src/translate.c.po.c:1401
+#: src/c64/tfe.c:1940 src/translate.c.po.c:1401
msgid "Disable the TFE (\"The Final Ethernet\") unit"
msgstr "TFE (\"the final ethernet\") Erweiterung deaktivitieren"
-#: src/c64/tfe.c:1940 src/translate.c.po.c:1411
+#: src/c64/tfe.c:1942 src/translate.c.po.c:1411
msgid "Set the system ethernet interface for TFE emulation"
msgstr "Setze die System Ethernet Schnittstelle f\xFCr die TFE Emulation"
-#: src/c64/tfe.c:1942 src/translate.c.po.c:1421
+#: src/c64/tfe.c:1944 src/translate.c.po.c:1421
msgid "Enable RRNet mode of TFE emulation"
msgstr "RRNet Modus der TFE Emulation aktivieren"
-#: src/c64/tfe.c:1944 src/translate.c.po.c:1431
+#: src/c64/tfe.c:1946 src/translate.c.po.c:1431
msgid "Disable RRNet mode of TFE emulation"
msgstr "RRNet Modus der TFE Emulation deaktivieren"
Modified: trunk/vice/po/fr.po
===================================================================
--- trunk/vice/po/fr.po 2008-07-18 19:14:16 UTC (rev 19045)
+++ trunk/vice/po/fr.po 2008-07-18 19:49:01 UTC (rev 19046)
@@ -11,7 +11,7 @@
msgstr ""
"Project-Id-Version: VICE 1.22\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-16 06:53+0200\n"
+"POT-Creation-Date: 2008-07-18 21:16+0200\n"
"PO-Revision-Date: 2007-07-26 11:57+0200\n"
"Last-Translator: Paul Dub\xE9 <dub...@gm...>\n"
"Language-Team: fr <fr...@li...>\n"
@@ -108,7 +108,7 @@
#: src/c64/cart/ide64.c:281 src/c64/c64_256k.c:210 src/c64/georam.c:260
#: src/c64/mmc64.c:907 src/c64/mmc64.c:909 src/c64/plus256k.c:175
#: src/c64/plus60k.c:249 src/c64/ramcart.c:284 src/c64/reu.c:478
-#: src/c64/tfe.c:1940 src/cbm2/cbm2-cmdline-options.c:132
+#: src/c64/tfe.c:1942 src/cbm2/cbm2-cmdline-options.c:132
#: src/cbm2/cbm2-cmdline-options.c:134 src/cbm2/cbm2-cmdline-options.c:136
#: src/cbm2/cbm2-cmdline-options.c:139 src/cbm2/cbm2-cmdline-options.c:141
#: src/cbm2/cbm2-cmdline-options.c:143 src/cbm2/cbm2-cmdline-options.c:145
@@ -1043,26 +1043,26 @@
msgid "Size of the RAM expansion unit"
msgstr "Taille de l'unit\xE9 d'expansion RAM"
-#: src/c64/tfe.c:1936 src/translate.c.po.c:1391
+#: src/c64/tfe.c:1938 src/translate.c.po.c:1391
#, fuzzy
msgid "Enable the TFE (\"The Final Ethernet\") unit"
msgstr "Activer l'unit\xE9 TFE (\"The Final Ethernet\")"
-#: src/c64/tfe.c:1938 src/translate.c.po.c:1401
+#: src/c64/tfe.c:1940 src/translate.c.po.c:1401
#, fuzzy
msgid "Disable the TFE (\"The Final Ethernet\") unit"
msgstr "D\xE9sactiver l'unit\xE9 TFE"
-#: src/c64/tfe.c:1940 src/translate.c.po.c:1411
+#: src/c64/tfe.c:1942 src/translate.c.po.c:1411
msgid "Set the system ethernet interface for TFE emulation"
msgstr ""
-#: src/c64/tfe.c:1942 src/translate.c.po.c:1421
+#: src/c64/tfe.c:1944 src/translate.c.po.c:1421
#, fuzzy
msgid "Enable RRNet mode of TFE emulation"
msgstr "*Activer l'\xE9mulation r\xE9elle de lecteur"
-#: src/c64/tfe.c:1944 src/translate.c.po.c:1431
+#: src/c64/tfe.c:1946 src/translate.c.po.c:1431
#, fuzzy
msgid "Disable RRNet mode of TFE emulation"
msgstr "D\xE9sactiver l'\xE9mulation de p\xE9riph\xE9rique RS232 userport"
@@ -3416,7 +3416,7 @@
msgstr "\xC0 propos de VICE..."
#: src/arch/unix/gui/uicommands.c:569 src/arch/unix/gui/uidatasette.c:98
-#: src/arch/unix/x11/gnome/uipalcontrol.c:189
+#: src/arch/unix/x11/gnome/uipalcontrol.c:190
#: src/arch/unix/x11/gnome/x11ui.c:1822 src/arch/amigaos/intl.c.po.c:312
msgid "Reset"
msgstr "R\xE9initialiser"
@@ -4267,7 +4267,7 @@
msgid "Scanline Shade in percent"
msgstr "Opacit\xE9 de l'ombrage (%)"
-#: src/arch/unix/gui/uipalemu.c:88 src/arch/unix/gui/uipalemu.c:148
+#: src/arch/unix/gui/uipalemu.c:88 src/arch/unix/gui/uipalemu.c:150
msgid "New PAL Tint"
msgstr ""
@@ -4294,7 +4294,7 @@
msgid "Offset in percent"
msgstr "Quantit\xE9 de flou (%)"
-#: src/arch/unix/gui/uipalemu.c:110 src/arch/unix/gui/uipalemu.c:146
+#: src/arch/unix/gui/uipalemu.c:110 src/arch/unix/gui/uipalemu.c:148
msgid "PAL Blurredness"
msgstr "Flou PAL"
@@ -4310,25 +4310,25 @@
msgid "*Fast PAL Emulation"
msgstr "*\xC9mulation PAL rapide"
-#: src/arch/unix/gui/uipalemu.c:138
+#: src/arch/unix/gui/uipalemu.c:139
#, fuzzy
msgid "*Old Exact PAL Emulation"
msgstr "*\xC9mulation exacte PAL"
-#: src/arch/unix/gui/uipalemu.c:140
+#: src/arch/unix/gui/uipalemu.c:142
#, fuzzy
msgid "*New Exact PAL Emulation"
msgstr "*\xC9mulation exacte PAL"
-#: src/arch/unix/gui/uipalemu.c:144
+#: src/arch/unix/gui/uipalemu.c:146
msgid "PAL Scanline Shade"
msgstr "Ombrage des scanlines PAL"
-#: src/arch/unix/gui/uipalemu.c:150
+#: src/arch/unix/gui/uipalemu.c:152
msgid "New PAL Odd Lines Phase"
msgstr ""
-#: src/arch/unix/gui/uipalemu.c:152
+#: src/arch/unix/gui/uipalemu.c:154
msgid "New PAL Odd Lines Offset"
msgstr ""
@@ -5595,58 +5595,58 @@
msgid "Can't create image `%s'."
msgstr "Impossible de cr\xE9er l'image `%s'."
-#: src/arch/unix/x11/gnome/uipalcontrol.c:49
+#: src/arch/unix/x11/gnome/uipalcontrol.c:52
msgid "Blurredness"
msgstr "Quantit\xE9 de flou"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:50
+#: src/arch/unix/x11/gnome/uipalcontrol.c:53
msgid "Scanline Shade"
msgstr "Ombrage des scanlines"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:51 src/arch/win32/res.rc.po.c:2817
+#: src/arch/unix/x11/gnome/uipalcontrol.c:54 src/arch/win32/res.rc.po.c:2817
msgid "Saturation"
msgstr "Saturation"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:52 src/arch/win32/res.rc.po.c:2820
+#: src/arch/unix/x11/gnome/uipalcontrol.c:55 src/arch/win32/res.rc.po.c:2820
msgid "Contrast"
msgstr "Contraste"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:53 src/arch/win32/res.rc.po.c:2823
+#: src/arch/unix/x11/gnome/uipalcontrol.c:56 src/arch/win32/res.rc.po.c:2823
msgid "Brightness"
msgstr "Luminosit\xE9"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:54 src/arch/win32/res.rc.po.c:3093
+#: src/arch/unix/x11/gnome/uipalcontrol.c:57 src/arch/win32/res.rc.po.c:3093
msgid "Gamma"
msgstr "Intensit\xE9"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:55 src/arch/win32/res.rc.po.c:2955
+#: src/arch/unix/x11/gnome/uipalcontrol.c:58 src/arch/win32/res.rc.po.c:2955
#, fuzzy
msgid "Tint"
msgstr "&Imprimer"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:56
+#: src/arch/unix/x11/gnome/uipalcontrol.c:59
msgid "Odd Line Phase"
msgstr ""
-#: src/arch/unix/x11/gnome/uipalcontrol.c:57
+#: src/arch/unix/x11/gnome/uipalcontrol.c:60
msgid "Odd Line Offset"
msgstr ""
-#: src/arch/unix/x11/gnome/uipalcontrol.c:145
+#: src/arch/unix/x11/gnome/uipalcontrol.c:146
msgid "PAL Settings"
msgstr "Param\xE8tres PAL"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:198
+#: src/arch/unix/x11/gnome/uipalcontrol.c:199
#, fuzzy
msgid "Fast"
msgstr "*Rapide"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:205 src/arch/win32/res.rc.po.c:5197
+#: src/arch/unix/x11/gnome/uipalcontrol.c:207 src/arch/win32/res.rc.po.c:5197
#: src/arch/amigaos/intl.c.po.c:3755
msgid "Exact"
msgstr "Exact"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:211
+#: src/arch/unix/x11/gnome/uipalcontrol.c:214
#, fuzzy
msgid "New Exact"
msgstr "Exact"
Modified: trunk/vice/po/hu.po
===================================================================
--- trunk/vice/po/hu.po 2008-07-18 19:14:16 UTC (rev 19045)
+++ trunk/vice/po/hu.po 2008-07-18 19:49:01 UTC (rev 19046)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: VICE 2.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-16 06:53+0200\n"
+"POT-Creation-Date: 2008-07-18 21:16+0200\n"
"PO-Revision-Date: 2007-07-27 15:58+0200\n"
"Last-Translator: Karai Csaba <cs...@fr...>\n"
"Language-Team: Hungarian <hu...@li...>\n"
@@ -105,7 +105,7 @@
#: src/c64/cart/ide64.c:281 src/c64/c64_256k.c:210 src/c64/georam.c:260
#: src/c64/mmc64.c:907 src/c64/mmc64.c:909 src/c64/plus256k.c:175
#: src/c64/plus60k.c:249 src/c64/ramcart.c:284 src/c64/reu.c:478
-#: src/c64/tfe.c:1940 src/cbm2/cbm2-cmdline-options.c:132
+#: src/c64/tfe.c:1942 src/cbm2/cbm2-cmdline-options.c:132
#: src/cbm2/cbm2-cmdline-options.c:134 src/cbm2/cbm2-cmdline-options.c:136
#: src/cbm2/cbm2-cmdline-options.c:139 src/cbm2/cbm2-cmdline-options.c:141
#: src/cbm2/cbm2-cmdline-options.c:143 src/cbm2/cbm2-cmdline-options.c:145
@@ -1005,23 +1005,23 @@
msgid "Size of the RAM expansion unit"
msgstr "RAM Expansion Unit m\xE9rete"
-#: src/c64/tfe.c:1936 src/translate.c.po.c:1391
+#: src/c64/tfe.c:1938 src/translate.c.po.c:1391
msgid "Enable the TFE (\"The Final Ethernet\") unit"
msgstr "TFE (\"the final ethernet\") egys\xE9g enged\xE9lyez\xE9se"
-#: src/c64/tfe.c:1938 src/translate.c.po.c:1401
+#: src/c64/tfe.c:1940 src/translate.c.po.c:1401
msgid "Disable the TFE (\"The Final Ethernet\") unit"
msgstr "TFE (\"the final ethernet\") egys\xE9g tilt\xE1sa"
-#: src/c64/tfe.c:1940 src/translate.c.po.c:1411
+#: src/c64/tfe.c:1942 src/translate.c.po.c:1411
msgid "Set the system ethernet interface for TFE emulation"
msgstr "Rendszer ethernet eszk\xF6z be\xE1ll\xEDt\xE1sa TFE emul\xE1ci\xF3hoz"
-#: src/c64/tfe.c:1942 src/translate.c.po.c:1421
+#: src/c64/tfe.c:1944 src/translate.c.po.c:1421
msgid "Enable RRNet mode of TFE emulation"
msgstr "RRNet m\xF3d enged\xE9lyez\xE9se TFE emul\xE1ci\xF3hoz"
-#: src/c64/tfe.c:1944 src/translate.c.po.c:1431
+#: src/c64/tfe.c:1946 src/translate.c.po.c:1431
msgid "Disable RRNet mode of TFE emulation"
msgstr "RRNet m\xF3d tilt\xE1sa TFE emul\xE1ci\xF3hoz"
@@ -3342,7 +3342,7 @@
msgstr "A VICE-r\xF3l..."
#: src/arch/unix/gui/uicommands.c:569 src/arch/unix/gui/uidatasette.c:98
-#: src/arch/unix/x11/gnome/uipalcontrol.c:189
+#: src/arch/unix/x11/gnome/uipalcontrol.c:190
#: src/arch/unix/x11/gnome/x11ui.c:1822 src/arch/amigaos/intl.c.po.c:312
msgid "Reset"
msgstr "Reset"
@@ -4154,7 +4154,7 @@
msgid "Scanline Shade in percent"
msgstr "P\xE1szta \xE1rnyal\xE1s sz\xE1zal\xE9kban"
-#: src/arch/unix/gui/uipalemu.c:88 src/arch/unix/gui/uipalemu.c:148
+#: src/arch/unix/gui/uipalemu.c:88 src/arch/unix/gui/uipalemu.c:150
msgid "New PAL Tint"
msgstr ""
@@ -4181,7 +4181,7 @@
msgid "Offset in percent"
msgstr "Elmos\xE1s sz\xE1zal\xE9kban"
-#: src/arch/unix/gui/uipalemu.c:110 src/arch/unix/gui/uipalemu.c:146
+#: src/arch/unix/gui/uipalemu.c:110 src/arch/unix/gui/uipalemu.c:148
msgid "PAL Blurredness"
msgstr "PAL elmos\xE1s"
@@ -4197,25 +4197,25 @@
msgid "*Fast PAL Emulation"
msgstr "*Gyors PAL emul\xE1ci\xF3"
-#: src/arch/unix/gui/uipalemu.c:138
+#: src/arch/unix/gui/uipalemu.c:139
#, fuzzy
msgid "*Old Exact PAL Emulation"
msgstr "*Pontos PAL emul\xE1ci\xF3"
-#: src/arch/unix/gui/uipalemu.c:140
+#: src/arch/unix/gui/uipalemu.c:142
#, fuzzy
msgid "*New Exact PAL Emulation"
msgstr "*Pontos PAL emul\xE1ci\xF3"
-#: src/arch/unix/gui/uipalemu.c:144
+#: src/arch/unix/gui/uipalemu.c:146
msgid "PAL Scanline Shade"
msgstr "PAL p\xE1szta \xE1rnyal\xE1s"
-#: src/arch/unix/gui/uipalemu.c:150
+#: src/arch/unix/gui/uipalemu.c:152
msgid "New PAL Odd Lines Phase"
msgstr ""
-#: src/arch/unix/gui/uipalemu.c:152
+#: src/arch/unix/gui/uipalemu.c:154
msgid "New PAL Odd Lines Offset"
msgstr ""
@@ -5462,58 +5462,58 @@
msgid "Can't create image `%s'."
msgstr "Nem siker\xFClt `%s' k\xE9pm\xE1st l\xE9trehozni."
-#: src/arch/unix/x11/gnome/uipalcontrol.c:49
+#: src/arch/unix/x11/gnome/uipalcontrol.c:52
msgid "Blurredness"
msgstr "Elmos\xE1s"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:50
+#: src/arch/unix/x11/gnome/uipalcontrol.c:53
msgid "Scanline Shade"
msgstr "P\xE1szta \xE1rnyal\xE1s"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:51 src/arch/win32/res.rc.po.c:2817
+#: src/arch/unix/x11/gnome/uipalcontrol.c:54 src/arch/win32/res.rc.po.c:2817
msgid "Saturation"
msgstr "Tel\xEDtetts\xE9g"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:52 src/arch/win32/res.rc.po.c:2820
+#: src/arch/unix/x11/gnome/uipalcontrol.c:55 src/arch/win32/res.rc.po.c:2820
msgid "Contrast"
msgstr "Kontraszt"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:53 src/arch/win32/res.rc.po.c:2823
+#: src/arch/unix/x11/gnome/uipalcontrol.c:56 src/arch/win32/res.rc.po.c:2823
msgid "Brightness"
msgstr "F\xE9nyess\xE9g"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:54 src/arch/win32/res.rc.po.c:3093
+#: src/arch/unix/x11/gnome/uipalcontrol.c:57 src/arch/win32/res.rc.po.c:3093
msgid "Gamma"
msgstr "Gamma"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:55 src/arch/win32/res.rc.po.c:2955
+#: src/arch/unix/x11/gnome/uipalcontrol.c:58 src/arch/win32/res.rc.po.c:2955
#, fuzzy
msgid "Tint"
msgstr "Kliens"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:56
+#: src/arch/unix/x11/gnome/uipalcontrol.c:59
msgid "Odd Line Phase"
msgstr ""
-#: src/arch/unix/x11/gnome/uipalcontrol.c:57
+#: src/arch/unix/x11/gnome/uipalcontrol.c:60
msgid "Odd Line Offset"
msgstr ""
-#: src/arch/unix/x11/gnome/uipalcontrol.c:145
+#: src/arch/unix/x11/gnome/uipalcontrol.c:146
msgid "PAL Settings"
msgstr "PAL Be\xE1ll\xEDt\xE1sai"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:198
+#: src/arch/unix/x11/gnome/uipalcontrol.c:199
#, fuzzy
msgid "Fast"
msgstr "*Gyors"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:205 src/arch/win32/res.rc.po.c:5197
+#: src/arch/unix/x11/gnome/uipalcontrol.c:207 src/arch/win32/res.rc.po.c:5197
#: src/arch/amigaos/intl.c.po.c:3755
msgid "Exact"
msgstr "Pontos"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:211
+#: src/arch/unix/x11/gnome/uipalcontrol.c:214
#, fuzzy
msgid "New Exact"
msgstr "Pontos"
Modified: trunk/vice/po/it.po
===================================================================
--- trunk/vice/po/it.po 2008-07-18 19:14:16 UTC (rev 19045)
+++ trunk/vice/po/it.po 2008-07-18 19:49:01 UTC (rev 19046)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: VICE 1.22\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-16 06:53+0200\n"
+"POT-Creation-Date: 2008-07-18 21:16+0200\n"
"PO-Revision-Date: 2007-07-28 14:26+0100\n"
"Last-Translator: Andrea Musuruane <mus...@gm...>\n"
"Language-Team: it <it...@li...>\n"
@@ -104,7 +104,7 @@
#: src/c64/cart/ide64.c:281 src/c64/c64_256k.c:210 src/c64/georam.c:260
#: src/c64/mmc64.c:907 src/c64/mmc64.c:909 src/c64/plus256k.c:175
#: src/c64/plus60k.c:249 src/c64/ramcart.c:284 src/c64/reu.c:478
-#: src/c64/tfe.c:1940 src/cbm2/cbm2-cmdline-options.c:132
+#: src/c64/tfe.c:1942 src/cbm2/cbm2-cmdline-options.c:132
#: src/cbm2/cbm2-cmdline-options.c:134 src/cbm2/cbm2-cmdline-options.c:136
#: src/cbm2/cbm2-cmdline-options.c:139 src/cbm2/cbm2-cmdline-options.c:141
#: src/cbm2/cbm2-cmdline-options.c:143 src/cbm2/cbm2-cmdline-options.c:145
@@ -1028,23 +1028,23 @@
msgid "Size of the RAM expansion unit"
msgstr "Dimensione dell'espansione di RAM"
-#: src/c64/tfe.c:1936 src/translate.c.po.c:1391
+#: src/c64/tfe.c:1938 src/translate.c.po.c:1391
msgid "Enable the TFE (\"The Final Ethernet\") unit"
msgstr "Attiva l'unit\xE0 TFE (\"The Final Ethernet\")"
-#: src/c64/tfe.c:1938 src/translate.c.po.c:1401
+#: src/c64/tfe.c:1940 src/translate.c.po.c:1401
msgid "Disable the TFE (\"The Final Ethernet\") unit"
msgstr "Disattiva l'unit\xE0 TFE (\"The Final Ethernet\")"
-#: src/c64/tfe.c:1940 src/translate.c.po.c:1411
+#: src/c64/tfe.c:1942 src/translate.c.po.c:1411
msgid "Set the system ethernet interface for TFE emulation"
msgstr "Imposta l'interfaccia ethernet per l'emulazione TFE"
-#: src/c64/tfe.c:1942 src/translate.c.po.c:1421
+#: src/c64/tfe.c:1944 src/translate.c.po.c:1421
msgid "Enable RRNet mode of TFE emulation"
msgstr "Attiva la modalit\xE0 RRNet dell'emulazione TFE"
-#: src/c64/tfe.c:1944 src/translate.c.po.c:1431
+#: src/c64/tfe.c:1946 src/translate.c.po.c:1431
msgid "Disable RRNet mode of TFE emulation"
msgstr "Disattiva la modalit\xE0 RRNet dell'emulazione TFE"
@@ -3382,7 +3382,7 @@
msgstr "Informazioni su VICE..."
#: src/arch/unix/gui/uicommands.c:569 src/arch/unix/gui/uidatasette.c:98
-#: src/arch/unix/x11/gnome/uipalcontrol.c:189
+#: src/arch/unix/x11/gnome/uipalcontrol.c:190
#: src/arch/unix/x11/gnome/x11ui.c:1822 src/arch/amigaos/intl.c.po.c:312
msgid "Reset"
msgstr "Reset"
@@ -4196,7 +4196,7 @@
msgid "Scanline Shade in percent"
msgstr "Ombra della scanline in percentuale"
-#: src/arch/unix/gui/uipalemu.c:88 src/arch/unix/gui/uipalemu.c:148
+#: src/arch/unix/gui/uipalemu.c:88 src/arch/unix/gui/uipalemu.c:150
msgid "New PAL Tint"
msgstr ""
@@ -4223,7 +4223,7 @@
msgid "Offset in percent"
msgstr "Sfuocatura in percentuale"
-#: src/arch/unix/gui/uipalemu.c:110 src/arch/unix/gui/uipalemu.c:146
+#: src/arch/unix/gui/uipalemu.c:110 src/arch/unix/gui/uipalemu.c:148
msgid "PAL Blurredness"
msgstr "Sfuocatura PAL"
@@ -4239,25 +4239,25 @@
msgid "*Fast PAL Emulation"
msgstr "*Emulazione PAL veloce"
-#: src/arch/unix/gui/uipalemu.c:138
+#: src/arch/unix/gui/uipalemu.c:139
#, fuzzy
msgid "*Old Exact PAL Emulation"
msgstr "*Emulazione PAL esatta"
-#: src/arch/unix/gui/uipalemu.c:140
+#: src/arch/unix/gui/uipalemu.c:142
#, fuzzy
msgid "*New Exact PAL Emulation"
msgstr "*Emulazione PAL esatta"
-#: src/arch/unix/gui/uipalemu.c:144
+#: src/arch/unix/gui/uipalemu.c:146
msgid "PAL Scanline Shade"
msgstr "Ombra della scanline PAL"
-#: src/arch/unix/gui/uipalemu.c:150
+#: src/arch/unix/gui/uipalemu.c:152
msgid "New PAL Odd Lines Phase"
msgstr ""
-#: src/arch/unix/gui/uipalemu.c:152
+#: src/arch/unix/gui/uipalemu.c:154
msgid "New PAL Odd Lines Offset"
msgstr ""
@@ -5505,58 +5505,58 @@
msgid "Can't create image `%s'."
msgstr "Non \xE8 possibile creare l'immagine `%s'."
-#: src/arch/unix/x11/gnome/uipalcontrol.c:49
+#: src/arch/unix/x11/gnome/uipalcontrol.c:52
msgid "Blurredness"
msgstr "Sfuocatura"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:50
+#: src/arch/unix/x11/gnome/uipalcontrol.c:53
msgid "Scanline Shade"
msgstr "Ombra scanline"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:51 src/arch/win32/res.rc.po.c:2817
+#: src/arch/unix/x11/gnome/uipalcontrol.c:54 src/arch/win32/res.rc.po.c:2817
msgid "Saturation"
msgstr "Saturazione"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:52 src/arch/win32/res.rc.po.c:2820
+#: src/arch/unix/x11/gnome/uipalcontrol.c:55 src/arch/win32/res.rc.po.c:2820
msgid "Contrast"
msgstr "Contrasto"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:53 src/arch/win32/res.rc.po.c:2823
+#: src/arch/unix/x11/gnome/uipalcontrol.c:56 src/arch/win32/res.rc.po.c:2823
msgid "Brightness"
msgstr "Luminosit\xE0"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:54 src/arch/win32/res.rc.po.c:3093
+#: src/arch/unix/x11/gnome/uipalcontrol.c:57 src/arch/win32/res.rc.po.c:3093
msgid "Gamma"
msgstr "Gamma"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:55 src/arch/win32/res.rc.po.c:2955
+#: src/arch/unix/x11/gnome/uipalcontrol.c:58 src/arch/win32/res.rc.po.c:2955
#, fuzzy
msgid "Tint"
msgstr "Client"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:56
+#: src/arch/unix/x11/gnome/uipalcontrol.c:59
msgid "Odd Line Phase"
msgstr ""
-#: src/arch/unix/x11/gnome/uipalcontrol.c:57
+#: src/arch/unix/x11/gnome/uipalcontrol.c:60
msgid "Odd Line Offset"
msgstr ""
-#: src/arch/unix/x11/gnome/uipalcontrol.c:145
+#: src/arch/unix/x11/gnome/uipalcontrol.c:146
msgid "PAL Settings"
msgstr "Impostazioni PAL"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:198
+#: src/arch/unix/x11/gnome/uipalcontrol.c:199
#, fuzzy
msgid "Fast"
msgstr "*Veloce"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:205 src/arch/win32/res.rc.po.c:5197
+#: src/arch/unix/x11/gnome/uipalcontrol.c:207 src/arch/win32/res.rc.po.c:5197
#: src/arch/amigaos/intl.c.po.c:3755
msgid "Exact"
msgstr "Esatta"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:211
+#: src/arch/unix/x11/gnome/uipalcontrol.c:214
#, fuzzy
msgid "New Exact"
msgstr "Esatta"
Modified: trunk/vice/po/nl.po
===================================================================
--- trunk/vice/po/nl.po 2008-07-18 19:14:16 UTC (rev 19045)
+++ trunk/vice/po/nl.po 2008-07-18 19:49:01 UTC (rev 19046)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: VICE 2.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-16 06:53+0200\n"
+"POT-Creation-Date: 2008-07-18 21:16+0200\n"
"PO-Revision-Date: 2008-06-11 11:57+0200\n"
"Last-Translator: Marco van den Heuvel <bla...@ya...>\n"
"Language-Team: nl <nl...@li...>\n"
@@ -108,7 +108,7 @@
#: src/c64/cart/ide64.c:281 src/c64/c64_256k.c:210 src/c64/georam.c:260
#: src/c64/mmc64.c:907 src/c64/mmc64.c:909 src/c64/plus256k.c:175
#: src/c64/plus60k.c:249 src/c64/ramcart.c:284 src/c64/reu.c:478
-#: src/c64/tfe.c:1940 src/cbm2/cbm2-cmdline-options.c:132
+#: src/c64/tfe.c:1942 src/cbm2/cbm2-cmdline-options.c:132
#: src/cbm2/cbm2-cmdline-options.c:134 src/cbm2/cbm2-cmdline-options.c:136
#: src/cbm2/cbm2-cmdline-options.c:139 src/cbm2/cbm2-cmdline-options.c:141
#: src/cbm2/cbm2-cmdline-options.c:143 src/cbm2/cbm2-cmdline-options.c:145
@@ -1003,23 +1003,23 @@
msgid "Size of the RAM expansion unit"
msgstr "Grootte van de RAM-uitbreidingseenheid (REU)"
-#: src/c64/tfe.c:1936 src/translate.c.po.c:1391
+#: src/c64/tfe.c:1938 src/translate.c.po.c:1391
msgid "Enable the TFE (\"The Final Ethernet\") unit"
msgstr "Activeer de TFE (\"The Final Ethernet\")-eenheid"
-#: src/c64/tfe.c:1938 src/translate.c.po.c:1401
+#: src/c64/tfe.c:1940 src/translate.c.po.c:1401
msgid "Disable the TFE (\"The Final Ethernet\") unit"
msgstr "De TFE (\"The Final Ethernet\")-eenheid uitschakelen"
-#: src/c64/tfe.c:1940 src/translate.c.po.c:1411
+#: src/c64/tfe.c:1942 src/translate.c.po.c:1411
msgid "Set the system ethernet interface for TFE emulation"
msgstr "Zet de systeem ethernetinterface voor de TFE-emulatie"
-#: src/c64/tfe.c:1942 src/translate.c.po.c:1421
+#: src/c64/tfe.c:1944 src/translate.c.po.c:1421
msgid "Enable RRNet mode of TFE emulation"
msgstr "Activeer RRNet-modus van de TFE-emulatie"
-#: src/c64/tfe.c:1944 src/translate.c.po.c:1431
+#: src/c64/tfe.c:1946 src/translate.c.po.c:1431
msgid "Disable RRNet mode of TFE emulation"
msgstr "RRNet-modus van de TFE-emulatie uitschakelen"
@@ -3350,7 +3350,7 @@
msgstr "Over VICE..."
#: src/arch/unix/gui/uicommands.c:569 src/arch/unix/gui/uidatasette.c:98
-#: src/arch/unix/x11/gnome/uipalcontrol.c:189
+#: src/arch/unix/x11/gnome/uipalcontrol.c:190
#: src/arch/unix/x11/gnome/x11ui.c:1822 src/arch/amigaos/intl.c.po.c:312
msgid "Reset"
msgstr "Reset"
@@ -4163,7 +4163,7 @@
msgid "Scanline Shade in percent"
msgstr "Scanlijnschaduw in procent"
-#: src/arch/unix/gui/uipalemu.c:88 src/arch/unix/gui/uipalemu.c:148
+#: src/arch/unix/gui/uipalemu.c:88 src/arch/unix/gui/uipalemu.c:150
msgid "New PAL Tint"
msgstr "Nieuwe PAL Tint"
@@ -4187,7 +4187,7 @@
msgid "Offset in percent"
msgstr "Compensatie in procent"
-#: src/arch/unix/gui/uipalemu.c:110 src/arch/unix/gui/uipalemu.c:146
+#: src/arch/unix/gui/uipalemu.c:110 src/arch/unix/gui/uipalemu.c:148
msgid "PAL Blurredness"
msgstr "PAL-wazigheid"
@@ -4203,23 +4203,23 @@
msgid "*Fast PAL Emulation"
msgstr "*Snelle PAL-emulatie"
-#: src/arch/unix/gui/uipalemu.c:138
+#: src/arch/unix/gui/uipalemu.c:139
msgid "*Old Exact PAL Emulation"
msgstr "*Oude Exacte PAL-emulatie"
-#: src/arch/unix/gui/uipalemu.c:140
+#: src/arch/unix/gui/uipalemu.c:142
msgid "*New Exact PAL Emulation"
msgstr "*Nieuwe Exacte PAL-emulatie"
-#: src/arch/unix/gui/uipalemu.c:144
+#: src/arch/unix/gui/uipalemu.c:146
msgid "PAL Scanline Shade"
msgstr "PAL-scanlijnschaduw"
-#: src/arch/unix/gui/uipalemu.c:150
+#: src/arch/unix/gui/uipalemu.c:152
msgid "New PAL Odd Lines Phase"
msgstr "Nieuwe PAL oneven lijnen fase"
-#: src/arch/unix/gui/uipalemu.c:152
+#: src/arch/unix/gui/uipalemu.c:154
msgid "New PAL Odd Lines Offset"
msgstr "Nieuwe PAL oneven lijnen compensatie"
@@ -5465,56 +5465,56 @@
msgid "Can't create image `%s'."
msgstr "Kan bestand `%s' niet maken."
-#: src/arch/unix/x11/gnome/uipalcontrol.c:49
+#: src/arch/unix/x11/gnome/uipalcontrol.c:52
msgid "Blurredness"
msgstr "Wazigheid"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:50
+#: src/arch/unix/x11/gnome/uipalcontrol.c:53
msgid "Scanline Shade"
msgstr "Scanlijnschaduw"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:51 src/arch/win32/res.rc.po.c:2817
+#: src/arch/unix/x11/gnome/uipalcontrol.c:54 src/arch/win32/res.rc.po.c:2817
msgid "Saturation"
msgstr "Verzadiging"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:52 src/arch/win32/res.rc.po.c:2820
+#: src/arch/unix/x11/gnome/uipalcontrol.c:55 src/arch/win32/res.rc.po.c:2820
msgid "Contrast"
msgstr "Contrast"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:53 src/arch/win32/res.rc.po.c:2823
+#: src/arch/unix/x11/gnome/uipalcontrol.c:56 src/arch/win32/res.rc.po.c:2823
msgid "Brightness"
msgstr "Helderheid"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:54 src/arch/win32/res.rc.po.c:3093
+#: src/arch/unix/x11/gnome/uipalcontrol.c:57 src/arch/win32/res.rc.po.c:3093
msgid "Gamma"
msgstr "Gamma"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:55 src/arch/win32/res.rc.po.c:2955
+#: src/arch/unix/x11/gnome/uipalcontrol.c:58 src/arch/win32/res.rc.po.c:2955
msgid "Tint"
msgstr "Tint"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:56
+#: src/arch/unix/x11/gnome/uipalcontrol.c:59
msgid "Odd Line Phase"
msgstr "Oneven lijnen fase"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:57
+#: src/arch/unix/x11/gnome/uipalcontrol.c:60
msgid "Odd Line Offset"
msgstr "Oneven lijnen compensatie"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:145
+#: src/arch/unix/x11/gnome/uipalcontrol.c:146
msgid "PAL Settings"
msgstr "PAL-instellingen"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:198
+#: src/arch/unix/x11/gnome/uipalcontrol.c:199
msgid "Fast"
msgstr "Snel"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:205 src/arch/win32/res.rc.po.c:5197
+#: src/arch/unix/x11/gnome/uipalcontrol.c:207 src/arch/win32/res.rc.po.c:5197
#: src/arch/amigaos/intl.c.po.c:3755
msgid "Exact"
msgstr "Exact"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:211
+#: src/arch/unix/x11/gnome/uipalcontrol.c:214
msgid "New Exact"
msgstr "Nieuw Exact"
Modified: trunk/vice/po/pl.po
===================================================================
--- trunk/vice/po/pl.po 2008-07-18 19:14:16 UTC (rev 19045)
+++ trunk/vice/po/pl.po 2008-07-18 19:49:01 UTC (rev 19046)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: VICE 1.22\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-16 06:53+0200\n"
+"POT-Creation-Date: 2008-07-18 21:16+0200\n"
"PO-Revision-Date: 2007-07-26 11:55+0200\n"
"Last-Translator: Mariusz M\xB3ynek <fl...@go...>\n"
"Language-Team: pl <pl...@li...>\n"
@@ -108,7 +108,7 @@
#: src/c64/cart/ide64.c:281 src/c64/c64_256k.c:210 src/c64/georam.c:260
#: src/c64/mmc64.c:907 src/c64/mmc64.c:909 src/c64/plus256k.c:175
#: src/c64/plus60k.c:249 src/c64/ramcart.c:284 src/c64/reu.c:478
-#: src/c64/tfe.c:1940 src/cbm2/cbm2-cmdline-options.c:132
+#: src/c64/tfe.c:1942 src/cbm2/cbm2-cmdline-options.c:132
#: src/cbm2/cbm2-cmdline-options.c:134 src/cbm2/cbm2-cmdline-options.c:136
#: src/cbm2/cbm2-cmdline-options.c:139 src/cbm2/cbm2-cmdline-options.c:141
#: src/cbm2/cbm2-cmdline-options.c:143 src/cbm2/cbm2-cmdline-options.c:145
@@ -1105,25 +1105,25 @@
msgid "Size of the RAM expansion unit"
msgstr "Jednostka rozszerzenia RAM"
-#: src/c64/tfe.c:1936 src/translate.c.po.c:1391
+#: src/c64/tfe.c:1938 src/translate.c.po.c:1391
msgid "Enable the TFE (\"The Final Ethernet\") unit"
msgstr ""
-#: src/c64/tfe.c:1938 src/translate.c.po.c:1401
+#: src/c64/tfe.c:1940 src/translate.c.po.c:1401
msgid "Disable the TFE (\"The Final Ethernet\") unit"
msgstr ""
-#: src/c64/tfe.c:1940 src/translate.c.po.c:1411
+#: src/c64/tfe.c:1942 src/translate.c.po.c:1411
msgid "Set the system ethernet interface for TFE emulation"
msgstr ""
-#: src/c64/tfe.c:1942 src/translate.c.po.c:1421
+#: src/c64/tfe.c:1944 src/translate.c.po.c:1421
#, fuzzy
msgid "Enable RRNet mode of TFE emulation"
msgstr "*W\xB3\xB1cz rzeczywist\xB1 emulacj\xEA nap\xEAdu"
# src/arch/unix/uisettings.c:614 src/arch/unix/vic20ui.c:317
-#: src/c64/tfe.c:1944 src/translate.c.po.c:1431
+#: src/c64/tfe.c:1946 src/translate.c.po.c:1431
#, fuzzy
msgid "Disable RRNet mode of TFE emulation"
msgstr "*Brak emulacji portu RS232"
@@ -3565,7 +3565,7 @@
msgstr "O VICE..."
#: src/arch/unix/gui/uicommands.c:569 src/arch/unix/gui/uidatasette.c:98
-#: src/arch/unix/x11/gnome/uipalcontrol.c:189
+#: src/arch/unix/x11/gnome/uipalcontrol.c:190
#: src/arch/unix/x11/gnome/x11ui.c:1822 src/arch/amigaos/intl.c.po.c:312
msgid "Reset"
msgstr "Reset"
@@ -4436,7 +4436,7 @@
msgid "Scanline Shade in percent"
msgstr "Cieniowane scanline w procentach"
-#: src/arch/unix/gui/uipalemu.c:88 src/arch/unix/gui/uipalemu.c:148
+#: src/arch/unix/gui/uipalemu.c:88 src/arch/unix/gui/uipalemu.c:150
msgid "New PAL Tint"
msgstr ""
@@ -4464,7 +4464,7 @@
msgid "Offset in percent"
msgstr "Cieniowane scanline w procentach"
-#: src/arch/unix/gui/uipalemu.c:110 src/arch/unix/gui/uipalemu.c:146
+#: src/arch/unix/gui/uipalemu.c:110 src/arch/unix/gui/uipalemu.c:148
msgid "PAL Blurredness"
msgstr ""
@@ -4482,25 +4482,25 @@
msgid "*Fast PAL Emulation"
msgstr "*Szybka emulacja PAL"
-#: src/arch/unix/gui/uipalemu.c:138
+#: src/arch/unix/gui/uipalemu.c:139
#, fuzzy
msgid "*Old Exact PAL Emulation"
msgstr "*Udawana emulacja PAL"
-#: src/arch/unix/gui/uipalemu.c:140
+#: src/arch/unix/gui/uipalemu.c:142
#, fuzzy
msgid "*New Exact PAL Emulation"
msgstr "*Udawana emulacja PAL"
-#: src/arch/unix/gui/uipalemu.c:144
+#: src/arch/unix/gui/uipalemu.c:146
msgid "PAL Scanline Shade"
msgstr "Cieniowane scanline PAL "
-#: src/arch/unix/gui/uipalemu.c:150
+#: src/arch/unix/gui/uipalemu.c:152
msgid "New PAL Odd Lines Phase"
msgstr ""
-#: src/arch/unix/gui/uipalemu.c:152
+#: src/arch/unix/gui/uipalemu.c:154
msgid "New PAL Odd Lines Offset"
msgstr ""
@@ -5811,60 +5811,60 @@
msgid "Can't create image `%s'."
msgstr "Nie mo\xBFna stworzyc obrazu `%s'."
-#: src/arch/unix/x11/gnome/uipalcontrol.c:49
+#: src/arch/unix/x11/gnome/uipalcontrol.c:52
msgid "Blurredness"
msgstr ""
-#: src/arch/unix/x11/gnome/uipalcontrol.c:50
+#: src/arch/unix/x11/gnome/uipalcontrol.c:53
#, fuzzy
msgid "Scanline Shade"
msgstr "Cieniowane scanline PAL "
-#: src/arch/unix/x11/gnome/uipalcontrol.c:51 src/arch/win32/res.rc.po.c:2817
+#: src/arch/unix/x11/gnome/uipalcontrol.c:54 src/arch/win32/res.rc.po.c:2817
msgid "Saturation"
msgstr "Nasycenie"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:52 src/arch/win32/res.rc.po.c:2820
+#: src/arch/unix/x11/gnome/uipalcontrol.c:55 src/arch/win32/res.rc.po.c:2820
msgid "Contrast"
msgstr "Kontrast"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:53 src/arch/win32/res.rc.po.c:2823
+#: src/arch/unix/x11/gnome/uipalcontrol.c:56 src/arch/win32/res.rc.po.c:2823
msgid "Brightness"
msgstr "Jaskrawo\xB6\xE6"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:54 src/arch/win32/res.rc.po.c:3093
+#: src/arch/unix/x11/gnome/uipalcontrol.c:57 src/arch/win32/res.rc.po.c:3093
msgid "Gamma"
msgstr "Gamma"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:55 src/arch/win32/res.rc.po.c:2955
+#: src/arch/unix/x11/gnome/uipalcontrol.c:58 src/arch/win32/res.rc.po.c:2955
#, fuzzy
msgid "Tint"
msgstr "Ustawienia drukarki"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:56
+#: src/arch/unix/x11/gnome/uipalcontrol.c:59
msgid "Odd Line Phase"
msgstr ""
-#: src/arch/unix/x11/gnome/uipalcontrol.c:57
+#: src/arch/unix/x11/gnome/uipalcontrol.c:60
msgid "Odd Line Offset"
msgstr ""
-#: src/arch/unix/x11/gnome/uipalcontrol.c:145
+#: src/arch/unix/x11/gnome/uipalcontrol.c:146
msgid "PAL Settings"
msgstr "Ustawienia PAL"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:198
+#: src/arch/unix/x11/gnome/uipalcontrol.c:199
#, fuzzy
msgid "Fast"
msgstr "*Szybko"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:205 src/arch/win32/res.rc.po.c:5197
+#: src/arch/unix/x11/gnome/uipalcontrol.c:207 src/arch/win32/res.rc.po.c:5197
#: src/arch/amigaos/intl.c.po.c:3755
#, fuzzy
msgid "Exact"
msgstr "*Wymu\xB6"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:211
+#: src/arch/unix/x11/gnome/uipalcontrol.c:214
#, fuzzy
msgid "New Exact"
msgstr "*Wymu\xB6"
Modified: trunk/vice/po/sv.po
===================================================================
--- trunk/vice/po/sv.po 2008-07-18 19:14:16 UTC (rev 19045)
+++ trunk/vice/po/sv.po 2008-07-18 19:49:01 UTC (rev 19046)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: VICE 2.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-16 06:53+0200\n"
+"POT-Creation-Date: 2008-07-18 21:16+0200\n"
"PO-Revision-Date: 2007-07-30 20:49+0100\n"
"Last-Translator: Peter Karlsson <pe...@so...>\n"
"Language-Team: Swedish <tp...@li...>\n"
@@ -105,7 +105,7 @@
#: src/c64/cart/ide64.c:281 src/c64/c64_256k.c:210 src/c64/georam.c:260
#: src/c64/mmc64.c:907 src/c64/mmc64.c:909 src/c64/plus256k.c:175
#: src/c64/plus60k.c:249 src/c64/ramcart.c:284 src/c64/reu.c:478
-#: src/c64/tfe.c:1940 src/cbm2/cbm2-cmdline-options.c:132
+#: src/c64/tfe.c:1942 src/cbm2/cbm2-cmdline-options.c:132
#: src/cbm2/cbm2-cmdline-options.c:134 src/cbm2/cbm2-cmdline-options.c:136
#: src/cbm2/cbm2-cmdline-options.c:139 src/cbm2/cbm2-cmdline-options.c:141
#: src/cbm2/cbm2-cmdline-options.c:143 src/cbm2/cbm2-cmdline-options.c:145
@@ -998,23 +998,23 @@
msgid "Size of the RAM expansion unit"
msgstr "Storlek p\xE5 RAM-expansionsenhet"
-#: src/c64/tfe.c:1936 src/translate.c.po.c:1391
+#: src/c64/tfe.c:1938 src/translate.c.po.c:1391
msgid "Enable the TFE (\"The Final Ethernet\") unit"
msgstr "Aktivera TFE-enhet (\"The Final Ethernet\")"
-#: src/c64/tfe.c:1938 src/translate.c.po.c:1401
+#: src/c64/tfe.c:1940 src/translate.c.po.c:1401
msgid "Disable the TFE (\"The Final Ethernet\") unit"
msgstr "Inaktivera TFE-enhet (\"The Final Ethernet\")"
-#: src/c64/tfe.c:1940 src/translate.c.po.c:1411
+#: src/c64/tfe.c:1942 src/translate.c.po.c:1411
msgid "Set the system ethernet interface for TFE emulation"
msgstr "St\xE4ll in systemets ethernetgr\xE4nssnitt f\xF6r TFE-emulering"
-#: src/c64/tfe.c:1942 src/translate.c.po.c:1421
+#: src/c64/tfe.c:1944 src/translate.c.po.c:1421
msgid "Enable RRNet mode of TFE emulation"
msgstr "Aktivera RRNet-l\xE4ge p\xE5 TFE-emulering"
-#: src/c64/tfe.c:1944 src/translate.c.po.c:1431
+#: src/c64/tfe.c:1946 src/translate.c.po.c:1431
msgid "Disable RRNet mode of TFE emulation"
msgstr "Inaktivera RRNet-l\xE4ge p\xE5 TFE-emulering"
@@ -3328,7 +3328,7 @@
msgstr "Om VICE..."
#: src/arch/unix/gui/uicommands.c:569 src/arch/unix/gui/uidatasette.c:98
-#: src/arch/unix/x11/gnome/uipalcontrol.c:189
+#: src/arch/unix/x11/gnome/uipalcontrol.c:190
#: src/arch/unix/x11/gnome/x11ui.c:1822 src/arch/amigaos/intl.c.po.c:312
msgid "Reset"
msgstr "\xC5terst\xE4ll"
@@ -4140,7 +4140,7 @@
msgid "Scanline Shade in percent"
msgstr "Skannlinjeskuggning i procent"
-#: src/arch/unix/gui/uipalemu.c:88 src/arch/unix/gui/uipalemu.c:148
+#: src/arch/unix/gui/uipalemu.c:88 src/arch/unix/gui/uipalemu.c:150
msgid "New PAL Tint"
msgstr ""
@@ -4167,7 +4167,7 @@
msgid "Offset in percent"
msgstr "Suddighet i procent"
-#: src/arch/unix/gui/uipalemu.c:110 src/arch/unix/gui/uipalemu.c:146
+#: src/arch/unix/gui/uipalemu.c:110 src/arch/unix/gui/uipalemu.c:148
msgid "PAL Blurredness"
msgstr "PAL-suddighet"
@@ -4183,25 +4183,25 @@
msgid "*Fast PAL Emulation"
msgstr "*Snabb PAL-emulering"
-#: src/arch/unix/gui/uipalemu.c:138
+#: src/arch/unix/gui/uipalemu.c:139
#, fuzzy
msgid "*Old Exact PAL Emulation"
msgstr "*Exakt PAL-emulering"
-#: src/arch/unix/gui/uipalemu.c:140
+#: src/arch/unix/gui/uipalemu.c:142
#, fuzzy
msgid "*New Exact PAL Emulation"
msgstr "*Exakt PAL-emulering"
-#: src/arch/unix/gui/uipalemu.c:144
+#: src/arch/unix/gui/uipalemu.c:146
msgid "PAL Scanline Shade"
msgstr "Skuggning av PAL-skannlinjer"
-#: src/arch/unix/gui/uipalemu.c:150
+#: src/arch/unix/gui/uipalemu.c:152
msgid "New PAL Odd Lines Phase"
msgstr ""
-#: src/arch/unix/gui/uipalemu.c:152
+#: src/arch/unix/gui/uipalemu.c:154
msgid "New PAL Odd Lines Offset"
msgstr ""
@@ -5447,58 +5447,58 @@
msgid "Can't create image `%s'."
msgstr "Kan inte skapa avbildningsfil \"%s\"."
-#: src/arch/unix/x11/gnome/uipalcontrol.c:49
+#: src/arch/unix/x11/gnome/uipalcontrol.c:52
msgid "Blurredness"
msgstr "Suddighet"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:50
+#: src/arch/unix/x11/gnome/uipalcontrol.c:53
msgid "Scanline Shade"
msgstr "Skuggning av skannlinjer"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:51 src/arch/win32/res.rc.po.c:2817
+#: src/arch/unix/x11/gnome/uipalcontrol.c:54 src/arch/win32/res.rc.po.c:2817
msgid "Saturation"
msgstr "M\xE4ttnad"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:52 src/arch/win32/res.rc.po.c:2820
+#: src/arch/unix/x11/gnome/uipalcontrol.c:55 src/arch/win32/res.rc.po.c:2820
msgid "Contrast"
msgstr "Kontrast"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:53 src/arch/win32/res.rc.po.c:2823
+#: src/arch/unix/x11/gnome/uipalcontrol.c:56 src/arch/win32/res.rc.po.c:2823
msgid "Brightness"
msgstr "Ljusstyrka"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:54 src/arch/win32/res.rc.po.c:3093
+#: src/arch/unix/x11/gnome/uipalcontrol.c:57 src/arch/win32/res.rc.po.c:3093
msgid "Gamma"
msgstr "Gamma"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:55 src/arch/win32/res.rc.po.c:2955
+#: src/arch/unix/x11/gnome/uipalcontrol.c:58 src/arch/win32/res.rc.po.c:2955
#, fuzzy
msgid "Tint"
msgstr "Klient"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:56
+#: src/arch/unix/x11/gnome/uipalcontrol.c:59
msgid "Odd Line Phase"
msgstr ""
-#: src/arch/unix/x11/gnome/uipalcontrol.c:57
+#: src/arch/unix/x11/gnome/uipalcontrol.c:60
msgid "Odd Line Offset"
msgstr ""
-#: src/arch/unix/x11/gnome/uipalcontrol.c:145
+#: src/arch/unix/x11/gnome/uipalcontrol.c:146
msgid "PAL Settings"
msgstr "PAL-inst\xE4llningar"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:198
+#: src/arch/unix/x11/gnome/uipalcontrol.c:199
#, fuzzy
msgid "Fast"
msgstr "*Snabbt"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:205 src/arch/win32/res.rc.po.c:5197
+#: src/arch/unix/x11/gnome/uipalcontrol.c:207 src/arch/win32/res.rc.po.c:5197
#: src/arch/amigaos/intl.c.po.c:3755
msgid "Exact"
msgstr "Exakt"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:211
+#: src/arch/unix/x11/gnome/uipalcontrol.c:214
#, fuzzy
msgid "New Exact"
msgstr "Exakt"
Modified: trunk/vice/src/ChangeLog
===================================================================
--- trunk/vice/src/ChangeLog 2008-07-18 19:14:16 UTC (rev 19045)
+++ trunk/vice/src/ChangeLog 2008-07-18 19:49:01 UTC (rev 19046)
@@ -1,5 +1,9 @@
2008-07-18 Spiro Trikaliotis <spi...@gm...>
+ * Version 2.0
+
+2008-07-18 Spiro Trikaliotis <spi...@gm...>
+
* c64/tfe.c: provide a default value for ppaddress in
tfe_store()
Modified: trunk/vice/src/version.h
===================================================================
--- trunk/vice/src/version.h 2008-07-18 19:14:16 UTC (rev 19045)
+++ trunk/vice/src/version.h 2008-07-18 19:49:01 UTC (rev 19046)
@@ -28,11 +28,11 @@
#define __VERSION_H__
#ifndef VERSION
-#define VERSION "1.22.27"
+#define VERSION "2.0"
#endif
#ifndef VERSION_RC_NUMBER
-#define VERSION_RC_NUMBER 1,22,27,0
+#define VERSION_RC_NUMBER 2,0,0,0
#endif
#ifndef PACKAGE
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
19 messages has been excluded from this view by a project administrator.