joncampbell123/dosbox-x
1
0
Fork 0
mirror of https://github.com/joncampbell123/dosbox-x.git synced 2025-05-09 11:51:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

update ref and timestamp

Browse Source
This commit is contained in:
Wengier 2020-10-28 16:45:55 -04:00
parent d30835e306
commit 9899401162
5 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/linux/com.dosbox_x.DOSBox-X.metainfo.xml.in
View File

@ -10,7 +10,7 @@
<category>Emulation</category>
</categories>
<releases>
<release version="@PACKAGE_VERSION@" date="2020-10-27"/>
<release version="@PACKAGE_VERSION@" date="2020-10-28"/>
</releases>
<screenshots>
<screenshot type="default">

2
contrib/windows/installer/dosbox-x.reference.setup.conf
View File

@ -796,6 +796,7 @@ vsyncrate = 75
#DOSBOX-X-ADV:# reset on triple fault: Reset CPU on triple fault condition (failure to handle double fault)
#DOSBOX-X-ADV:# always report double fault: Always report (to log file) double faults if set. Else, a double fault is reported only once. Set this option for debugging purposes.
#DOSBOX-X-ADV:# always report triple fault: Always report (to log file) triple faults if set. Else, a triple fault is reported only once. Set this option for debugging purposes.
#DOSBOX-X-ADV:# report fdiv bug: If set, the FDIV bug will be reported with the cputype=pentium setting.
#DOSBOX-X-ADV:# enable msr: Allow RDMSR/WRMSR instructions. This option is only meaningful when cputype=pentium.
#DOSBOX-X-ADV:# WARNING: Leaving this option enabled while installing Windows 95/98/ME can cause crashes.
#DOSBOX-X-ADV:# enable cmpxchg8b: Enable Pentium CMPXCHG8B instruction. Enable this explicitly if using software that uses this instruction.
@ -863,6 +864,7 @@ fpu = true
#DOSBOX-X-ADV:reset on triple fault = true
#DOSBOX-X-ADV:always report double fault = false
#DOSBOX-X-ADV:always report triple fault = false
#DOSBOX-X-ADV:report fdiv bug = false
#DOSBOX-X-ADV:enable msr = true
#DOSBOX-X-ADV:enable cmpxchg8b = true
#DOSBOX-X-ADV:ignore undefined msr = false

2
dosbox-x.reference.full.conf
View File

@ -796,6 +796,7 @@ vsyncrate = 75
# reset on triple fault: Reset CPU on triple fault condition (failure to handle double fault)
# always report double fault: Always report (to log file) double faults if set. Else, a double fault is reported only once. Set this option for debugging purposes.
# always report triple fault: Always report (to log file) triple faults if set. Else, a triple fault is reported only once. Set this option for debugging purposes.
# report fdiv bug: If set, the FDIV bug will be reported with the cputype=pentium setting.
# enable msr: Allow RDMSR/WRMSR instructions. This option is only meaningful when cputype=pentium.
# WARNING: Leaving this option enabled while installing Windows 95/98/ME can cause crashes.
# enable cmpxchg8b: Enable Pentium CMPXCHG8B instruction. Enable this explicitly if using software that uses this instruction.
@ -863,6 +864,7 @@ double fault = true
reset on triple fault = true
always report double fault = false
always report triple fault = false
report fdiv bug = false
enable msr = true
enable cmpxchg8b = true
ignore undefined msr = false

4
include/build_timestamp.h
View File

@ -1,4 +1,4 @@
/*auto-generated*/
#define UPDATED_STR "Oct 27, 2020 8:23:16pm"
#define GIT_COMMIT_HASH "d4dfe48"
#define UPDATED_STR "Oct 28, 2020 4:44:49pm"
#define GIT_COMMIT_HASH "d30835e"
#define COPYRIGHT_END_YEAR "2020"

2
src/gui/sdlmain.cpp
View File

@ -10576,8 +10576,6 @@ int main(int argc, char* argv[]) SDL_MAIN_NOEXCEPT {
mainMenu.get_item("doublescan").enable(!IS_PC98_ARCH);
blinking=static_cast<Section_prop *>(control->GetSection("video"))->Get_bool("high intensity blinking");
LOG_MSG("blinking %d\n", blinking?1:0);
mainMenu.get_item("text_background").enable(!IS_PC98_ARCH).check(!blinking).refresh_item(mainMenu);
mainMenu.get_item("text_blinking").enable(!IS_PC98_ARCH).check(blinking).refresh_item(mainMenu);
mainMenu.get_item("line_80x25").enable(!IS_PC98_ARCH);