mirror of
https://github.com/LIV2/WinUAE.git
synced 2025-12-06 00:12:52 +00:00
3400b1
This commit is contained in:
Toni Wilen
parent
af73e83b52
commit
70d248a0ad
@ -31,8 +31,8 @@
|
||||
#include "debug.h"
|
||||
|
||||
#define AKIKO_DEBUG_NVRAM 0
|
||||
#define AKIKO_DEBUG_IO 0
|
||||
#define AKIKO_DEBUG_IO_CMD 0
|
||||
#define AKIKO_DEBUG_IO 1
|
||||
#define AKIKO_DEBUG_IO_CMD 1
|
||||
|
||||
int log_cd32 = 0;
|
||||
|
||||
@ -648,12 +648,13 @@ static int cdrom_start_return_data (int len)
|
||||
}
|
||||
cdrom_result_buffer[cdrom_receive_length++] = checksum;
|
||||
#if AKIKO_DEBUG_IO_CMD
|
||||
if (log_cd32 > 0)
|
||||
if (log_cd32 > 0) {
|
||||
write_log(_T("CD32: OUT "));
|
||||
for (int i = 0; i < cdrom_receive_length; i++) {
|
||||
for (int i = 0; i < cdrom_receive_length; i++) {
|
||||
write_log(_T("%02X "), cdrom_result_buffer[i]);
|
||||
}
|
||||
write_log(_T("\n"));
|
||||
}
|
||||
#endif
|
||||
cdrom_receive_offset = 0;
|
||||
set_status(CDINTERRUPT_DRIVERECV);
|
||||
|
||||
@ -291,12 +291,12 @@ int main(int argc, char **argv)
|
||||
int slen = 0;
|
||||
|
||||
while (isspace(*opstrp))
|
||||
opstrp++;
|
||||
opstrp++;
|
||||
|
||||
osendp = opstrp;
|
||||
while (*osendp) {
|
||||
if (!isspace (*osendp))
|
||||
slen = osendp - opstrp + 1;
|
||||
if (!isspace (*osendp))
|
||||
slen = osendp - opstrp + 1;
|
||||
osendp++;
|
||||
}
|
||||
opstrp[slen] = 0;
|
||||
|
||||
49
cfgfile.cpp
49
cfgfile.cpp
@ -916,15 +916,17 @@ static void write_filesys_config (struct uae_prefs *p, struct zfile *f)
|
||||
} else if (ct >= HD_CONTROLLER_TYPE_IDE_EXPANSION_FIRST && ct <= HD_CONTROLLER_TYPE_IDE_LAST) {
|
||||
_stprintf(hdcs, _T("ide%d_%s"), ci->controller_unit, expansionroms[ct - HD_CONTROLLER_TYPE_IDE_EXPANSION_FIRST].name);
|
||||
romtype = expansionroms[ct - HD_CONTROLLER_TYPE_IDE_EXPANSION_FIRST].romtype;
|
||||
} else if (ct >= HD_CONTROLLER_TYPE_SCSI_FIRST && ct < HD_CONTROLLER_TYPE_SCSI_EXPANSION_FIRST) {
|
||||
_stprintf(hdcs, hdcontrollers[ct - HD_CONTROLLER_EXPANSION_MAX].label, ci->controller_unit);
|
||||
} else if (ct == HD_CONTROLLER_TYPE_SCSI_AUTO) {
|
||||
_stprintf(hdcs, _T("scsi%d"), ci->controller_unit);
|
||||
} else if (ct == HD_CONTROLLER_TYPE_IDE_AUTO) {
|
||||
_stprintf(hdcs, _T("ide%d"), ci->controller_unit);
|
||||
} else if (ct == HD_CONTROLLER_TYPE_PCMCIA) {
|
||||
if (ci->controller_type_unit == 0)
|
||||
_tcscpy(hdcs, _T("scsram"));
|
||||
else
|
||||
_tcscpy(hdcs, _T("scide"));
|
||||
} else {
|
||||
_stprintf(hdcs, hdcontrollers[ct].label, ci->controller_unit);
|
||||
} else if (ct == HD_CONTROLLER_TYPE_UAE) {
|
||||
_tcscpy(hdcs, _T("uae"));
|
||||
}
|
||||
if (romtype) {
|
||||
for (int j = 0; hdcontrollers[j].label; j++) {
|
||||
@ -1190,7 +1192,7 @@ static void cfgfile_write_rom_settings(const struct expansionboardsettings *ebs,
|
||||
}
|
||||
}
|
||||
|
||||
static void cfgfile_write_board_rom(struct zfile *f, struct multipath *mp, struct boardromconfig *br)
|
||||
static void cfgfile_write_board_rom(struct uae_prefs *prefs, struct zfile *f, struct multipath *mp, struct boardromconfig *br)
|
||||
{
|
||||
TCHAR buf[256];
|
||||
TCHAR name[256];
|
||||
@ -1227,7 +1229,7 @@ static void cfgfile_write_board_rom(struct zfile *f, struct multipath *mp, struc
|
||||
}
|
||||
_stprintf(p, _T("subtype=%s"), srt->configname);
|
||||
}
|
||||
if (br->device_order > 0) {
|
||||
if (br->device_order > 0 && prefs->autoconfig_custom_sort) {
|
||||
if (buf2[0])
|
||||
_tcscat(buf2, _T(","));
|
||||
_stprintf(buf2, _T("order=%d"), br->device_order);
|
||||
@ -1318,16 +1320,16 @@ static bool cfgfile_readramboard(const TCHAR *option, const TCHAR *value, const
|
||||
return false;
|
||||
}
|
||||
|
||||
static void cfgfile_writeramboard(struct zfile *f, const TCHAR *name, int num, struct ramboard *rb)
|
||||
static void cfgfile_writeramboard(struct uae_prefs *prefs, struct zfile *f, const TCHAR *name, int num, struct ramboard *rb)
|
||||
{
|
||||
TCHAR tmp1[MAX_DPATH], tmp2[MAX_DPATH];
|
||||
if (num > 0)
|
||||
_stprintf(tmp1, _T("%s%d_options"), name, num);
|
||||
_stprintf(tmp1, _T("%s%d_options"), name, num + 1);
|
||||
else
|
||||
_stprintf(tmp1, _T("%s_options"), name);
|
||||
tmp2[0] = 0;
|
||||
TCHAR *p = tmp2;
|
||||
if (rb->device_order > 0) {
|
||||
if (rb->device_order > 0 && prefs->autoconfig_custom_sort) {
|
||||
if (tmp2[0])
|
||||
*p++ = ',';
|
||||
_stprintf(p, _T("order=%d"), rb->device_order);
|
||||
@ -1424,7 +1426,7 @@ void cfgfile_save_options (struct zfile *f, struct uae_prefs *p, int type)
|
||||
cfgfile_write_str (f, _T("kickstart_ext_rom="), p->romextident);
|
||||
|
||||
for (int i = 0; i < MAX_EXPANSION_BOARDS; i++) {
|
||||
cfgfile_write_board_rom(f, &p->path_rom, &p->expansionboard[i]);
|
||||
cfgfile_write_board_rom(p, f, &p->path_rom, &p->expansionboard[i]);
|
||||
}
|
||||
|
||||
cfgfile_write_path (f, &p->path_rom, _T("flash_file"), p->flashfile);
|
||||
@ -1650,7 +1652,8 @@ void cfgfile_save_options (struct zfile *f, struct uae_prefs *p, int type)
|
||||
cfgfile_write (f, _T("maprom"), _T("0x%x"), p->maprom);
|
||||
cfgfile_dwrite_str (f, _T("boot_rom_uae"), uaebootrom[p->boot_rom]);
|
||||
cfgfile_dwrite_str(f, _T("uaeboard"), uaeboard[p->uaeboard]);
|
||||
cfgfile_dwrite(f, _T("uaeboard_options"), _T("order=%d"), p->uaeboard_order);
|
||||
if (p->autoconfig_custom_sort)
|
||||
cfgfile_dwrite(f, _T("uaeboard_options"), _T("order=%d"), p->uaeboard_order);
|
||||
cfgfile_dwrite_str (f, _T("parallel_matrix_emulation"), epsonprinter[p->parallel_matrix_emulation]);
|
||||
cfgfile_write_bool (f, _T("parallel_postscript_emulation"), p->parallel_postscript_emulation);
|
||||
cfgfile_write_bool (f, _T("parallel_postscript_detection"), p->parallel_postscript_detection);
|
||||
@ -1862,10 +1865,12 @@ void cfgfile_save_options (struct zfile *f, struct uae_prefs *p, int type)
|
||||
s += _stprintf (s, _T(",v=%d"), cr->vert);
|
||||
if (cr->locked)
|
||||
_tcscat (s, _T(",locked"));
|
||||
if (cr->ntsc > 0)
|
||||
if (cr->ntsc == 1)
|
||||
_tcscat (s, _T(",ntsc"));
|
||||
else if (cr->ntsc == 0)
|
||||
_tcscat (s, _T(",pal"));
|
||||
else if (cr->ntsc == 2)
|
||||
_tcscat(s, _T(",custom"));
|
||||
if (cr->lace > 0)
|
||||
_tcscat (s, _T(",lace"));
|
||||
else if (cr->lace == 0)
|
||||
@ -1892,6 +1897,8 @@ void cfgfile_save_options (struct zfile *f, struct uae_prefs *p, int type)
|
||||
_tcscat (s, _T(",rtg"));
|
||||
if (cr->exit)
|
||||
_tcscat(s, _T(",exit"));
|
||||
if (cr->defaultdata)
|
||||
_tcscat(s, _T(",default"));
|
||||
if (cr->filterprofile[0]) {
|
||||
TCHAR *se = cfgfile_escape(cr->filterprofile, _T(","), true);
|
||||
s += _stprintf(s, _T(",filter=%s"), cr->filterprofile);
|
||||
@ -1980,7 +1987,7 @@ void cfgfile_save_options (struct zfile *f, struct uae_prefs *p, int type)
|
||||
_tcscpy(tmp, _T("fastmem_size"));
|
||||
cfgfile_write(f, tmp, _T("%d"), p->fastmem[i].size / 0x100000);
|
||||
}
|
||||
cfgfile_writeramboard(f, _T("fastmem"), i, &p->fastmem[i]);
|
||||
cfgfile_writeramboard(p, f, _T("fastmem"), i, &p->fastmem[i]);
|
||||
}
|
||||
cfgfile_write (f, _T("mem25bit_size"), _T("%d"), p->mem25bit_size / 0x100000);
|
||||
cfgfile_write (f, _T("a3000mem_size"), _T("%d"), p->mbresmem_low_size / 0x100000);
|
||||
@ -1993,7 +2000,7 @@ void cfgfile_save_options (struct zfile *f, struct uae_prefs *p, int type)
|
||||
_tcscpy(tmp, _T("z3mem_size"));
|
||||
cfgfile_write(f, tmp, _T("%d"), p->z3fastmem[i].size / 0x100000);
|
||||
}
|
||||
cfgfile_writeramboard(f, _T("z3mem"), i, &p->z3fastmem[i]);
|
||||
cfgfile_writeramboard(p, f, _T("z3mem"), i, &p->z3fastmem[i]);
|
||||
}
|
||||
cfgfile_write (f, _T("z3mem_start"), _T("0x%x"), p->z3autoconfig_start);
|
||||
cfgfile_write(f, _T("bogomem_size"), _T("%d"), p->bogomem_size / 0x40000);
|
||||
@ -2028,7 +2035,7 @@ void cfgfile_save_options (struct zfile *f, struct uae_prefs *p, int type)
|
||||
else
|
||||
_tcscpy(tmp, _T("gfxcard_type"));
|
||||
cfgfile_dwrite_str(f, tmp, gfxboard_get_configname(rbc->rtgmem_type));
|
||||
if (rbc->device_order) {
|
||||
if (rbc->device_order > 0 && p->autoconfig_custom_sort) {
|
||||
_stprintf(tmp2, _T("order=%d"), rbc->device_order);
|
||||
if (i > 0)
|
||||
_stprintf(tmp, _T("gfxcard%d_options"), i + 1);
|
||||
@ -3435,7 +3442,7 @@ static int cfgfile_parse_host (struct uae_prefs *p, TCHAR *option, TCHAR *value)
|
||||
|
||||
int vert = -1, horiz = -1, lace = -1, ntsc = -1, framelength = -1, vsync = -1, hres = 0;
|
||||
bool locked = false, rtg = false, exit = false;
|
||||
bool cmdmode = false;
|
||||
bool cmdmode = false, defaultdata = false;
|
||||
double rate = -1;
|
||||
int rpct = 0;
|
||||
TCHAR cmd[MAX_DPATH], filter[64] = { 0 }, label[16] = { 0 };
|
||||
@ -3502,6 +3509,8 @@ static int cfgfile_parse_host (struct uae_prefs *p, TCHAR *option, TCHAR *value)
|
||||
ntsc = 1;
|
||||
if (!_tcsnicmp(tmpp, _T("pal"), 3))
|
||||
ntsc = 0;
|
||||
if (!_tcsnicmp(tmpp, _T("custom"), 6))
|
||||
ntsc = 2;
|
||||
if (!_tcsnicmp(tmpp, _T("lof"), 3))
|
||||
framelength = 1;
|
||||
if (!_tcsnicmp(tmpp, _T("shf"), 3))
|
||||
@ -3510,6 +3519,8 @@ static int cfgfile_parse_host (struct uae_prefs *p, TCHAR *option, TCHAR *value)
|
||||
rtg = true;
|
||||
if (!_tcsnicmp(tmpp, _T("exit"), 4))
|
||||
exit = true;
|
||||
if (!_tcsnicmp(tmpp, _T("default"), 7))
|
||||
defaultdata = true;
|
||||
}
|
||||
tmpp = next;
|
||||
if (tmpp >= end)
|
||||
@ -3543,6 +3554,7 @@ static int cfgfile_parse_host (struct uae_prefs *p, TCHAR *option, TCHAR *value)
|
||||
cr->exit = exit;
|
||||
cr->framelength = framelength;
|
||||
cr->rate = rate;
|
||||
cr->defaultdata = defaultdata;
|
||||
_tcscpy(cr->commands, cmd);
|
||||
_tcscpy(cr->label, label);
|
||||
TCHAR *se = cfgfile_unescape(filter, NULL);
|
||||
@ -4412,8 +4424,9 @@ invalid_fs:
|
||||
bool cfgfile_board_enabled(struct uae_prefs *p, int romtype, int devnum)
|
||||
{
|
||||
int idx;
|
||||
if (romtype == ROMTYPE_CPUBOARD && currprefs.cpuboard_type)
|
||||
return true;
|
||||
if (romtype == ROMTYPE_CPUBOARD && p->cpuboard_type) {
|
||||
return devnum == 0;
|
||||
}
|
||||
struct boardromconfig *brc = get_device_rom(p, romtype, devnum, &idx);
|
||||
if (!brc)
|
||||
return false;
|
||||
|
||||
26
custom.cpp
26
custom.cpp
@ -4008,22 +4008,30 @@ struct chipset_refresh *get_chipset_refresh (void)
|
||||
{
|
||||
int islace = interlace_seen ? 1 : 0;
|
||||
int isntsc = (beamcon0 & 0x20) ? 0 : 1;
|
||||
int custom = (beamcon0 & 0x80) ? 1 : 0;
|
||||
|
||||
if (!(currprefs.chipset_mask & CSMASK_ECS_AGNUS))
|
||||
isntsc = currprefs.ntscmode ? 1 : 0;
|
||||
|
||||
int def = -1;
|
||||
for (int i = 0; i < MAX_CHIPSET_REFRESH_TOTAL; i++) {
|
||||
struct chipset_refresh *cr = &currprefs.cr[i];
|
||||
if ((cr->horiz < 0 || cr->horiz == maxhpos) &&
|
||||
(cr->vert < 0 || cr->vert == maxvpos_display) &&
|
||||
(cr->ntsc < 0 || (cr->ntsc > 0 && isntsc) || (cr->ntsc == 0 && !isntsc)) &&
|
||||
(cr->lace < 0 || (cr->lace > 0 && islace) || (cr->lace == 0 && !islace)) &&
|
||||
(cr->resolution == 0 || cr->resolution == 7 || (cr->resolution & (1 << detected_screen_resolution))) &&
|
||||
(cr->framelength < 0 || (cr->framelength > 0 && lof_store) || (cr->framelength == 0 && !lof_store) || (cr->framelength >= 0 && islace)) &&
|
||||
((cr->rtg && picasso_on) || (!cr->rtg && !picasso_on)) &&
|
||||
(cr->vsync < 0 || (cr->vsync > 0 && isvsync_chipset ()) || (cr->vsync == 0 && !isvsync_chipset ())))
|
||||
return cr;
|
||||
if (cr->defaultdata)
|
||||
def = i;
|
||||
if (cr->inuse) {
|
||||
if ((cr->horiz < 0 || cr->horiz == maxhpos) &&
|
||||
(cr->vert < 0 || cr->vert == maxvpos_display) &&
|
||||
(cr->ntsc < 0 || (cr->ntsc == 1 && isntsc && !custom) || (cr->ntsc == 0 && !isntsc && !custom) || (cr->ntsc == 2 && custom)) &&
|
||||
(cr->lace < 0 || (cr->lace > 0 && islace) || (cr->lace == 0 && !islace)) &&
|
||||
(cr->resolution == 0 || cr->resolution == 7 || (cr->resolution & (1 << detected_screen_resolution))) &&
|
||||
(cr->framelength < 0 || (cr->framelength > 0 && lof_store) || (cr->framelength == 0 && !lof_store) || (cr->framelength >= 0 && islace)) &&
|
||||
((cr->rtg && picasso_on) || (!cr->rtg && !picasso_on)) &&
|
||||
(cr->vsync < 0 || (cr->vsync > 0 && isvsync_chipset ()) || (cr->vsync == 0 && !isvsync_chipset ())))
|
||||
return cr;
|
||||
}
|
||||
}
|
||||
if (def >= 0)
|
||||
return &currprefs.cr[def];
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
||||
@ -1005,7 +1005,7 @@ static void pfield_init_linetoscr (bool border)
|
||||
if (sprite_playfield_start > 0) {
|
||||
sprite_playfield_start -= add;
|
||||
} else {
|
||||
playfield_start -= add;
|
||||
;// this is most likely wrong: playfield_start -= add;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -366,6 +366,7 @@ static void expamem_init_clear_zero (void)
|
||||
if (!currprefs.address_space_24)
|
||||
map_banks(&expamem_bank, 0xff000000 >> 16, 1, 0);
|
||||
}
|
||||
expamem_bank_current = NULL;
|
||||
}
|
||||
|
||||
static void expamem_init_clear2 (void)
|
||||
@ -1304,8 +1305,8 @@ static bool expamem_init_uaeboard(struct autoconfig_info *aci)
|
||||
|
||||
MEMORY_ARRAY_FUNCTIONS(z3fastmem, 0);
|
||||
MEMORY_ARRAY_FUNCTIONS(z3fastmem, 1);
|
||||
|
||||
MEMORY_FUNCTIONS(z3chipmem);
|
||||
MEMORY_ARRAY_FUNCTIONS(z3fastmem, 2);
|
||||
MEMORY_ARRAY_FUNCTIONS(z3fastmem, 3);
|
||||
|
||||
addrbank z3fastmem_bank[MAX_RAM_BOARDS] =
|
||||
{
|
||||
@ -1322,13 +1323,29 @@ addrbank z3fastmem_bank[MAX_RAM_BOARDS] =
|
||||
z3fastmem1_xlate, z3fastmem1_check, NULL, _T("*"), _T("Zorro III Fast RAM #2"),
|
||||
z3fastmem1_lget, z3fastmem1_wget,
|
||||
ABFLAG_RAM | ABFLAG_THREADSAFE, 0, 0
|
||||
},
|
||||
{
|
||||
z3fastmem2_lget, z3fastmem2_wget, z3fastmem2_bget,
|
||||
z3fastmem2_lput, z3fastmem2_wput, z3fastmem2_bput,
|
||||
z3fastmem2_xlate, z3fastmem2_check, NULL, _T("*"), _T("Zorro III Fast RAM #3"),
|
||||
z3fastmem2_lget, z3fastmem2_wget,
|
||||
ABFLAG_RAM | ABFLAG_THREADSAFE, 0, 0
|
||||
},
|
||||
{
|
||||
z3fastmem3_lget, z3fastmem3_wget, z3fastmem3_bget,
|
||||
z3fastmem3_lput, z3fastmem3_wput, z3fastmem3_bput,
|
||||
z3fastmem3_xlate, z3fastmem3_check, NULL, _T("*"), _T("Zorro III Fast RAM #4"),
|
||||
z3fastmem3_lget, z3fastmem3_wget,
|
||||
ABFLAG_RAM | ABFLAG_THREADSAFE, 0, 0
|
||||
}
|
||||
};
|
||||
|
||||
MEMORY_FUNCTIONS(z3chipmem);
|
||||
|
||||
addrbank z3chipmem_bank = {
|
||||
z3chipmem_lget, z3chipmem_wget, z3chipmem_bget,
|
||||
z3chipmem_lput, z3chipmem_wput, z3chipmem_bput,
|
||||
z3chipmem_xlate, z3chipmem_check, NULL, _T("z3_chip"), _T("MegaChipRAM"),
|
||||
z3chipmem_xlate, z3chipmem_check, NULL, _T("*"), _T("MegaChipRAM"),
|
||||
z3chipmem_lget, z3chipmem_wget,
|
||||
ABFLAG_RAM | ABFLAG_THREADSAFE, 0, 0
|
||||
};
|
||||
@ -1889,23 +1906,8 @@ static void allocate_expamem (void)
|
||||
|
||||
z3chipmem_bank.start = Z3BASE_UAE;
|
||||
|
||||
z3fastmem_bank[0].start = currprefs.z3autoconfig_start;
|
||||
if (currprefs.mbresmem_high_size >= 128 * 1024 * 1024)
|
||||
z3chipmem_bank.start += (currprefs.mbresmem_high_size - 128 * 1024 * 1024) + 16 * 1024 * 1024;
|
||||
if (!expamem_z3hack(&currprefs))
|
||||
z3fastmem_bank[0].start = Z3BASE_REAL;
|
||||
if (z3fastmem_bank[0].start == Z3BASE_REAL) {
|
||||
int z3off = cpuboards[currprefs.cpuboard_type].subtypes[currprefs.cpuboard_subtype].z3extra;
|
||||
if (z3off) {
|
||||
z3fastmem_bank[0].start += z3off;
|
||||
z3fastmem_bank[0].start = expansion_startaddress(&currprefs, z3fastmem_bank[0].start, currprefs.z3fastmem[0].size);
|
||||
}
|
||||
}
|
||||
if (z3fastmem_bank[0].start == Z3BASE_UAE) {
|
||||
if (currprefs.mbresmem_high_size >= 128 * 1024 * 1024)
|
||||
z3fastmem_bank[0].start += (currprefs.mbresmem_high_size - 128 * 1024 * 1024) + 16 * 1024 * 1024;
|
||||
z3fastmem_bank[0].start += currprefs.z3chipmem_size;
|
||||
}
|
||||
|
||||
if (currprefs.z3chipmem_size && z3fastmem_bank[0].start - z3chipmem_bank.start < currprefs.z3chipmem_size)
|
||||
currprefs.z3chipmem_size = changed_prefs.z3chipmem_size = 0;
|
||||
@ -1938,7 +1940,7 @@ static void allocate_expamem (void)
|
||||
memory_hardreset(1);
|
||||
}
|
||||
for (int i = 1; i < MAX_RAM_BOARDS; i++) {
|
||||
if (currprefs.z3fastmem[i].size) {
|
||||
if (currprefs.z3fastmem[i].size && z3fastmem_bank[i].start == 0xffffffff) {
|
||||
z3fastmem_bank[i].start = expansion_startaddress(&currprefs, z3fastmem_bank[i - 1].start, currprefs.z3fastmem[i - 1].size);
|
||||
}
|
||||
if (z3fastmem_bank[i].allocated != currprefs.z3fastmem[i].size) {
|
||||
@ -1959,7 +1961,7 @@ static void allocate_expamem (void)
|
||||
}
|
||||
if (z3chipmem_bank.allocated != currprefs.z3chipmem_size) {
|
||||
mapped_free (&z3chipmem_bank);
|
||||
mapped_malloc_dynamic (&currprefs.z3chipmem_size, &changed_prefs.z3chipmem_size, &z3chipmem_bank, 16, _T("z3_chip"));
|
||||
mapped_malloc_dynamic (&currprefs.z3chipmem_size, &changed_prefs.z3chipmem_size, &z3chipmem_bank, 16, _T("*"));
|
||||
memory_hardreset (1);
|
||||
}
|
||||
|
||||
@ -2583,6 +2585,11 @@ static void expansion_parse_cards(struct uae_prefs *p, bool log)
|
||||
_tcscpy(label, _T("<no name>"));
|
||||
}
|
||||
}
|
||||
if (aci->devnum > 0) {
|
||||
TCHAR *s = label + _tcslen(label);
|
||||
_stprintf(s, _T(" [%d]"), aci->devnum + 1);
|
||||
}
|
||||
|
||||
if (aci->addrbank != &expamem_nonautoconfig && aci->addrbank != &expamem_null && aci->addrbank != &expamem_none && (aci->autoconfig_raw[0] != 0xff || aci->autoconfigp)) {
|
||||
uae_u8 ac2[16];
|
||||
const uae_u8 *a = aci->autoconfigp;
|
||||
@ -2716,8 +2723,6 @@ static void expansion_recalc_order(struct uae_prefs *p)
|
||||
|
||||
void expansion_set_autoconfig_sort(struct uae_prefs *p)
|
||||
{
|
||||
if (!p->autoconfig_custom_sort)
|
||||
return;
|
||||
for (int i = 0; i < cardno; i++) {
|
||||
set_order(p, cards[i], i + 1);
|
||||
}
|
||||
|
||||
@ -2026,8 +2026,10 @@ int filesys_media_change (const TCHAR *rootdir, int inserted, struct uaedev_conf
|
||||
if (uci) {
|
||||
volptr = my_strdup (uci->ci.volname);
|
||||
} else {
|
||||
volname[0] = 0;
|
||||
target_get_volume_name (&mountinfo, rootdir, volname, MAX_DPATH, 1, 0);
|
||||
struct uaedev_config_info ci2 = { 0 };
|
||||
_tcscpy(ci2.rootdir, rootdir);
|
||||
target_get_volume_name (&mountinfo, &ci2, 1, 0, -1);
|
||||
_tcscpy(volname, ci2.volname);
|
||||
volptr = volname;
|
||||
if (!volname[0])
|
||||
volptr = NULL;
|
||||
@ -8717,9 +8719,6 @@ void filesys_vsync (void)
|
||||
heartbeat = get_long_host(rtarea_bank.baseaddr + RTAREA_HEARTBEAT);
|
||||
cia_heartbeat ();
|
||||
|
||||
if (currprefs.uaeboard > 1)
|
||||
return;
|
||||
|
||||
for (u = units; u; u = u->next) {
|
||||
if (u->reinsertdelay > 0) {
|
||||
u->reinsertdelay--;
|
||||
|
||||
16
gfxboard.cpp
16
gfxboard.cpp
@ -242,7 +242,7 @@ struct rtggfxboard
|
||||
|
||||
static struct rtggfxboard rtggfxboards[MAX_RTG_BOARDS];
|
||||
static int rtg_visible = -1;
|
||||
static int total_active_gfx_boards;
|
||||
static int total_active_gfx_boards, only_gfx_board;
|
||||
static int vram_ram_a8;
|
||||
static DisplaySurface fakesurface;
|
||||
|
||||
@ -669,7 +669,12 @@ bool gfxboard_vsync_handler (void)
|
||||
gb->monswitch_current = gb->monswitch_new;
|
||||
vga_update_size(gb);
|
||||
write_log(_T("GFXBOARD %d ACTIVE=%d\n"), i, gb->monswitch_current);
|
||||
gfxboard_rtg_enable_initial(i);
|
||||
if (!gfxboard_rtg_enable_initial(i)) {
|
||||
// Nothing visible and RTG on? Re-enable our display.
|
||||
if (rtg_visible < 0 && picasso_on) {
|
||||
gfxboard_toggle(i, 0);
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
gb->monswitch_delay = 0;
|
||||
@ -1310,7 +1315,7 @@ static struct rtggfxboard *lastgetgfxboard;
|
||||
static rtggfxboard *getgfxboard(uaecptr addr)
|
||||
{
|
||||
if (total_active_gfx_boards == 1)
|
||||
return &rtggfxboards[0];
|
||||
return &rtggfxboards[only_gfx_board];
|
||||
if (lastgetgfxboard) {
|
||||
if (addr >= lastgetgfxboard->io_start && addr < lastgetgfxboard->io_end)
|
||||
return lastgetgfxboard;
|
||||
@ -2532,9 +2537,12 @@ bool gfxboard_init_memory (struct autoconfig_info *aci)
|
||||
gfxboard_init (aci->prefs, gb);
|
||||
|
||||
total_active_gfx_boards = 0;
|
||||
only_gfx_board = 0;
|
||||
for (int i = 0; i < MAX_RTG_BOARDS; i++) {
|
||||
if (p->rtgboards[i].rtgmem_size && p->rtgboards[i].rtgmem_type >= GFXBOARD_HARDWARE)
|
||||
if (p->rtgboards[i].rtgmem_size && p->rtgboards[i].rtgmem_type >= GFXBOARD_HARDWARE) {
|
||||
total_active_gfx_boards++;
|
||||
only_gfx_board = i;
|
||||
}
|
||||
}
|
||||
|
||||
memset (gb->automemory, 0xff, GFXBOARD_AUTOCONFIG_SIZE);
|
||||
|
||||
@ -41,7 +41,7 @@ void audio_vsync (void);
|
||||
void audio_sampleripper(int);
|
||||
void write_wavheader (struct zfile *wavfile, uae_u32 size, uae_u32 freq);
|
||||
|
||||
bool audio_is_pull(void);
|
||||
int audio_is_pull(void);
|
||||
int audio_pull_buffer(void);
|
||||
bool audio_finish_pull(void);
|
||||
bool audio_is_pull_event(void);
|
||||
|
||||
@ -119,7 +119,7 @@ int filesys_eject (int nr);
|
||||
int filesys_media_change (const TCHAR *rootdir, int inserted, struct uaedev_config_data *uci);
|
||||
|
||||
extern TCHAR *filesys_createvolname (const TCHAR *volname, const TCHAR *rootdir, struct zvolume *zv, const TCHAR *def);
|
||||
extern int target_get_volume_name (struct uaedev_mount_info *mtinf, const TCHAR *volumepath, TCHAR *volumename, int size, bool inserted, bool fullcheck);
|
||||
extern int target_get_volume_name (struct uaedev_mount_info *mtinf, struct uaedev_config_info *ci, bool inserted, bool fullcheck, int cnt);
|
||||
|
||||
extern int sprintf_filesys_unit (TCHAR *buffer, int num);
|
||||
|
||||
|
||||
@ -106,6 +106,7 @@ typedef enum {
|
||||
NUMSG_KS68030PLUS, // 20
|
||||
NUMSG_NO_PPC,
|
||||
NUMSG_UAEBOOTROM_PPC,
|
||||
NUMSG_NOMEMORY,
|
||||
NUMSG_LAST
|
||||
} notify_user_msg;
|
||||
|
||||
|
||||
@ -15,8 +15,8 @@
|
||||
#include "traps.h"
|
||||
|
||||
#define UAEMAJOR 3
|
||||
#define UAEMINOR 3
|
||||
#define UAESUBREV 1
|
||||
#define UAEMINOR 4
|
||||
#define UAESUBREV 0
|
||||
|
||||
typedef enum { KBD_LANG_US, KBD_LANG_DK, KBD_LANG_DE, KBD_LANG_SE, KBD_LANG_FR, KBD_LANG_IT, KBD_LANG_ES } KbdLang;
|
||||
|
||||
@ -263,6 +263,7 @@ struct chipset_refresh
|
||||
bool locked;
|
||||
bool rtg;
|
||||
bool exit;
|
||||
bool defaultdata;
|
||||
int horiz;
|
||||
int vert;
|
||||
int lace;
|
||||
|
||||
@ -23,7 +23,7 @@ struct uae_shmid_ds {
|
||||
|
||||
void *uae_shmat(addrbank *ab, int shmid, void *shmaddr, int shmflg);
|
||||
int uae_shmdt(const void *shmaddr);
|
||||
int uae_shmget(uae_key_t key, size_t size, int shmflg, const TCHAR *name);
|
||||
int uae_shmget(uae_key_t key, addrbank *ab, int shmflg);
|
||||
int uae_shmctl(int shmid, int cmd, struct uae_shmid_ds *buf);
|
||||
|
||||
#define UAE_IPC_PRIVATE 0x01
|
||||
|
||||
@ -2962,7 +2962,7 @@ static void inputdevice_read(bool peek)
|
||||
break;
|
||||
got2 = 1;
|
||||
}
|
||||
if (inputread < 0) {
|
||||
if (inputread <= 0) {
|
||||
idev[IDTYPE_MOUSE].read();
|
||||
idev[IDTYPE_JOYSTICK].read();
|
||||
idev[IDTYPE_KEYBOARD].read();
|
||||
|
||||
@ -30,7 +30,6 @@
|
||||
#include "arcadia.h"
|
||||
#include "enforcer.h"
|
||||
#include "threaddep/thread.h"
|
||||
#include "a2091.h"
|
||||
#include "gayle.h"
|
||||
#include "debug.h"
|
||||
#include "gfxboard.h"
|
||||
@ -1709,7 +1708,7 @@ bool mapped_malloc (addrbank *ab)
|
||||
return ab->baseaddr != NULL;
|
||||
}
|
||||
|
||||
id = uae_shmget (UAE_IPC_PRIVATE, ab->allocated, 0x1ff, ab->label);
|
||||
id = uae_shmget (UAE_IPC_PRIVATE, ab, 0x1ff);
|
||||
if (id == -1) {
|
||||
nocanbang ();
|
||||
if (recurse)
|
||||
|
||||
@ -5332,6 +5332,7 @@ void m68k_go (int may_quit)
|
||||
else if (savestate_state == STATE_REWIND)
|
||||
savestate_rewind ();
|
||||
#endif
|
||||
prefs_changed_cpu();
|
||||
set_cycles (start_cycles);
|
||||
custom_reset (cpu_hardreset != 0, cpu_keyboardreset);
|
||||
m68k_reset2 (cpu_hardreset != 0);
|
||||
|
||||
@ -2177,6 +2177,8 @@ static void handle_rawinput_2 (RAWINPUT *raw)
|
||||
|
||||
#ifdef RAWINPUT_DEBUG
|
||||
if (num >= num_joystick) {
|
||||
if (!rawinput_enabled_hid)
|
||||
return;
|
||||
write_log(_T("RAWHID unknown input handle %p\n"), h);
|
||||
for (num = 0; num < num_joystick; num++) {
|
||||
did = &di_joystick[num];
|
||||
|
||||
@ -904,8 +904,8 @@ bool my_resolveshortcut(TCHAR *linkfile, int size)
|
||||
bool ok = false;
|
||||
HRESULT hres;
|
||||
IShellLink* psl;
|
||||
WCHAR szGotPath[MAX_PATH];
|
||||
WCHAR szDescription[MAX_PATH];
|
||||
WCHAR szGotPath[MAX_DPATH];
|
||||
WCHAR szDescription[MAX_DPATH];
|
||||
WIN32_FIND_DATA wfd;
|
||||
|
||||
const TCHAR *ext = _tcsrchr (linkfile, '.');
|
||||
@ -938,12 +938,12 @@ bool my_resolveshortcut(TCHAR *linkfile, int size)
|
||||
if (SUCCEEDED(hres))
|
||||
{
|
||||
// Get the path to the link target.
|
||||
hres = psl->GetPath(szGotPath, MAX_PATH, (WIN32_FIND_DATA*)&wfd, SLGP_SHORTPATH);
|
||||
hres = psl->GetPath(szGotPath, MAX_DPATH, (WIN32_FIND_DATA*)&wfd, SLGP_SHORTPATH);
|
||||
|
||||
if (SUCCEEDED(hres))
|
||||
{
|
||||
// Get the description of the target.
|
||||
hres = psl->GetDescription(szDescription, MAX_PATH);
|
||||
hres = psl->GetDescription(szDescription, MAX_DPATH);
|
||||
|
||||
if (SUCCEEDED(hres))
|
||||
{
|
||||
|
||||
@ -15,6 +15,7 @@
|
||||
#include "cpuboard.h"
|
||||
#include "rommgr.h"
|
||||
#include "newcpu.h"
|
||||
#include "gui.h"
|
||||
#ifdef WINUAE
|
||||
#include "win32.h"
|
||||
#endif
|
||||
@ -248,6 +249,7 @@ bool preinit_shm (void)
|
||||
natmem_reserved = (uae_u8*)VirtualAlloc (NULL, natmem_size, vaflags, PAGE_READWRITE);
|
||||
if (!natmem_size) {
|
||||
write_log (_T("Can't allocate 17M of virtual address space!? Something is seriously wrong\n"));
|
||||
notify_user(NUMSG_NOMEMORY);
|
||||
return false;
|
||||
}
|
||||
break;
|
||||
@ -362,7 +364,9 @@ static int doinit_shm (void)
|
||||
if (expamem_z3_pointer_real > totalsize) {
|
||||
totalsize = expamem_z3_pointer_real;
|
||||
if (totalsize + 16 * si.dwPageSize >= natmem_reserved_size && expamem_z3_pointer_uae < totalsize) {
|
||||
totalsize = expamem_z3_pointer_uae;
|
||||
write_log(_T("NATMEM: Not enough memory for Z3REAL!\n"));
|
||||
notify_user(NUMSG_NOMEMORY);
|
||||
return -1;
|
||||
}
|
||||
startbarrier = 0;
|
||||
}
|
||||
@ -372,6 +376,7 @@ static int doinit_shm (void)
|
||||
|
||||
if (totalsize > size64 || totalsize + 16 * si.dwPageSize >= natmem_reserved_size) {
|
||||
write_log(_T("NATMEM: Not enough memory!\n"));
|
||||
notify_user(NUMSG_NOMEMORY);
|
||||
return -1;
|
||||
}
|
||||
|
||||
@ -627,7 +632,10 @@ void *uae_shmat (addrbank *ab, int shmid, void *shmaddr, int shmflg)
|
||||
}
|
||||
|
||||
if ((uae_u8*)shmaddr < natmem_offset) {
|
||||
if(!_tcscmp (shmids[shmid].name, _T("chip"))) {
|
||||
if (!_tcscmp(shmids[shmid].name, _T("*"))) {
|
||||
shmaddr = natmem_offset + ab->start;
|
||||
got = true;
|
||||
} else if(!_tcscmp (shmids[shmid].name, _T("chip"))) {
|
||||
shmaddr=natmem_offset;
|
||||
got = true;
|
||||
if (!expansion_get_autoconfig_by_address(&currprefs, 0x00200000) || currprefs.chipmem_size < 2 * 1024 * 1024)
|
||||
@ -697,9 +705,6 @@ void *uae_shmat (addrbank *ab, int shmid, void *shmaddr, int shmflg)
|
||||
} else if (!_tcscmp(shmids[shmid].name, _T("cyberstorm"))) {
|
||||
shmaddr = natmem_offset + 0x0c000000;
|
||||
got = true;
|
||||
} else if (!_tcscmp(shmids[shmid].name, _T("*"))) {
|
||||
shmaddr = natmem_offset + ab->start;
|
||||
got = true;
|
||||
} else if (!_tcscmp(shmids[shmid].name, _T("cyberstormmaprom"))) {
|
||||
shmaddr = natmem_offset + 0xfff00000;
|
||||
got = true;
|
||||
@ -764,7 +769,7 @@ void *uae_shmat (addrbank *ab, int shmid, void *shmaddr, int shmflg)
|
||||
uintptr_t natmem_end = (uintptr_t) natmem_reserved + natmem_reserved_size;
|
||||
if ((uintptr_t) shmaddr + size > natmem_end) {
|
||||
/* We cannot add a barrier beyond the end of the reserved memory. */
|
||||
assert((uintptr_t) shmaddr + size - natmem_end == BARRIER);
|
||||
//assert((uintptr_t) shmaddr + size - natmem_end == BARRIER);
|
||||
write_log(_T("NATMEM: Removing barrier (%d bytes) beyond reserved memory\n"), BARRIER);
|
||||
size -= BARRIER;
|
||||
}
|
||||
@ -851,15 +856,15 @@ int uae_shmdt (const void *shmaddr)
|
||||
return 0;
|
||||
}
|
||||
|
||||
int uae_shmget (uae_key_t key, size_t size, int shmflg, const TCHAR *name)
|
||||
int uae_shmget (uae_key_t key, addrbank *ab, int shmflg)
|
||||
{
|
||||
int result = -1;
|
||||
|
||||
if ((key == UAE_IPC_PRIVATE) || ((shmflg & UAE_IPC_CREAT) && (find_shmkey (key) == -1))) {
|
||||
write_log (_T("shmget of size %zd (%zdk) for %s\n"), size, size >> 10, name);
|
||||
write_log (_T("shmget of size %zd (%zdk) for %s (%s)\n"), ab->allocated, ab->allocated >> 10, ab->label, ab->name);
|
||||
if ((result = get_next_shmkey ()) != -1) {
|
||||
shmids[result].size = size;
|
||||
_tcscpy (shmids[result].name, name);
|
||||
shmids[result].size = ab->allocated;
|
||||
_tcscpy (shmids[result].name, ab->label);
|
||||
} else {
|
||||
result = -1;
|
||||
}
|
||||
|
||||
@ -2375,6 +2375,8 @@ static void inituaegfx(TrapContext *ctx, uaecptr ABI)
|
||||
trap_put_long(ctx, ABI + PSSO_BoardInfo_BoardName, uaegfx_resname);
|
||||
trap_put_long(ctx, ABI + PSSO_BoardInfo_BoardType, 1);
|
||||
|
||||
trap_put_long(ctx, ABI + PSSO_BoardInfo_MemoryClock, 100000000);
|
||||
|
||||
/* only 1 clock */
|
||||
trap_put_long(ctx, ABI + PSSO_BoardInfo_PixelClockCount + PLANAR * 4, 1);
|
||||
trap_put_long(ctx, ABI + PSSO_BoardInfo_PixelClockCount + CHUNKY * 4, 1);
|
||||
@ -2434,6 +2436,7 @@ static void inituaegfx(TrapContext *ctx, uaecptr ABI)
|
||||
trap_put_word(ctx, ABI + PSSO_BoardInfo_MaxVerResolution + 4, hicolour.height);
|
||||
trap_put_word(ctx, ABI + PSSO_BoardInfo_MaxVerResolution + 6, truecolour.height);
|
||||
trap_put_word(ctx, ABI + PSSO_BoardInfo_MaxVerResolution + 8, alphacolour.height);
|
||||
|
||||
inituaegfxfuncs(ctx, uaegfx_rom, ABI);
|
||||
}
|
||||
|
||||
|
||||
@ -584,7 +584,6 @@ extern void gfx_set_picasso_baseaddr (uaecptr);
|
||||
extern void gfx_set_picasso_state (int on);
|
||||
extern uae_u8 *gfx_lock_picasso (bool, bool);
|
||||
extern void gfx_unlock_picasso (bool);
|
||||
extern void picasso_clip_mouse (int *, int *);
|
||||
extern int createwindowscursor (uaecptr src, int w, int h, int hiressprite, int doubledsprite, int chipset);
|
||||
|
||||
extern int p96refresh_active;
|
||||
|
||||
@ -403,6 +403,7 @@
|
||||
#define IDS_NUMSG_UAEBOOTROM_PCC 405
|
||||
#define IDS_AUTOSCALE_OVERSCAN_BLANK 408
|
||||
#define IDS_SCREEN_ADAPTIVE_SYNC 409
|
||||
#define IDS_NUMSG_NOMEMORY 410
|
||||
#define IDS_QS_MODELS 1000
|
||||
#define IDS_QS_MODEL_A500 1001
|
||||
#define IDS_QS_MODEL_A500P 1002
|
||||
|
||||
@ -31,4 +31,11 @@
|
||||
</application>
|
||||
</compatibility>
|
||||
|
||||
</assembly>
|
||||
<application xmlns="urn:schemas-microsoft-com:asm.v3">
|
||||
<windowsSettings xmlns:ws2="http://schemas.microsoft.com/SMI/2016/WindowsSettings">
|
||||
<ws2:longPathAware>true</ws2:longPathAware>
|
||||
</windowsSettings>
|
||||
</application>
|
||||
|
||||
</assembly>
|
||||
|
||||
|
||||
@ -248,20 +248,20 @@ FONT 8, "MS Sans Serif", 0, 0, 0x0
|
||||
BEGIN
|
||||
GROUPBOX "CPU",IDC_STATIC,1,1,129,184,BS_LEFT
|
||||
CONTROL "68000",IDC_CPU0,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,8,19,63,10
|
||||
CONTROL "68010",IDC_CPU1,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,8,33,63,10
|
||||
CONTROL "68020",IDC_CPU2,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,8,46,63,10
|
||||
CONTROL "68030",IDC_CPU3,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,8,60,63,10
|
||||
CONTROL "68040",IDC_CPU4,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,8,74,63,10
|
||||
CONTROL "68060",IDC_CPU5,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,8,88,63,10
|
||||
CONTROL "24-bit addressing",IDC_COMPATIBLE24,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,8,108,119,12
|
||||
CONTROL "68010",IDC_CPU1,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,8,32,63,10
|
||||
CONTROL "68020",IDC_CPU2,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,8,45,63,10
|
||||
CONTROL "68030",IDC_CPU3,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,8,58,63,10
|
||||
CONTROL "68040",IDC_CPU4,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,8,71,63,10
|
||||
CONTROL "68060",IDC_CPU5,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,8,84,63,10
|
||||
CONTROL "24-bit addressing",IDC_COMPATIBLE24,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,8,107,119,12
|
||||
CONTROL "More compatible [] 68000: emulate prefetch. 68020+: emulate prefetch partially. More compatible but slower.",IDC_COMPATIBLE,
|
||||
"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,8,121,118,11
|
||||
CONTROL "JIT [] Enable just-in-time CPU emulator. Significantly increases the speed of the CPU emulation. Requires 68020 or higher CPU.",IDC_JITENABLE,
|
||||
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,135,120,11
|
||||
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,134,120,11
|
||||
CONTROL "MMU [] 68030, 68040 and 68060 MMU emulation. Not compatible with JIT.",IDC_MMUENABLE,
|
||||
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,148,120,11
|
||||
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,147,120,11
|
||||
CONTROL "Unimplemented CPU emu [] Emulate 68060 unimplemented integer instructions",IDC_CPU_UNIMPLEMENTED,
|
||||
"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,8,161,118,10
|
||||
"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,8,160,118,10
|
||||
GROUPBOX "CPU Emulation Speed",IDC_STATIC,136,1,258,97
|
||||
CONTROL "Fastest possible",IDC_CS_HOST,"Button",BS_AUTORADIOBUTTON | BS_LEFT | WS_GROUP | WS_TABSTOP,143,19,195,10
|
||||
CONTROL "Approximate A500/A1200 or cycle-exact",IDC_CS_68000,
|
||||
@ -276,9 +276,9 @@ BEGIN
|
||||
COMBOBOX IDC_CPU_FREQUENCY,215,120,89,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
||||
EDITTEXT IDC_CPU_FREQUENCY2,312,119,70,15
|
||||
GROUPBOX "FPU",IDC_STATIC,1,188,129,128,BS_LEFT
|
||||
CONTROL "None",IDC_FPU0,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,8,202,87,10
|
||||
CONTROL "68881",IDC_FPU1,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,8,216,87,10
|
||||
CONTROL "68882",IDC_FPU2,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,8,229,87,10
|
||||
CONTROL "None",IDC_FPU0,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,8,204,87,10
|
||||
CONTROL "68881",IDC_FPU1,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,8,217,87,10
|
||||
CONTROL "68882",IDC_FPU2,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,8,230,87,10
|
||||
CONTROL "CPU internal",IDC_FPU3,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,8,243,93,10
|
||||
CONTROL "More compatible [] More compatible but slower FPU emulation.",IDC_COMPATIBLE_FPU,
|
||||
"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,8,259,117,10
|
||||
@ -373,17 +373,17 @@ BEGIN
|
||||
PUSHBUTTON "&Properties",IDC_EDIT,267,172,60,15
|
||||
PUSHBUTTON "Remove",IDC_REMOVE,334,172,60,15
|
||||
GROUPBOX "Options",IDC_STATIC,1,189,393,66
|
||||
CONTROL "Add PC drives at startup",IDC_MAPDRIVES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,200,201,11
|
||||
CONTROL "Add PC drives at startup",IDC_MAPDRIVES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,9,200,201,11
|
||||
CONTROL "Include removable drives..",IDC_MAPDRIVES_REMOVABLE,
|
||||
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,213,201,11
|
||||
CONTROL "Include network drives..",IDC_MAPDRIVES_NET,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,227,201,11
|
||||
CONTROL "CDFS automount CD/DVD drives",IDC_MAPDRIVES_CD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,241,201,11
|
||||
CONTROL "Disable UAEFSDB-support",IDC_NOUAEFSDB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,222,200,167,11
|
||||
CONTROL "Don't use Windows Recycle Bin",IDC_NORECYCLEBIN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,222,213,167,11
|
||||
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,9,213,201,11
|
||||
CONTROL "Include network drives..",IDC_MAPDRIVES_NET,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,9,226,201,11
|
||||
CONTROL "CDFS automount CD/DVD drives",IDC_MAPDRIVES_CD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,9,239,201,11
|
||||
CONTROL "Disable UAEFSDB-support",IDC_NOUAEFSDB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,220,200,167,11
|
||||
CONTROL "Don't use Windows Recycle Bin",IDC_NORECYCLEBIN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,220,213,167,11
|
||||
CONTROL "Automount removable drives [] Windows side insert or removal will immediately mount/remove it on Amiga side.",IDC_MAPDRIVES_AUTO,
|
||||
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,222,227,167,11
|
||||
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,220,226,167,11
|
||||
CONTROL "Limit size of directory drives to 1G [] Workaround for example old installers that calculate free space incorrectly if drive is large.",IDC_MAPDRIVES_LIMIT,
|
||||
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,222,241,167,11
|
||||
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,220,239,167,11
|
||||
GROUPBOX "Optical media options",IDC_STATIC,1,256,393,59
|
||||
LTEXT "CD drive/image",IDC_STATIC,5,268,70,10,SS_CENTERIMAGE
|
||||
PUSHBUTTON "Select image file",IDC_CD_SELECT,177,266,98,15
|
||||
@ -490,10 +490,10 @@ BEGIN
|
||||
GROUPBOX "Serial Port",IDC_STATIC,1,137,393,51
|
||||
COMBOBOX IDC_SERIAL,67,150,317,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
||||
CONTROL "Shared",IDC_SER_SHARED,"Button",BS_AUTOCHECKBOX | BS_VCENTER | WS_TABSTOP,32,171,66,12
|
||||
CONTROL "RTS/CTS",IDC_SER_CTSRTS,"Button",BS_AUTOCHECKBOX | BS_VCENTER | WS_TABSTOP,106,171,66,12
|
||||
CONTROL "RTS/CTS",IDC_SER_CTSRTS,"Button",BS_AUTOCHECKBOX | BS_VCENTER | WS_TABSTOP,107,171,66,12
|
||||
CONTROL "Direct []Use when emulating serial-link games on two PCs running WinUAE",IDC_SER_DIRECT,
|
||||
"Button",BS_AUTOCHECKBOX | BS_VCENTER | WS_TABSTOP,181,171,83,12
|
||||
CONTROL "uaeserial.device",IDC_UAESERIAL,"Button",BS_AUTOCHECKBOX | BS_VCENTER | WS_TABSTOP,275,171,108,12
|
||||
"Button",BS_AUTOCHECKBOX | BS_VCENTER | WS_TABSTOP,182,171,83,12
|
||||
CONTROL "uaeserial.device",IDC_UAESERIAL,"Button",BS_AUTOCHECKBOX | BS_VCENTER | WS_TABSTOP,274,171,108,12
|
||||
GROUPBOX "MIDI",IDC_STATIC,1,191,393,54,BS_LEFT
|
||||
RTEXT "Out:",IDC_MIDI,22,202,32,15,SS_CENTERIMAGE
|
||||
COMBOBOX IDC_MIDIOUTLIST,58,204,145,130,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
||||
@ -748,41 +748,41 @@ BEGIN
|
||||
CONTROL "Compatible Settings",IDC_CS_COMPATIBLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,6,234,10
|
||||
GROUPBOX "Battery Backed Up Real Time Clock",IDC_STATIC,1,22,394,31
|
||||
CONTROL "None",IDC_CS_RTC1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,15,36,57,10
|
||||
CONTROL "MSM6242B",IDC_CS_RTC2,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,90,36,77,10
|
||||
CONTROL "RF5C01A",IDC_CS_RTC3,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,171,36,67,10
|
||||
CONTROL "A2000 MSM6242B",IDC_CS_RTC4,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,242,36,78,10
|
||||
CONTROL "MSM6242B",IDC_CS_RTC2,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,80,36,77,10
|
||||
CONTROL "RF5C01A",IDC_CS_RTC3,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,165,36,67,10
|
||||
CONTROL "A2000 MSM6242B",IDC_CS_RTC4,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,240,36,78,10
|
||||
EDITTEXT IDC_CS_RTCADJUST,325,34,64,13,ES_AUTOHSCROLL
|
||||
GROUPBOX "CIA-A TOD Clock Source",IDC_STATIC,1,56,394,29
|
||||
CONTROL "Vertical Sync",IDC_CS_CIAA_TOD1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,41,68,86,10
|
||||
CONTROL "Power Supply 50Hz",IDC_CS_CIAA_TOD2,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,133,68,109,10
|
||||
CONTROL "Power Supply 60Hz",IDC_CS_CIAA_TOD3,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,249,68,116,10
|
||||
CONTROL "Power Supply 60Hz",IDC_CS_CIAA_TOD3,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,248,68,116,10
|
||||
GROUPBOX "Chipset Features",IDC_STATIC,0,88,395,128
|
||||
CONTROL "CIA ROM Overlay",IDC_CS_CIAOVERLAY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,102,104,11
|
||||
CONTROL "CD32 CD",IDC_CS_CD32CD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,116,104,11
|
||||
CONTROL "CIA ROM Overlay",IDC_CS_CIAOVERLAY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,104,104,11
|
||||
CONTROL "CD32 CD",IDC_CS_CD32CD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,117,104,11
|
||||
CONTROL "CDTV CD",IDC_CS_CDTVCD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,130,105,11
|
||||
CONTROL "A600/A1200 IDE",IDC_CS_IDE1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,143,104,11
|
||||
CONTROL "ROM Mirror (E0)",IDC_CS_KSMIRROR_E0,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,157,104,11
|
||||
CONTROL "KB Reset Warning",IDC_CS_RESETWARNING,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,171,104,11
|
||||
CONTROL "CIA TOD bug",IDC_CS_CIATODBUG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,184,104,11
|
||||
CONTROL "1M Chip / 0.5M+0.5M",IDC_CS_1MCHIPJUMPER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,197,104,11
|
||||
CONTROL "A1000 Boot RAM/ROM",IDC_CS_A1000RAM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,127,102,121,11
|
||||
CONTROL "CD32 C2P",IDC_CS_CD32C2P,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,127,116,121,11
|
||||
CONTROL "CDTV SRAM",IDC_CS_CDTVRAM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,127,129,121,11
|
||||
CONTROL "ROM Mirror (E0)",IDC_CS_KSMIRROR_E0,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,156,104,11
|
||||
CONTROL "KB Reset Warning",IDC_CS_RESETWARNING,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,169,104,11
|
||||
CONTROL "CIA TOD bug",IDC_CS_CIATODBUG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,182,104,11
|
||||
CONTROL "1M Chip / 0.5M+0.5M",IDC_CS_1MCHIPJUMPER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,195,104,11
|
||||
CONTROL "A1000 Boot RAM/ROM",IDC_CS_A1000RAM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,127,104,121,11
|
||||
CONTROL "CD32 C2P",IDC_CS_CD32C2P,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,127,117,121,11
|
||||
CONTROL "CDTV SRAM",IDC_CS_CDTVRAM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,127,130,121,11
|
||||
CONTROL "A4000/A4000T IDE",IDC_CS_IDE2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,127,143,121,11
|
||||
CONTROL "ROM Mirror (A8)",IDC_CS_KSMIRROR_A8,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,127,157,121,11
|
||||
CONTROL "No-EHB Denise",IDC_CS_NOEHB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,127,171,121,11
|
||||
CONTROL "Z3 Autoconfig",IDC_CS_Z3AUTOCONFIG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,127,184,104,11
|
||||
CONTROL "DF0: ID Hardware",IDC_CS_DF0IDHW,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,264,102,125,11
|
||||
CONTROL "CD32 NVRAM",IDC_CS_CD32NVRAM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,264,116,125,11
|
||||
CONTROL "CDTV SRAM Expansion",IDC_CS_CDTVRAMEXP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,264,129,125,11
|
||||
CONTROL "ROM Mirror (A8)",IDC_CS_KSMIRROR_A8,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,127,156,121,11
|
||||
CONTROL "No-EHB Denise",IDC_CS_NOEHB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,127,169,121,11
|
||||
CONTROL "Z3 Autoconfig",IDC_CS_Z3AUTOCONFIG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,127,182,104,11
|
||||
CONTROL "DF0: ID Hardware",IDC_CS_DF0IDHW,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,264,104,125,11
|
||||
CONTROL "CD32 NVRAM",IDC_CS_CD32NVRAM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,264,117,125,11
|
||||
CONTROL "CDTV SRAM Expansion",IDC_CS_CDTVRAMEXP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,264,130,125,11
|
||||
CONTROL "CDTV-CR",IDC_CS_CDTVCR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,264,143,123,11
|
||||
CONTROL "PCMCIA",IDC_CS_PCMCIA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,264,156,125,11
|
||||
CONTROL "C00000 is Fast RAM",IDC_CS_SLOWISFAST,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,264,170,125,11
|
||||
CONTROL "A1000 Agnus (8361/8367)",IDC_CS_DIPAGNUS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,264,184,125,11
|
||||
CONTROL "C00000 is Fast RAM",IDC_CS_SLOWISFAST,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,264,169,125,11
|
||||
CONTROL "A1000 Agnus (8361/8367)",IDC_CS_DIPAGNUS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,264,182,125,11
|
||||
GROUPBOX "Internal SCSI Hardware",IDC_STATIC,0,218,395,39
|
||||
CONTROL "A3000 WD33C93 SCSI",IDC_CS_DMAC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,236,108,11
|
||||
CONTROL "CDTV WD33C93 SCSI",IDC_CS_CDTVSCSI,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,264,236,121,11
|
||||
CONTROL "A4000T NCR53C710 SCSI",IDC_CS_DMAC2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,127,236,125,11
|
||||
CONTROL "CDTV WD33C93 SCSI",IDC_CS_CDTVSCSI,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,263,236,121,11
|
||||
CONTROL "A4000T NCR53C710 SCSI",IDC_CS_DMAC2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,130,236,125,11
|
||||
GROUPBOX "Chipset Revision",IDC_STATIC,1,259,393,46
|
||||
CONTROL "Ramsey revision:",IDC_CS_RAMSEY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,34,275,97,11
|
||||
CONTROL "Fat Gary revision:",IDC_CS_FATGARY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,34,289,97,11
|
||||
@ -793,8 +793,8 @@ BEGIN
|
||||
EDITTEXT IDC_CS_AGNUSREV,311,274,45,13,ES_AUTOHSCROLL
|
||||
EDITTEXT IDC_CS_DENISEREV,311,289,45,13,ES_AUTOHSCROLL
|
||||
CONTROL "Custom register byte write bug",IDC_CS_BYTECUSTOMWRITEBUG,
|
||||
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,127,197,130,11
|
||||
CONTROL "Composite color burst",IDC_CS_COMPOSITECOLOR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,264,196,125,12
|
||||
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,127,195,130,11
|
||||
CONTROL "Composite color burst",IDC_CS_COMPOSITECOLOR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,264,195,125,12
|
||||
END
|
||||
|
||||
IDD_AVIOUTPUT DIALOGEX 0, 0, 396, 260
|
||||
@ -1290,7 +1290,7 @@ BEGIN
|
||||
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,218,187,11
|
||||
COMBOBOX IDC_NETDEVICE,193,232,178,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
||||
CONTROL "Realtek 8029 PCI [] Realtek 8029 PCI NIC emulation",IDC_NE2000,
|
||||
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,193,219,187,11
|
||||
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,193,218,187,11
|
||||
CONTROL "Enabled",IDC_SCSIROMSELECTED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,202,43,99,12
|
||||
COMBOBOX IDC_SCSIROMSELECTCAT,12,23,157,75,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
|
||||
COMBOBOX IDC_EXPANSIONBOARDITEMSELECTOR,12,76,157,75,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
|
||||
@ -1299,7 +1299,7 @@ BEGIN
|
||||
COMBOBOX IDC_ACCELERATORBOARDITEMSELECTOR,12,169,157,75,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
|
||||
CONTROL "",IDC_ACCELERATORBOARDCHECKBOX,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,202,170,99,12
|
||||
COMBOBOX IDC_ACCELERATORBOARDSELECTOR,202,146,171,75,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
|
||||
CONTROL "NE2000 PCMCIA",IDC_NE2000PCMCIA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,233,187,11
|
||||
CONTROL "NE2000 PCMCIA",IDC_NE2000PCMCIA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,232,187,11
|
||||
END
|
||||
|
||||
|
||||
@ -1309,8 +1309,8 @@ END
|
||||
//
|
||||
|
||||
VS_VERSION_INFO VERSIONINFO
|
||||
FILEVERSION 3,3,1,0
|
||||
PRODUCTVERSION 3,3,1,0
|
||||
FILEVERSION 3,4,0,0
|
||||
PRODUCTVERSION 3,4,0,0
|
||||
FILEFLAGSMASK 0x3fL
|
||||
#ifdef _DEBUG
|
||||
FILEFLAGS 0x1L
|
||||
@ -1326,12 +1326,12 @@ BEGIN
|
||||
BLOCK "040904b0"
|
||||
BEGIN
|
||||
VALUE "FileDescription", "WinUAE"
|
||||
VALUE "FileVersion", "3.3.1.0"
|
||||
VALUE "FileVersion", "3.4.0.0"
|
||||
VALUE "InternalName", "WinUAE"
|
||||
VALUE "LegalCopyright", "© 1996-2016 under the GNU Public License (GPL)"
|
||||
VALUE "OriginalFilename", "WinUAE.exe"
|
||||
VALUE "ProductName", "WinUAE"
|
||||
VALUE "ProductVersion", "3.3.1.0"
|
||||
VALUE "ProductVersion", "3.4.0.0"
|
||||
END
|
||||
END
|
||||
BLOCK "VarFileInfo"
|
||||
@ -2074,6 +2074,7 @@ BEGIN
|
||||
"PPC native OS booted with incompatible UAE boot ROM enabled.\nSelect ROM panel ""New UAE (128k, ROM, Indirect)"" option\nor disable all UAE expansions.\n"
|
||||
IDS_AUTOSCALE_OVERSCAN_BLANK "Overscan blanking"
|
||||
IDS_SCREEN_ADAPTIVE_SYNC "Variable Sync"
|
||||
IDS_NUMSG_NOMEMORY "Out of memory or too much Z3 autoconfig space configured."
|
||||
END
|
||||
|
||||
#endif // English resources
|
||||
|
||||
@ -31,4 +31,10 @@
|
||||
</application>
|
||||
</compatibility>
|
||||
|
||||
<application xmlns="urn:schemas-microsoft-com:asm.v3">
|
||||
<windowsSettings xmlns:ws2="http://schemas.microsoft.com/SMI/2016/WindowsSettings">
|
||||
<ws2:longPathAware>true</ws2:longPathAware>
|
||||
</windowsSettings>
|
||||
</application>
|
||||
|
||||
</assembly>
|
||||
@ -1652,7 +1652,7 @@ static int open_sound (void)
|
||||
|
||||
have_sound = 1;
|
||||
sound_available = 1;
|
||||
gui_data.sndbuf_avail = !audio_is_pull();
|
||||
gui_data.sndbuf_avail = audio_is_pull() == 0;
|
||||
|
||||
paula_sndbufsize = sdp->sndbufsize;
|
||||
paula_sndbufpt = paula_sndbuffer;
|
||||
@ -2425,14 +2425,16 @@ bool audio_is_event_frame_possible(int ms)
|
||||
return false;
|
||||
}
|
||||
|
||||
bool audio_is_pull(void)
|
||||
int audio_is_pull(void)
|
||||
{
|
||||
int type = sdp->devicetype;
|
||||
if (type == SOUND_DEVICE_WASAPI || type == SOUND_DEVICE_WASAPI_EXCLUSIVE) {
|
||||
struct sound_dp *s = sdp->data;
|
||||
return s && s->wasapipull;
|
||||
if (s && s->wasapipull) {
|
||||
return sdp->paused ? -1 : 1;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
return 0;
|
||||
}
|
||||
|
||||
int audio_pull_buffer(void)
|
||||
|
||||
@ -18,7 +18,7 @@ copy /s c:\projects\winuae\src\od-win32\* c:\projects\winuae_bak\bak\od-win32\
|
||||
copy d:\amiga\amiga\filesys.asm c:\projects\winuae_bak\bak
|
||||
|
||||
cd bak
|
||||
del *.obj *.ilk *.exe *.pdb *.pch *.idb *.ncb *.sln *.suo *.ncb *.sdf /s
|
||||
del *.obj *.ilk *.exe *.pdb *.pch *.idb *.ncb *.sln *.suo *.ncb *.sdf *.db /s
|
||||
|
||||
del cpudefs.cpp
|
||||
del blit.h
|
||||
@ -191,7 +191,7 @@ cd ..
|
||||
copy winuaesrc.7z e:\amiga\winuaepackets\winuaesrc%1.7z
|
||||
move winuaesrc.7z e:\amiga
|
||||
cd c:\projects\winuae\src\od-win32
|
||||
7z a winuaedebug%1 winuae_msvc14\fullrelease\winuae.pdb winuae_msvc14\x64\fullrelease\winuae.pdb
|
||||
7z a winuaedebug%1 winuae_msvc15\fullrelease\winuae.pdb winuae_msvc15\x64\fullrelease\winuae.pdb
|
||||
move winuaedebug%1.7z e:\amiga\winuaepackets\debug\
|
||||
copy winuae_msvc14\fullrelease\winuae.pdb winuae_msvc14\x64\fullrelease\winuae.pdb d:\amiga\dump
|
||||
copy winuae_msvc15\fullrelease\winuae.pdb winuae_msvc15\x64\fullrelease\winuae.pdb d:\amiga\dump
|
||||
copy d:\amiga\winuae.exe d:\amiga\dump
|
||||
|
||||
@ -1769,7 +1769,7 @@ static LRESULT CALLBACK AmigaWindowProc (HWND hWnd, UINT message, WPARAM wParam,
|
||||
HANDLE lock = SHChangeNotification_Lock((HANDLE)wParam, (DWORD)lParam, &ppidl, &lEvent);
|
||||
if (lock) {
|
||||
if (lEvent == SHCNE_MEDIAINSERTED || lEvent == SHCNE_DRIVEADD || lEvent == SHCNE_MEDIAREMOVED || lEvent == SHCNE_DRIVEREMOVED) {
|
||||
TCHAR drvpath[MAX_PATH + 1];
|
||||
TCHAR drvpath[MAX_DPATH + 1];
|
||||
if (SHGetPathFromIDList(ppidl[0], drvpath)) {
|
||||
int inserted = (lEvent == SHCNE_MEDIAINSERTED || lEvent == SHCNE_DRIVEADD) ? 1 : 0;
|
||||
write_log (_T("Shell Notification %d '%s'\n"), inserted, drvpath);
|
||||
@ -2149,8 +2149,8 @@ static LRESULT CALLBACK MainWindowProc (HWND hWnd, UINT message, WPARAM wParam,
|
||||
lpmmi = (LPMINMAXINFO)lParam;
|
||||
lpmmi->ptMinTrackSize.x = 160 + window_extra_width;
|
||||
lpmmi->ptMinTrackSize.y = 128 + window_extra_height;
|
||||
lpmmi->ptMaxTrackSize.x = 3072 + window_extra_width;
|
||||
lpmmi->ptMaxTrackSize.y = 2048 + window_extra_height;
|
||||
lpmmi->ptMaxTrackSize.x = max_uae_width + window_extra_width;
|
||||
lpmmi->ptMaxTrackSize.y = max_uae_height + window_extra_height;
|
||||
}
|
||||
return 0;
|
||||
|
||||
|
||||
@ -20,12 +20,12 @@
|
||||
#define LANG_DLL_FULL_VERSION_MATCH 1
|
||||
|
||||
#if WINUAEPUBLICBETA
|
||||
#define WINUAEBETA _T("0")
|
||||
#define WINUAEBETA _T("1")
|
||||
#else
|
||||
#define WINUAEBETA _T("")
|
||||
#endif
|
||||
|
||||
#define WINUAEDATE MAKEBD(2016, 8, 4)
|
||||
#define WINUAEDATE MAKEBD(2016, 8, 21)
|
||||
|
||||
//#define WINUAEEXTRA _T("AmiKit Preview")
|
||||
//#define WINUAEEXTRA _T("Amiga Forever Edition")
|
||||
|
||||
@ -40,25 +40,25 @@ static int valid_volumename (struct uaedev_mount_info *mountinfo, const TCHAR *v
|
||||
}
|
||||
|
||||
/* Returns 1 if an actual volume-name was found, 2 if no volume-name (so uses some defaults) */
|
||||
int target_get_volume_name (struct uaedev_mount_info *mtinf, const TCHAR *volumepath, TCHAR *volumename, int size, bool inserted, bool fullcheck)
|
||||
int target_get_volume_name (struct uaedev_mount_info *mtinf, struct uaedev_config_info *ci, bool inserted, bool fullcheck, int cnt)
|
||||
{
|
||||
int result = 2;
|
||||
int drivetype;
|
||||
|
||||
drivetype = GetDriveType (volumepath);
|
||||
drivetype = GetDriveType (ci->rootdir);
|
||||
if (inserted) {
|
||||
if (GetVolumeInformation (volumepath, volumename, size, NULL, NULL, NULL, NULL, 0) &&
|
||||
volumename[0] &&
|
||||
valid_volumename (mtinf, volumename, fullcheck)) {
|
||||
if (GetVolumeInformation (ci->rootdir, ci->volname, sizeof ci->volname / sizeof (TCHAR), NULL, NULL, NULL, NULL, 0) &&
|
||||
ci->volname[0] &&
|
||||
valid_volumename (mtinf, ci->volname, fullcheck)) {
|
||||
// +++Bernd Roesch
|
||||
if(!_tcscmp (volumename, _T("AmigaOS35")))
|
||||
_tcscpy (volumename, _T("AmigaOS3.5"));
|
||||
if(!_tcscmp (volumename, _T("AmigaOS39")))
|
||||
_tcscpy (volumename, _T("AmigaOS3.9"));
|
||||
if(!_tcscmp (volumename, _T("AmigaOS_XL")))
|
||||
_tcscpy (volumename, _T("AmigaOS XL"));
|
||||
if(!_tcscmp (ci->volname, _T("AmigaOS35")))
|
||||
_tcscpy (ci->volname, _T("AmigaOS3.5"));
|
||||
if(!_tcscmp (ci->volname, _T("AmigaOS39")))
|
||||
_tcscpy (ci->volname, _T("AmigaOS3.9"));
|
||||
if(!_tcscmp (ci->volname, _T("AmigaOS_XL")))
|
||||
_tcscpy (ci->volname, _T("AmigaOS XL"));
|
||||
// ---Bernd Roesch
|
||||
if (_tcslen (volumename) > 0)
|
||||
if (_tcslen (ci->volname) > 0)
|
||||
result = 1;
|
||||
}
|
||||
}
|
||||
@ -67,19 +67,19 @@ int target_get_volume_name (struct uaedev_mount_info *mtinf, const TCHAR *volume
|
||||
switch(drivetype)
|
||||
{
|
||||
case DRIVE_FIXED:
|
||||
_stprintf (volumename, _T("WinDH_%c"), volumepath[0]);
|
||||
_stprintf (ci->volname, _T("WinDH_%c"), ci->rootdir[0]);
|
||||
break;
|
||||
case DRIVE_CDROM:
|
||||
_stprintf (volumename, _T("WinCD_%c"), volumepath[0]);
|
||||
_stprintf (ci->volname, _T("WinCD_%c"), ci->rootdir[0]);
|
||||
break;
|
||||
case DRIVE_REMOVABLE:
|
||||
_stprintf (volumename, _T("WinRMV_%c"), volumepath[0]);
|
||||
_stprintf (ci->volname, _T("WinRMV_%c"), ci->rootdir[0]);
|
||||
break;
|
||||
case DRIVE_REMOTE:
|
||||
_stprintf (volumename, _T("WinNET_%c"), volumepath[0]);
|
||||
_stprintf (ci->volname, _T("WinNET_%c"), ci->rootdir[0]);
|
||||
break;
|
||||
case DRIVE_RAMDISK:
|
||||
_stprintf (volumename, _T("WinRAM_%c"), volumepath[0]);
|
||||
_stprintf (ci->volname, _T("WinRAM_%c"), ci->rootdir[0]);
|
||||
break;
|
||||
case DRIVE_UNKNOWN:
|
||||
case DRIVE_NO_ROOT_DIR:
|
||||
@ -89,6 +89,18 @@ int target_get_volume_name (struct uaedev_mount_info *mtinf, const TCHAR *volume
|
||||
}
|
||||
}
|
||||
|
||||
if (cnt >= 0) {
|
||||
switch (drivetype)
|
||||
{
|
||||
case DRIVE_REMOTE:
|
||||
_stprintf(ci->devname, _T("NDH%d"), cnt);
|
||||
break;
|
||||
case DRIVE_CDROM:
|
||||
_stprintf(ci->devname, _T("CDH%d"), cnt);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
@ -137,6 +149,7 @@ void filesys_addexternals (void)
|
||||
UINT errormode;
|
||||
DWORD dwDriveMask;
|
||||
int drvnum = 0;
|
||||
int cnt = 0;
|
||||
|
||||
if (!currprefs.win32_automount_cddrives && !currprefs.win32_automount_netdrives
|
||||
&& !currprefs.win32_automount_drives && !currprefs.win32_automount_removabledrives)
|
||||
@ -178,7 +191,7 @@ void filesys_addexternals (void)
|
||||
if (nok)
|
||||
continue;
|
||||
if (inserted) {
|
||||
target_get_volume_name (&mountinfo, ci.rootdir, ci.volname, MAX_DPATH, inserted, true);
|
||||
target_get_volume_name (&mountinfo, &ci, inserted, true, cnt++);
|
||||
if (!ci.volname[0])
|
||||
_stprintf (ci.volname, _T("WinUNK_%c"), drive);
|
||||
}
|
||||
|
||||
@ -887,6 +887,8 @@ void S2X_render (void)
|
||||
return;
|
||||
if (aw < 16)
|
||||
return;
|
||||
if (!vb->bufmem)
|
||||
return;
|
||||
|
||||
sptr = vb->bufmem;
|
||||
endsptr = vb->bufmemend;
|
||||
|
||||
@ -3172,6 +3172,7 @@ static bool getvblankpos2 (int *vp, int *flags, bool updateprev)
|
||||
|
||||
static bool waitvblankstate (bool state, int *maxvpos, int *flags)
|
||||
{
|
||||
bool waitzero = false;
|
||||
int vp;
|
||||
int count = 0;
|
||||
if (flags)
|
||||
@ -3188,10 +3189,12 @@ static bool waitvblankstate (bool state, int *maxvpos, int *flags)
|
||||
}
|
||||
if (maxvpos)
|
||||
*maxvpos = maxscanline;
|
||||
if (vp < 0) {
|
||||
if (vp < 0 || (waitzero && vp == 0)) {
|
||||
if (state)
|
||||
return true;
|
||||
} else {
|
||||
if (vp > 0)
|
||||
waitzero = true;
|
||||
if (!state)
|
||||
return true;
|
||||
}
|
||||
@ -3216,7 +3219,7 @@ static int timezeroonevblank (int startline, int endline)
|
||||
for (;;) {
|
||||
if (!getvblankpos (&vp, false))
|
||||
return -1;
|
||||
if (vp == startline)
|
||||
if (vp == startline || (vp == 0 && startline < 0))
|
||||
break;
|
||||
}
|
||||
frame_time_t start = read_processor_time ();
|
||||
@ -3950,6 +3953,7 @@ double vblank_calibrate (double approx_vblank, bool waitonly)
|
||||
|
||||
if (waitonly)
|
||||
tsum = approx_vblank;
|
||||
waitonly = false;
|
||||
skip:
|
||||
|
||||
vblank_skipeveryother = 0;
|
||||
|
||||
@ -284,7 +284,7 @@ static void hide (HWND hDlg, DWORD id, int hide)
|
||||
ShowWindow (w, hide ? SW_HIDE : SW_SHOW);
|
||||
}
|
||||
|
||||
static int scsiromselect_table[32];
|
||||
static int scsiromselect_table[256];
|
||||
|
||||
static void gui_add_string(int *table, HWND hDlg, int item, int id, const TCHAR *str)
|
||||
{
|
||||
@ -347,7 +347,7 @@ static INT_PTR CALLBACK StringBoxDialogProc (HWND hDlg, UINT msg, WPARAM wParam,
|
||||
|
||||
static int CALLBACK BrowseForFolderCallback (HWND hwnd, UINT uMsg, LPARAM lp, LPARAM pData)
|
||||
{
|
||||
TCHAR szPath[MAX_PATH];
|
||||
TCHAR szPath[MAX_DPATH];
|
||||
switch(uMsg)
|
||||
{
|
||||
case BFFM_INITIALIZED:
|
||||
@ -1284,7 +1284,7 @@ static int drag_move (HWND hWnd, LPARAM lParam)
|
||||
static HWND cachedlist = NULL;
|
||||
|
||||
static const TCHAR *memsize_names[] = {
|
||||
/* 0 */ _T("none")
|
||||
/* 0 */ _T("none"),
|
||||
/* 1 */ _T("64 KB"),
|
||||
/* 2 */ _T("128 KB"),
|
||||
/* 3 */ _T("256 KB"),
|
||||
@ -9374,6 +9374,7 @@ static INT_PTR CALLBACK Expansion2DlgProc(HWND hDlg, UINT msg, WPARAM wParam, LP
|
||||
if (v != CB_ERR && v != workprefs.cpuboard_subtype) {
|
||||
workprefs.cpuboard_subtype = v;
|
||||
workprefs.cpuboard_settings = 0;
|
||||
updatecpuboardsubtypes(hDlg);
|
||||
if (is_ppc_cpu(&workprefs)) {
|
||||
workprefs.ppc_mode = 2;
|
||||
} else if (workprefs.ppc_mode == 2) {
|
||||
@ -20104,6 +20105,7 @@ static const int transla[] = {
|
||||
NUMSG_KS68030PLUS, IDS_NUMSG_KS68030PLUS,
|
||||
NUMSG_NO_PPC, IDS_NUMSG_NO_PPC,
|
||||
NUMSG_UAEBOOTROM_PPC, IDS_NUMSG_UAEBOOTROM_PCC,
|
||||
NUMSG_NOMEMORY, IDS_NUMSG_NOMEMORY,
|
||||
-1
|
||||
};
|
||||
|
||||
|
||||
@ -161,9 +161,9 @@
|
||||
<LibraryPath Condition="'$(Configuration)|$(Platform)'=='Test|Win32'">$(MSBuildProgramFiles32)\Windows Kits\10\lib\10.0.10240.0\ucrt\$(PlatformShortName);C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Lib\x86;C:\dev\lib;C:\dev\WinDDK\7600.16385.1\lib\win7\i386;$(LibraryPath)</LibraryPath>
|
||||
<LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Lib\x86;C:\dev\lib;C:\dev\WinDDK\7600.16385.1\lib\win7\i386;$(LibraryPath)</LibraryPath>
|
||||
<IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Include;C:\dev\include;$(IncludePath)</IncludePath>
|
||||
<IncludePath Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'">C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Include;C:\dev\include;$(IncludePath)</IncludePath>
|
||||
<IncludePath Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'">$(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.10240.0\ucrt;C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Include;C:\dev\include;$(IncludePath)</IncludePath>
|
||||
<ReferencePath Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'">$(ReferencePath)</ReferencePath>
|
||||
<LibraryPath Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'">C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Lib\x86;C:\dev\lib;$(LibraryPath)</LibraryPath>
|
||||
<LibraryPath Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'">$(MSBuildProgramFiles32)\Windows Kits\10\lib\10.0.10240.0\ucrt\$(PlatformShortName);C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Lib\x86;C:\dev\lib;$(LibraryPath)</LibraryPath>
|
||||
<EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</EmbedManifest>
|
||||
<EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Test|Win32'">true</EmbedManifest>
|
||||
<EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
|
||||
@ -435,7 +435,7 @@
|
||||
<Culture>0x0409</Culture>
|
||||
</ResourceCompile>
|
||||
<Link>
|
||||
<AdditionalDependencies>ws2_32.lib;ddraw.lib;dxguid.lib;winmm.lib;comctl32.lib;version.lib;msacm32.lib;dsound.lib;dinput8.lib;d3d9.lib;d3dx9.lib;winio.lib;setupapi.lib;wininet.lib;dxerr.lib;shlwapi.lib;libpng16.lib;lglcd.lib;wpcap.lib;packet.lib;openal32.lib;portaudio_x86.lib;vfw32.lib;wtsapi32.lib;enet.lib;lzmalib.lib;prowizard.lib;libFLAC_static.lib;Avrt.lib;hid.lib;zlibstat.lib;Iphlpapi.lib;luastatic.lib;libmpeg2_ff.lib;softfloat.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<AdditionalDependencies>ws2_32.lib;ddraw.lib;dxguid.lib;winmm.lib;comctl32.lib;version.lib;msacm32.lib;dsound.lib;dinput8.lib;d3d9.lib;d3dx9.lib;winio.lib;setupapi.lib;wininet.lib;dxerr.lib;shlwapi.lib;libpng16.lib;lglcd.lib;wpcap.lib;packet.lib;openal32.lib;portaudio_x86.lib;vfw32.lib;wtsapi32.lib;enet.lib;lzmalib.lib;prowizard.lib;libFLAC_static.lib;hid.lib;zlibstat.lib;Iphlpapi.lib;luastatic.lib;libmpeg2_ff.lib;softfloat.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
|
||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories);$(SolutionDir)\..\lib\</AdditionalLibraryDirectories>
|
||||
@ -513,13 +513,13 @@
|
||||
<Culture>0x0409</Culture>
|
||||
</ResourceCompile>
|
||||
<Link>
|
||||
<AdditionalDependencies>ws2_32.lib;ddraw.lib;dxguid.lib;winmm.lib;comctl32.lib;version.lib;vfw32.lib;msacm32.lib;dsound.lib;dinput8.lib;d3d9.lib;d3dx9.lib;setupapi.lib;wininet.lib;dxerr.lib;shlwapi.lib;zlibstat.lib;portaudio_x64.lib;packet.lib;wpcap.lib;openal32.lib;libpng16.lib;lglcd.lib;wtsapi32.lib;enet_x64.lib;prowizard_x64.lib;lzmalib.lib;libFLAC_static.lib;avrt.lib;hid.lib;Iphlpapi.lib;luastatic.lib;libmpeg2_ff.lib;softfloat.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<AdditionalDependencies>ws2_32.lib;ddraw.lib;dxguid.lib;winmm.lib;comctl32.lib;version.lib;vfw32.lib;msacm32.lib;dsound.lib;dinput8.lib;d3d9.lib;d3dx9.lib;setupapi.lib;wininet.lib;dxerr.lib;shlwapi.lib;zlibstat.lib;portaudio_x64.lib;packet.lib;wpcap.lib;openal32.lib;libpng16.lib;lglcd.lib;wtsapi32.lib;enet_x64.lib;prowizard_x64.lib;lzmalib.lib;libFLAC_static.lib;hid.lib;Iphlpapi.lib;luastatic.lib;libmpeg2_ff.lib;softfloat.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<ShowProgress>NotSet</ShowProgress>
|
||||
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
|
||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories);$(SolutionDir)\..\lib\</AdditionalLibraryDirectories>
|
||||
<IgnoreSpecificDefaultLibraries>MSVCRT.lib;%(IgnoreSpecificDefaultLibraries);MSVCRT</IgnoreSpecificDefaultLibraries>
|
||||
<DelayLoadDLLs>wpcap.dll;packet.dll;d3dx9_43.dll;openal32.dll;portaudio_x64.dll;ws2_32.dll;msacm32.dll;wtsapi32.dll;dsound.dll;avrt.dll;Iphlpapi.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
|
||||
<DelayLoadDLLs>wpcap.dll;packet.dll;d3dx9_43.dll;openal32.dll;portaudio_x64.dll;ws2_32.dll;msacm32.dll;wtsapi32.dll;dsound.dll;Iphlpapi.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
<ProgramDatabaseFile>$(Platform)\$(Configuration)\winuae.pdb</ProgramDatabaseFile>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
@ -587,13 +587,13 @@
|
||||
<Culture>0x0409</Culture>
|
||||
</ResourceCompile>
|
||||
<Link>
|
||||
<AdditionalDependencies>ws2_32.lib;ddraw.lib;dxguid.lib;winmm.lib;comctl32.lib;version.lib;vfw32.lib;msacm32.lib;dsound.lib;dinput8.lib;d3d9.lib;d3dx9.lib;setupapi.lib;wininet.lib;dxerr.lib;shlwapi.lib;zlibstat.lib;portaudio_x64.lib;packet.lib;wpcap.lib;openal32.lib;libpng16.lib;lglcd.lib;wtsapi32.lib;enet_x64.lib;prowizard_x64.lib;lzmalib.lib;libFLAC_static.lib;avrt.lib;hid.lib;Iphlpapi.lib;luastatic.lib;libmpeg2_ff.lib;softfloat.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<AdditionalDependencies>ws2_32.lib;ddraw.lib;dxguid.lib;winmm.lib;comctl32.lib;version.lib;vfw32.lib;msacm32.lib;dsound.lib;dinput8.lib;d3d9.lib;d3dx9.lib;setupapi.lib;wininet.lib;dxerr.lib;shlwapi.lib;zlibstat.lib;portaudio_x64.lib;packet.lib;wpcap.lib;openal32.lib;libpng16.lib;lglcd.lib;wtsapi32.lib;enet_x64.lib;prowizard_x64.lib;lzmalib.lib;libFLAC_static.lib;hid.lib;Iphlpapi.lib;luastatic.lib;libmpeg2_ff.lib;softfloat.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<ShowProgress>NotSet</ShowProgress>
|
||||
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
|
||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories);$(SolutionDir)\..\lib\</AdditionalLibraryDirectories>
|
||||
<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries);MSVCRT</IgnoreSpecificDefaultLibraries>
|
||||
<DelayLoadDLLs>wpcap.dll;packet.dll;d3dx9_43.dll;openal32.dll;portaudio_x64.dll;ws2_32.dll;msacm32.dll;wtsapi32.dll;dsound.dll;avrt.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
|
||||
<DelayLoadDLLs>wpcap.dll;packet.dll;d3dx9_43.dll;openal32.dll;portaudio_x64.dll;ws2_32.dll;msacm32.dll;wtsapi32.dll;dsound.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
<ProgramDatabaseFile>$(Platform)\$(Configuration)\winuae.pdb</ProgramDatabaseFile>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
@ -661,13 +661,13 @@
|
||||
<Culture>0x0409</Culture>
|
||||
</ResourceCompile>
|
||||
<Link>
|
||||
<AdditionalDependencies>ws2_32.lib;ddraw.lib;dxguid.lib;winmm.lib;comctl32.lib;version.lib;msacm32.lib;dsound.lib;dinput8.lib;d3d9.lib;d3dx9.lib;winio.lib;setupapi.lib;wininet.lib;dxerr.lib;shlwapi.lib;zlibstat.lib;libpng16.lib;lglcd.lib;wpcap.lib;packet.lib;openal32.lib;portaudio_x86.lib;vfw32.lib;wtsapi32.lib;avrt.lib;enet.lib;prowizard.lib;lzmalib.lib;libFLAC_static.lib;Avrt.lib;hid.lib;Iphlpapi.lib;luastatic.lib;libmpeg2_ff.lib;softfloat.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<AdditionalDependencies>ws2_32.lib;ddraw.lib;dxguid.lib;winmm.lib;comctl32.lib;version.lib;msacm32.lib;dsound.lib;dinput8.lib;d3d9.lib;d3dx9.lib;winio.lib;setupapi.lib;wininet.lib;dxerr.lib;shlwapi.lib;zlibstat.lib;libpng16.lib;lglcd.lib;wpcap.lib;packet.lib;openal32.lib;portaudio_x86.lib;vfw32.lib;wtsapi32.lib;enet.lib;prowizard.lib;lzmalib.lib;libFLAC_static.lib;hid.lib;Iphlpapi.lib;luastatic.lib;libmpeg2_ff.lib;softfloat.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
|
||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories);$(SolutionDir)\..\lib\</AdditionalLibraryDirectories>
|
||||
<AdditionalManifestDependencies>%(AdditionalManifestDependencies)</AdditionalManifestDependencies>
|
||||
<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
|
||||
<DelayLoadDLLs>wpcap.dll;packet.dll;d3dx9_43.dll;openal32.dll;portaudio_x86.dll;ws2_32.dll;msacm32.dll;wtsapi32.dll;dsound.dll;wininet.dll;avrt.dll;ddraw.dll;Iphlpapi.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
|
||||
<DelayLoadDLLs>wpcap.dll;packet.dll;d3dx9_43.dll;openal32.dll;portaudio_x86.dll;ws2_32.dll;msacm32.dll;wtsapi32.dll;dsound.dll;wininet.dll;ddraw.dll;Iphlpapi.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
<ProgramDatabaseFile>.\FullRelease/winuae.pdb</ProgramDatabaseFile>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
@ -739,13 +739,13 @@
|
||||
<Culture>0x0409</Culture>
|
||||
</ResourceCompile>
|
||||
<Link>
|
||||
<AdditionalDependencies>ws2_32.lib;ddraw.lib;dxguid.lib;winmm.lib;comctl32.lib;version.lib;vfw32.lib;msacm32.lib;dsound.lib;dinput8.lib;d3d9.lib;d3dx9.lib;setupapi.lib;wininet.lib;dxerr.lib;shlwapi.lib;zlibstat.lib;portaudio_x64.lib;packet.lib;wpcap.lib;openal32.lib;libpng16.lib;lglcd.lib;wtsapi32.lib;enet_x64.lib;prowizard_x64.lib;lzmalib.lib;libFLAC_static.lib;avrt.lib;hid.lib;Iphlpapi.lib;luastatic.lib;libmpeg2_ff.lib;softfloat.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<AdditionalDependencies>ws2_32.lib;ddraw.lib;dxguid.lib;winmm.lib;comctl32.lib;version.lib;vfw32.lib;msacm32.lib;dsound.lib;dinput8.lib;d3d9.lib;d3dx9.lib;setupapi.lib;wininet.lib;dxerr.lib;shlwapi.lib;zlibstat.lib;portaudio_x64.lib;packet.lib;wpcap.lib;openal32.lib;libpng16.lib;lglcd.lib;wtsapi32.lib;enet_x64.lib;prowizard_x64.lib;lzmalib.lib;libFLAC_static.lib;hid.lib;Iphlpapi.lib;luastatic.lib;libmpeg2_ff.lib;softfloat.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<ShowProgress>NotSet</ShowProgress>
|
||||
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
|
||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories);$(SolutionDir)\..\lib\</AdditionalLibraryDirectories>
|
||||
<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries);MSVCRT</IgnoreSpecificDefaultLibraries>
|
||||
<DelayLoadDLLs>wpcap.dll;packet.dll;d3dx9_43.dll;openal32.dll;portaudio_x64.dll;ws2_32.dll;msacm32.dll;wtsapi32.dll;dsound.dll;avrt.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
|
||||
<DelayLoadDLLs>wpcap.dll;packet.dll;d3dx9_43.dll;openal32.dll;portaudio_x64.dll;ws2_32.dll;msacm32.dll;wtsapi32.dll;dsound.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
<ProgramDatabaseFile>.\x64\FullRelease/winuae.pdb</ProgramDatabaseFile>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
Loading…
x
Reference in New Issue
Block a user