6000

diff --git a/custom.cpp b/custom.cpp
index 9bbcb6a09a4eed5cb4fb55af28f3e946458a6cc6..4c63f664e89cd15efa025a877770970e95977ab3 100644 (file)
--- a/custom.cpp
+++ b/custom.cpp
@@ -3137,12 +3137,9 @@ static void DMACON(int hpos, uae_u16 v)
 
        changed = dmacon ^ oldcon;
 
-#if 0
-       if (v == 0x9696 && vpos == 0xf1 && agnus_hpos == 0x60)
-               write_log(_T("%04x -> %04x %08x\n"), oldcon, dmacon, m68k_getpc ());
-       if (changed)
-               write_log(_T("%04x -> %04x %08x\n"), oldcon, dmacon, m68k_getpc ());
-#endif
+       if (0) {
+               write_log("%04x: %04x -> %04x %08x %08x\n", changed, oldcon, dmacon, M68K_GETPC, cop_state.ip);
+       }
 
        int oldcop = (oldcon & DMA_COPPER) != 0 && (oldcon & DMA_MASTER) != 0;
        int newcop = (dmacon & DMA_COPPER) != 0 && (dmacon & DMA_MASTER) != 0;

diff --git a/od-win32/resources/winuae_minimal.rc b/od-win32/resources/winuae_minimal.rc
index 5d2f5fe36dd80c638b4d3d41cc39682a0da1ee4b..96f55e2303b70fa8b653b478263623264b970171 100644 (file)
--- a/od-win32/resources/winuae_minimal.rc
+++ b/od-win32/resources/winuae_minimal.rc
@@ -159,8 +159,7 @@ BEGIN
     GROUPBOX        "Screen",IDC_SCREENRESTEXT,1,4,393,81,BS_LEFT
     COMBOBOX        IDC_DISPLAYSELECT,10,17,375,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
     RTEXT           "Fullscreen:",IDC_STATIC,3,35,51,15,SS_CENTERIMAGE
-    COMBOBOX        IDC_RESOLUTION,59,35,76,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX        IDC_RESOLUTIONDEPTH,144,35,62,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX        IDC_RESOLUTION,59,35,93,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
     RTEXT           "Windowed:",IDC_STATIC,2,52,51,15,SS_CENTERIMAGE
     EDITTEXT        IDC_XSIZE,59,54,43,12,ES_NUMBER
     EDITTEXT        IDC_YSIZE,110,54,43,12,ES_NUMBER
@@ -749,57 +748,64 @@ IDD_CHIPSET DIALOGEX 0, 0, 396, 316
 STYLE DS_LOCALEDIT | DS_SETFONT | DS_3DLOOK | DS_CONTROL | WS_CHILD
 FONT 8, "MS Sans Serif", 0, 0, 0x0
 BEGIN
-    GROUPBOX        "Chipset",IDC_STATIC,1,5,212,151
-    CONTROL         "OCS [] Original chipset. A1000 and most A500s.",IDC_OCS,
-                    "Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,12,26,88,10
-    CONTROL         "ECS Agnus [] Enhanced chipset (ECS Agnus chip only). CDTV and later A500 and A2000 hardware revisions.",IDC_ECS_AGNUS,
-                    "Button",BS_AUTORADIOBUTTON | WS_TABSTOP,12,42,88,10
+    GROUPBOX        "Chipset",IDC_STATIC,1,5,214,118
+    CONTROL         "OCS Agnus + OCS Denise [] Most A500s and A2000s. Slightly updated A1000 chipset.",IDC_OCS,
+                    "Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,14,38,88,10
+    CONTROL         "ECS Agnus + OCS Denise [] Enhanced chipset (ECS Agnus chip only). CDTV and later A500 and A2000 hardware revisions.",IDC_ECS_AGNUS,
+                    "Button",BS_AUTORADIOBUTTON | WS_TABSTOP,14,54,88,10
     CONTROL         "Full ECS [] Full ECS chipset (ECS Agnus and ECS Denise chips). A500+, A600 and A3000.",IDC_ECS,
-                    "Button",BS_AUTORADIOBUTTON | WS_TABSTOP,12,58,88,10
+                    "Button",BS_AUTORADIOBUTTON | WS_TABSTOP,112,54,88,10
     CONTROL         "AGA [] Advanced Graphics Architecture chipset. A1200, A4000 and CD32.",IDC_AGA,
-                    "Button",BS_AUTORADIOBUTTON | WS_TABSTOP,114,26,86,10
-    CONTROL         "ECS Denise [] Enhanced chipset (ECS Denise chip only). Normally paired with ECS Agnus.",IDC_ECS_DENISE,
-                    "Button",BS_AUTORADIOBUTTON | WS_TABSTOP,114,42,86,10
+                    "Button",BS_AUTORADIOBUTTON | WS_TABSTOP,14,71,86,10
+    CONTROL         "OCS Agnus + ECS Denise [] Enhanced chipset (ECS Denise chip only). Normally paired with ECS Agnus.",IDC_ECS_DENISE,
+                    "Button",BS_AUTORADIOBUTTON | WS_TABSTOP,112,38,86,10
+    CONTROL         "A1000 [] Original A1000 chipset.",IDC_OCSA1000,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,112,23,88,10
+    CONTROL         "A1000 (No EHB) [] Original, early A1000 chipset. without EHB support.",IDC_OCSA1000NOEHB,
+                    "Button",BS_AUTORADIOBUTTON | WS_TABSTOP,14,23,88,10
     CONTROL         "NTSC [] North American and Japanese display standard, 60Hz refresh rate. Other countries use PAL (50Hz. display refresh rate)",IDC_NTSC,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,114,58,86,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,112,71,86,10
     CONTROL         "Cycle-exact (Full) [] The most compatible A500/A1200 emulation mode.",IDC_CYCLEEXACT,
-                    "Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,12,79,194,10
-    CONTROL         "Cycle-exact (DMA/Memory accesses)",IDC_CYCLEEXACTMEMORY,
                     "Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,12,92,194,10
-    RTEXT           "Chipset Extra:",IDC_STATIC,38,119,71,15,SS_CENTERIMAGE
-    COMBOBOX        IDC_CS_EXT,116,120,88,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    GROUPBOX        "Options",IDC_STATIC,221,4,173,154
-    CONTROL         "Keyboard connected",IDC_KEYBOARD_CONNECTED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,234,17,150,10
-    CONTROL         "Subpixel display emulation",IDC_SUBPIXEL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,234,31,150,10
+    CONTROL         "Cycle-exact (DMA/Memory accesses)",IDC_CYCLEEXACTMEMORY,
+                    "Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,12,105,194,10
+    RTEXT           "Chipset Extra:",IDC_STATIC,226,75,61,15,SS_CENTERIMAGE
+    COMBOBOX        IDC_CS_EXT,295,75,88,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    GROUPBOX        "Options",IDC_STATIC,221,4,173,175
     CONTROL         "Immediate Blitter [] Faster but less compatible blitter emulation.",IDC_BLITIMM,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,234,45,150,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,234,23,150,10
     CONTROL         "Wait for Blitter [] Compatibility hack for programs that don't wait for the blitter correctly, causing graphics corruption if CPU is too fast.",IDC_BLITWAIT,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,234,57,150,10
-    LTEXT           "Monitor sync source:",IDC_STATIC,242,75,101,9
-    COMBOBOX        IDC_CS_HVCSYNC,237,90,147,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT           "Video port display hardware:",IDC_STATIC,241,105,117,15,SS_CENTERIMAGE
-    COMBOBOX        IDC_MONITOREMU,237,123,147,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT           "Monitor:",IDC_STATIC,240,139,68,15,SS_CENTERIMAGE,WS_EX_RIGHT
-    COMBOBOX        IDC_MONITOREMU_MON,319,141,65,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    GROUPBOX        "Collision Level",IDC_STATIC,1,161,393,48
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,234,35,150,10
+    LTEXT           "Monitor sync source:",IDC_STATIC,242,96,101,9
+    COMBOBOX        IDC_CS_HVCSYNC,237,108,147,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT           "Video port display hardware:",IDC_STATIC,241,123,117,15,SS_CENTERIMAGE
+    COMBOBOX        IDC_MONITOREMU,237,141,147,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT           "Monitor:",IDC_STATIC,240,157,68,15,SS_CENTERIMAGE,WS_EX_RIGHT
+    COMBOBOX        IDC_MONITOREMU_MON,319,159,65,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    GROUPBOX        "Collision Level",IDC_STATIC,1,180,393,48
     CONTROL         "None [] Collision hardware emulation disabled.",IDC_COLLISION0,
-                    "Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,47,177,101,10
+                    "Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,47,196,101,10
     CONTROL         "Sprites only [] Emulate only sprite vs. sprite collisions.",IDC_COLLISION1,
-                    "Button",BS_AUTORADIOBUTTON | WS_TABSTOP,47,192,101,10
+                    "Button",BS_AUTORADIOBUTTON | WS_TABSTOP,47,211,101,10
     CONTROL         "Sprites and Sprites vs. Playfield [] Recommended collision emulation level.",IDC_COLLISION2,
-                    "Button",BS_AUTORADIOBUTTON | WS_TABSTOP,182,177,181,10
+                    "Button",BS_AUTORADIOBUTTON | WS_TABSTOP,182,196,181,10
     CONTROL         "Full [] 100% collision hardware emulation. Only very few games need this option. Slowest.",IDC_COLLISION3,
-                    "Button",BS_AUTORADIOBUTTON | WS_TABSTOP,182,192,181,10
-    GROUPBOX        "Genlock",IDC_STATIC,0,215,393,85
+                    "Button",BS_AUTORADIOBUTTON | WS_TABSTOP,182,211,181,10
+    GROUPBOX        "Genlock",IDC_STATIC,0,229,393,85
     CONTROL         "Genlock connected [] Allow boot sequence to detect genlock.",IDC_GENLOCK,
-                    "Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,13,231,109,10
-    COMBOBOX        IDC_GENLOCKMODE,129,229,192,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX        IDC_GENLOCKMIX,330,229,54,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+                    "Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,13,245,109,10
+    COMBOBOX        IDC_GENLOCKMODE,129,243,192,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX        IDC_GENLOCKMIX,330,243,54,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     CONTROL         "Include alpha channel in screenshots and video captures.",IDC_GENLOCK_ALPHA,
-                    "Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,13,247,214,10
-    CONTROL         "Keep aspect ratio",IDC_GENLOCK_KEEP_ASPECT,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,13,262,214,10
-    COMBOBOX        IDC_GENLOCKFILE,12,278,356,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON      "...",IDC_GENLOCKFILESELECT,375,277,10,15
+                    "Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,13,261,214,10
+    CONTROL         "Keep aspect ratio",IDC_GENLOCK_KEEP_ASPECT,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,13,276,214,10
+    COMBOBOX        IDC_GENLOCKFILE,12,292,356,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
+    PUSHBUTTON      "...",IDC_GENLOCKFILESELECT,375,291,10,15
+    COMBOBOX        IDC_KEYBOARDMODE,12,142,191,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    CONTROL         "Keyboard N-key rollover [] Always emulate n-key rollover (no key ghosting or jamming when pressing multiple keys at the same time) even if selected emulated keyboard model does not support it.",IDC_KEYBOARDNKRO,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,162,150,10
+    GROUPBOX        "Keyboard",IDC_STATIC,0,125,215,53
+    RTEXT           "Optimizations:",IDC_STATIC,226,55,61,15,SS_CENTERIMAGE
+    COMBOBOX        IDC_DISPLAY_OPTIMIZATION,295,57,88,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 END
 
 IDD_CHIPSET2 DIALOGEX 0, 0, 396, 316
@@ -1256,8 +1262,6 @@ BEGIN
     RTEXT           "VRAM size: [] Graphics card memory. Required for RTG (Picasso96) emulation.",IDC_GFXCARDTEXT,2,98,76,10,SS_NOTIFY | SS_CENTERIMAGE
     CONTROL         "",IDC_P96MEM,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,88,94,103,20
     EDITTEXT        IDC_P96RAM,201,97,40,12,ES_CENTER | ES_READONLY
-    CONTROL         "Match host and RTG color depth if possible",IDC_RTG_MATCH_DEPTH,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,25,117,177,10
     CONTROL         "Scale if smaller than display size setting",IDC_RTG_SCALE,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,25,130,175,10
     CONTROL         "Always scale in windowed mode",IDC_RTG_SCALE_ALLOW,
@@ -1431,8 +1435,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 5,3,0,0
- PRODUCTVERSION 5,3,0,0
+ FILEVERSION 6,0,0,0
+ PRODUCTVERSION 6,0,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -1448,12 +1452,12 @@ BEGIN
         BLOCK "040904b0"
         BEGIN
             VALUE "FileDescription", "WinUAE"
-            VALUE "FileVersion", "5.3.0.0"
+            VALUE "FileVersion", "6.0.0.0"
             VALUE "InternalName", "WinUAE"
-            VALUE "LegalCopyright", "© 1996-2024 under the GNU Public License (GPL)"
+            VALUE "LegalCopyright", "© 1996-2025 under the GNU Public License (GPL)"
             VALUE "OriginalFilename", "WinUAE.exe"
             VALUE "ProductName", "WinUAE"
-            VALUE "ProductVersion", "5.3.0.0"
+            VALUE "ProductVersion", "6.0.0.0"
         END
     END
     BLOCK "VarFileInfo"
@@ -1843,7 +1847,7 @@ BEGIN
     IDS_SELECTFILESYSROOT   "Please select the root directory of the file system..."
     IDS_DEFAULTMIDIOUT      "Default MIDI-Out Device"
     IDS_CONTRIBUTORS1       "Bernd Schmidt - The Grand-Master\nSam Jordan - Custom-chip, floppy-DMA, etc.\nMathias Ortmann - Original WinUAE Main Guy, BSD Socket support\nBrian King - Picasso96 Support, Integrated GUI for WinUAE, previous WinUAE Main Guy\nToni Wilen - Core updates, WinUAE Main Guy\nGustavo Goedert/Peter Remmers/Michael Sontheimer/Tomi Hakala/Tim Gunn/Nemo Pohle - DOS Port Stuff\nSamuel Devulder/Olaf Barthel/Sam Jordan - Amiga Ports\nKrister Bergman - XFree86 and OS/2 Port\nA. Blanchard/Ernesto Corvi - MacOS Port\nChristian Bauer - BeOS Port\nIan Stephenson - NextStep Port\nPeter Teichmann - Acorn/RiscOS Port\nStefan Reinauer - ZorroII/III AutoConfig, Serial Support\nChristian Schmitt/Chris Hames - Serial Support\nHerman ten Brugge - 68020/68881 Emulation Code\nTauno Taipaleenmaki - Various UAE-Control/UAE-Library Support\nBrett Eden/Tim Gunn/Paolo Besser/Nemo Pohle - Various Docs and Web-Sites\nGeorg Veichtlbauer - Help File coordinator, German GUI\nFulvio Leonardi - Italian translator for WinUAE\n"
-    IDS_CONTRIBUTORS2       "Arnljot Arntsen, Bill Panagouleas, Cloanto, Zak Jennings - Hardware support\nSpecial thanks to Alexander Kneer and Tobias Abt (The Picasso96 Team)\nSteven Weiser  - Postscript printing emulation idea and testing.\nPéter Tóth /Balázs Rátkai/Iván Herczeg/András Arató - Hungarian translation.\nKarsten Bock, Gavin Fance, Dirk Trowe and Christian Schindler - Freezer cartridge hardware support.\nMikko Nieminen - Demo compatibility testing.\nArabuusimiehet - [This information is on a need-to-know basis]"
+    IDS_CONTRIBUTORS2       "Arnljot Arntsen, Bill Panagouleas, Cloanto, Zak Jennings - Hardware support\nSpecial thanks to Alexander Kneer and Tobias Abt (The Picasso96 Team)\nSteven Weiser  - Postscript printing emulation idea and testing.\nPéter Tóth /Balázs Rátkai/Iván Herczeg/András Arató - Hungarian translation.\nKarsten Bock, Gavin Fance, Dirk Trowe and Christian Schindler - Freezer cartridge hardware support.\nMikko Nieminen - Demo compatibility testing.\nArabuusimiehet - [This information is on a need-to-know basis].\nRoss - Chipset torture test programs.\n"
     IDS_INVALIDPRTPORT      "The printer you have in this configuration is not valid on this machine.\n"
     IDS_RESTOREUSS          "Restore a WinUAE snapshot file"
     IDS_USS                 "WinUAE snapshot files"
@@ -2209,7 +2213,6 @@ BEGIN
     IDS_BOARDID             "ID"
     IDS_ASSOCIATEEXTENSION  "Extension"
     IDS_GAMEPORTS_CUSTOM    "Custom"
-    IDS_FILTER_LABELS       "Null\nScale2X\nhq2x\nhq3x\nhq4x\nSuperEagle\nSuper2xSaI\n2xSaI\nPAL\n"
     IDS_CURRENT_HOST        "Current host configuration"
     IDS_NONE2               "<none>"
     IDS_SOUND_CLONED71      "Cloned stereo (7.1)"
@@ -2221,6 +2224,15 @@ BEGIN
     IDS_CHOOSE_VIDEO_CODEC  "Choose Video Codec"
 END
 
+STRINGTABLE
+BEGIN
+    IDS_DISPLAY_OPTIMIZATION_FULL "Full"
+    IDS_DISPLAY_OPTIMIZATION_PARTIAL "Partial"
+    IDS_DISPLAY_OPTIMIZATION_NONE "None"
+    IDS_KEYBOARD_DISCONNECTED "Keyboard disconnected"
+    IDS_KEYBOARD_HIGHLEVEL  "UAE High level emulation"
+END
+
 #endif    // English (United Kingdom) resources
 /////////////////////////////////////////////////////////////////////////////
 

diff --git a/od-win32/win32.h b/od-win32/win32.h
index 6db3bc443c158ca2ef43ea7ad99cec080f6e62f6..0f6017fba3c9a0539d91b94c328f7f572739eb11 100644 (file)
--- a/od-win32/win32.h
+++ b/od-win32/win32.h
@@ -15,23 +15,23 @@
 #define GETBDM(x) (((x) - ((x / 10000) * 10000)) / 100)
 #define GETBDD(x) ((x) % 100)
 
-#define WINUAEPUBLICBETA 1
+#define WINUAEPUBLICBETA 0
 #define LANG_DLL 1
 #define LANG_DLL_FULL_VERSION_MATCH 1
 
 #if WINUAEPUBLICBETA
-#define WINUAEBETA _T("32")
+#define WINUAEBETA _T("")
 #else
 #define WINUAEBETA _T("")
 #endif
 
-#define WINUAEDATE MAKEBD(2025, 6, 16)
+#define WINUAEDATE MAKEBD(2025, 7, 2)
 
 //#define WINUAEEXTRA _T("AmiKit Preview")
 //#define WINUAEEXTRA _T("Amiga Forever Edition")
 
 #ifndef WINUAEEXTRA
-#define WINUAEEXTRA _T("RC1")
+#define WINUAEEXTRA _T("")
 #endif
 #ifndef WINUAEREV
 #define WINUAEREV _T("")

diff --git a/od-win32/winuaechangelog.txt b/od-win32/winuaechangelog.txt
index fcdbf376047400ba867a5d6b7021b56db5bc4cc3..5875ce7cfe98e474bdb0d941c84c5bcb1b770193 100644 (file)
--- a/od-win32/winuaechangelog.txt
+++ b/od-win32/winuaechangelog.txt
@@ -1,4 +1,13 @@
 
+
+Beta 33 (Final):
+
+- UAE Boot ROM type state restore fixed (was some half-finished feature that was forgotten year or two ago).
+- Full-window + superhires + interlace aspect ratio was weird if aspect ratio correction was enabled.
+- Fast CPU could do Denise/Lisa register access before already queued RGA queue access was processed. (For example if Copper wrote to COLOR0, slightly later CPU write to COLOR0 can still happen before buffered Copper write was fully done).
+- "Invalid" screen modes that disable Agnus bitplane DMA (for example 8 plane hires but FMODE=0) didn't draw anything but of course current background color and sprites (if AGA bordersprites are active) should still be drawn normally.
+- Possible fix for IDE emulation read/write error during data transfer leaving DRQ active.
+
 Beta 32 (RC2):
 
 - Paula audio timing calcution used programmed vertical timing but hardwired PAL/NTSC horizontal timing when in RTG mode with inactive Amiga screen in doublescan mode. (b22)

diff --git a/od-win32/wix/Product.wxs b/od-win32/wix/Product.wxs
index aa5f8e82bc76917da7ec573bb602a2210533f3e3..578827364a43c1603ddc93a9313542f7899f8865 100644 (file)
--- a/od-win32/wix/Product.wxs
+++ b/od-win32/wix/Product.wxs
@@ -2,8 +2,8 @@
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
 
   <?define ProductName = "WinUAE" ?>
-  <?define ProductVersion = "5.3.1" ?>
-  <?define ProductFullVersion = "5.3.1.0" ?>
+  <?define ProductVersion = "6.0.0" ?>
+  <?define ProductFullVersion = "6.0.0.0" ?>
   <?define ProductAuthor = "Arabuusimiehet" ?>
 
   <?if $(var.Platform) = x64 ?>