3300b18

diff --git a/od-win32/picasso96_win.cpp b/od-win32/picasso96_win.cpp
index 05efb24831a3004433c0fce0b4a479e7d4eae76a..3b62aa6065769fd637c920f56db9ee54b3dd1d6d 100644 (file)
--- a/od-win32/picasso96_win.cpp
+++ b/od-win32/picasso96_win.cpp
@@ -3929,7 +3929,6 @@ static uae_u32 REGPARAM2 picasso_BlitPlanar2Direct (TrapContext *ctx)
        uae_u8 Mask = trap_get_dreg(ctx, 7);
        struct RenderInfo local_ri;
        struct BitMap local_bm;
-       struct ColorIndexMapping local_cim;
        uae_u32 result = 0;
 
        if (NOBLITTER)

diff --git a/od-win32/win32.h b/od-win32/win32.h
index 37e9c0aae185b4521018e663bd3b23f6b408370f..6f4e847d47f9616224001f28ecc10c78a22515b5 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("17")
+#define WINUAEBETA _T("18")
 #else
 #define WINUAEBETA _T("")
 #endif
 
-#define WINUAEDATE MAKEBD(2016, 5, 30)
+#define WINUAEDATE MAKEBD(2016, 6, 3)
 
 //#define WINUAEEXTRA _T("AmiKit Preview")
 //#define WINUAEEXTRA _T("Amiga Forever Edition")

diff --git a/od-win32/winuae_msvc14/winuae_msvc.vcxproj b/od-win32/winuae_msvc14/winuae_msvc.vcxproj
index 903054315849cc93781f7a4cf6f5c0871bac824e..24529e5ee673175dd1e728fc90fe44b47394937e 100644 (file)
--- a/od-win32/winuae_msvc14/winuae_msvc.vcxproj
+++ b/od-win32/winuae_msvc14/winuae_msvc.vcxproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="packages\VisualCppTools.14.0.24126-Pre\build\native\VisualCppTools.props" Condition="Exists('packages\VisualCppTools.14.0.24126-Pre\build\native\VisualCppTools.props')" />
+  <Import Project="packages\VisualCppTools.14.0.24202-Pre\build\native\VisualCppTools.props" Condition="Exists('packages\VisualCppTools.14.0.24202-Pre\build\native\VisualCppTools.props')" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -1124,6 +1124,6 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('packages\VisualCppTools.14.0.24126-Pre\build\native\VisualCppTools.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\VisualCppTools.14.0.24126-Pre\build\native\VisualCppTools.props'))" />
+    <Error Condition="!Exists('packages\VisualCppTools.14.0.24202-Pre\build\native\VisualCppTools.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\VisualCppTools.14.0.24202-Pre\build\native\VisualCppTools.props'))" />
   </Target>
 </Project>
\ No newline at end of file

diff --git a/od-win32/winuaechangelog.txt b/od-win32/winuaechangelog.txt
index 55213daab7ec9a6d8da6d3d21ba6d1f1bdc51c0f..298dd1bf10e0797b3dcaf7dcda25945cea00652c 100644 (file)
--- a/od-win32/winuaechangelog.txt
+++ b/od-win32/winuaechangelog.txt
@@ -1,4 +1,11 @@
 
+Beta 18:
+
+- "ROM needs 68020+" dialog repeated forever.
+- Fall back to old GDI screenshot method if GetRenderTarget() fails.
+- Logitech color LCDs work again, old API did the conversion automatically.
+- Fixed UAE boot ROM trap code corruption if "too many" UAE expansions were enabled. (b3)
+
 Beta 17:
 
 - Pre-KS1.3 boot hack code and data was overwritten by new resident structure update in b4.