diff --git a/CHANGELOG.md b/CHANGELOG.md index 631ce3077d..ac1a595c7d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -3.2.1 (TBD) +3.2.1 (2018-09-27) ------------------ ### Bug fixes diff --git a/RealmAssemblyInfo.cs b/RealmAssemblyInfo.cs index 823c275485..6f3d93814c 100644 --- a/RealmAssemblyInfo.cs +++ b/RealmAssemblyInfo.cs @@ -23,8 +23,8 @@ [assembly: AssemblyCompany("Realm Inc.")] [assembly: AssemblyProduct("Realm C#")] -[assembly: AssemblyVersion("3.2.0.0")] -[assembly: AssemblyFileVersion("3.2.0.0")] +[assembly: AssemblyVersion("3.2.1.0")] +[assembly: AssemblyFileVersion("3.2.1.0")] #if DEBUG [assembly: AssemblyConfiguration("Debug")] diff --git a/wrappers/CMakeLists.txt b/wrappers/CMakeLists.txt index db99d70cc1..68963edc40 100644 --- a/wrappers/CMakeLists.txt +++ b/wrappers/CMakeLists.txt @@ -11,7 +11,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux") endif() if(NOT REALM_PLATFORM) - set(REALM_PLATFORM DotNet) + set(REALM_PLATFORM DotNet) endif() include(CompilerFlags) @@ -184,6 +184,10 @@ if(APPLE) set(CMAKE_OSX_DEPLOYMENT_TARGET 10.10) elseif(CMAKE_SYSTEM_NAME MATCHES "^Windows") add_definitions(-DWIN32_LEAN_AND_MEAN) + add_definitions( + /D_DISABLE_EXTENDED_ALIGNED_STORAGE # https://developercommunity.visualstudio.com/comments/279328/view.html + ) + if(WINDOWS_STORE) set(CMAKE_SHARED_LINKER_FLAGS_DEBUG "/nodefaultlib:vccorlibd /nodefaultlib:msvcrtd vccorlibd.lib msvcrtd.lib") set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "/nodefaultlib:vccorlib /nodefaultlib:msvcrt vccorlib.lib msvcrt.lib")