4000b11

diff --git a/jit/codegen_x86.cpp b/jit/codegen_x86.cpp
index a2ea1960b3f57907a276eaa10aed19a51ef290ed..5dffefaf6a9d03d1bd889284641f79ae8d70416c 100644 (file)
--- a/jit/codegen_x86.cpp
+++ b/jit/codegen_x86.cpp
@@ -1309,7 +1309,7 @@ static inline void x86_fadd_m(MEMR s)
        ADDR32 FADDLm(s,X86_NOREG,X86_NOREG,1);
 }
 
-#else
+#else /* !USE_NEW_RTASM */
 
 const bool optimize_accum      = true;
 const bool optimize_imm8       = true;
@@ -3098,7 +3098,7 @@ static inline void x86_fadd_m(MEMR s)
        emit_long(s);
 }
 
-#endif
+#endif /* USE_NEW_RTASM */
 
 /*************************************************************************
  * Unoptimizable stuff --- jump                                          *

diff --git a/od-win32/win32.h b/od-win32/win32.h
index 7826d47b709782c4d2af6feb0ff03ffda7bfb76d..ff488a8c516f3e3bc5ffc7e90c874d90befa0674 100644 (file)
--- a/od-win32/win32.h
+++ b/od-win32/win32.h
@@ -20,12 +20,12 @@
 #define LANG_DLL_FULL_VERSION_MATCH 1
 
 #if WINUAEPUBLICBETA
-#define WINUAEBETA _T("10")
+#define WINUAEBETA _T("11")
 #else
 #define WINUAEBETA _T("")
 #endif
 
-#define WINUAEDATE MAKEBD(2018, 5, 15)
+#define WINUAEDATE MAKEBD(2018, 5, 21)
 
 //#define WINUAEEXTRA _T("AmiKit Preview")
 //#define WINUAEEXTRA _T("Amiga Forever Edition")

diff --git a/od-win32/winuae_msvc15/winuae_msvc.vcxproj b/od-win32/winuae_msvc15/winuae_msvc.vcxproj
index 8dd17f68e9b8b660ca3fbfd1c585dcf19c15b3ae..32e08070a98480c5b3a4b6e531b3ed564af45d00 100644 (file)
--- a/od-win32/winuae_msvc15/winuae_msvc.vcxproj
+++ b/od-win32/winuae_msvc15/winuae_msvc.vcxproj
@@ -980,6 +980,7 @@
     <ClCompile Include="..\ioport.cpp" />
     <ClCompile Include="..\keyboard_win32.cpp" />
     <ClCompile Include="..\lcd.cpp" />
+    <ClCompile Include="..\machdep\m68k.cpp" />
     <ClCompile Include="..\midi.cpp" />
     <ClCompile Include="..\mman.cpp" />
     <ClCompile Include="..\mp3decoder.cpp" />

diff --git a/od-win32/winuae_msvc15/winuae_msvc.vcxproj.filters b/od-win32/winuae_msvc15/winuae_msvc.vcxproj.filters
index a0b1beb04d26abc2a963592c35b56f7f496bccf5..64828597019e8accd1de4cdbcd23f403ccf7ab79 100644 (file)
--- a/od-win32/winuae_msvc15/winuae_msvc.vcxproj.filters
+++ b/od-win32/winuae_msvc15/winuae_msvc.vcxproj.filters
@@ -892,6 +892,9 @@
     <ClCompile Include="..\fpp_native_msvc_80bit.cpp">
       <Filter>win32</Filter>
     </ClCompile>
+    <ClCompile Include="..\machdep\m68k.cpp">
+      <Filter>common</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\resources\35floppy.ico">

diff --git a/od-win32/winuaechangelog.txt b/od-win32/winuaechangelog.txt
index 0b83f0a0b5a159a099507df1b112bb4564f96c45..ac15c078a2a562ab20a3c741397e09d4d83f18d5 100644 (file)
--- a/od-win32/winuaechangelog.txt
+++ b/od-win32/winuaechangelog.txt
@@ -1,5 +1,16 @@
 \r
 \r
+Beta 11:\r
+\r
+- D3D11 fullscreen mode after alt-tab/gui was not restored properly if emulation was in paused state.\r
+- D3D9 lagless vsync partial updates (introduced in b5) used incorrect (full, D3DLOCK_DISCARD) texture update mode.\r
+- Decrease/increase emulation speed input events didn't do anything.\r
+- Power led dim config option is now integer (0 = fully off, 1 to 100 = brightness level)\r
+- Hardware emulated graphics boards didn't update properly without enabled OSD led (uaegfx was already fixed in b9)\r
+- A2410 didn't support multiple monitor mode.\r
+- Merged Aranym JIT updates.\r
+- Fixed old (since the beginning?) JIT bug: many instructions always cleared V-flag (ADDX, SUBX, NEGX, BTST/BCHG/BCLR/BSET, possibly others). Fix by Thorsten Otto.\r
+\r
 Beta 10:\r
 \r
 - Full-window mode captured mouse (and moved it to center of screen) even when window didn't have focus.\r
@@ -10,6 +21,7 @@ Beta 10:
 - Action Replay II/III statefile support improved. (For example AR state was invalid when loading AR statefile when AR was already active)\r
 - On the fly switching between fastest possible <> non-fastest possible CPU modes in lagless vsync caused hang in certain situations.\r
 - Debugger: show number of cycles used when tracing (t, z, breakpoints). Only shown if max 2 frames since last debugger activation. (TODO: should also count number of memory accesses and no-wait state minimum cycle count)\r
+- Freezer cartridge automatic RTG switch on/off wasn't reliable.\r
 - Removed forgotten, useless and obsolete "The selected screen mode can't be displayed in a window, because.." check.\r
 - 68030 MMU PLOAD R variant (R/W bit=1) caused f-line exception.\r
 - Clear both ping-pong buffers when pausing/unpausing WASAPI exclusive sound mode.\r