diff --git a/AMBuildScript b/AMBuildScript
index f70ea54..258b52a 100644
--- a/AMBuildScript
+++ b/AMBuildScript
@@ -232,11 +232,12 @@ class BuildInfo:
             '-fvisibility=hidden',
         ]
         cxx.cxxflags += [
-            '-std=c++14',
+            '-std=c++17',
             '-fno-exceptions',
             '-fno-threadsafe-statics',
             '-Wno-non-virtual-dtor',
             '-Wno-overloaded-virtual',
+            '-Wno-register',
             '-fvisibility-inlines-hidden',
         ]
         cxx.linkflags += ['-m32']
@@ -299,6 +300,7 @@ class BuildInfo:
             '/EHsc',
             '/GR-',
             '/TP',
+            '/std:c++17',
         ]
         cxx.linkflags += [
             '/MACHINE:X86',