diff --git a/src/main/resources/com/github/maven_nar/aol.properties b/src/main/resources/com/github/maven_nar/aol.properties
index 37bd4a1af..0ee5d30ba 100644
--- a/src/main/resources/com/github/maven_nar/aol.properties
+++ b/src/main/resources/com/github/maven_nar/aol.properties
@@ -87,13 +87,13 @@ x86.Windows.msvc.mc.excludes=
 amd64.Windows.linker=msvc
 
 amd64.Windows.msvc.cpp.compiler=msvc
-amd64.Windows.msvc.cpp.defines=WIN32
+amd64.Windows.msvc.cpp.defines=WIN32 WIN64
 amd64.Windows.msvc.cpp.options=
 amd64.Windows.msvc.cpp.includes=**/*.cc **/*.cpp **/*.cxx
 amd64.Windows.msvc.cpp.excludes=
 
 amd64.Windows.msvc.c.compiler=msvc
-amd64.Windows.msvc.c.defines=WIN32
+amd64.Windows.msvc.c.defines=WIN32 WIN64
 amd64.Windows.msvc.c.options=
 amd64.Windows.msvc.c.includes=**/*.c
 amd64.Windows.msvc.c.excludes=
@@ -324,13 +324,13 @@ i386.Linux.linker=g++
 
 i386.Linux.gpp.cpp.compiler=g++
 i386.Linux.gpp.cpp.defines=Linux GNU_GCC
-i386.Linux.gpp.cpp.options=-Wall -Wno-long-long -Wpointer-arith -Wconversion
+i386.Linux.gpp.cpp.options=-Wall -Wno-long-long -Wpointer-arith -Wconversion -m32
 i386.Linux.gpp.cpp.includes=**/*.cc **/*.cpp **/*.cxx
 i386.Linux.gpp.cpp.excludes=
 
 i386.Linux.gpp.c.compiler=gcc
 i386.Linux.gpp.c.defines=Linux GNU_GCC
-i386.Linux.gpp.c.options=-Wall -Wno-long-long -Wpointer-arith -Wconversion
+i386.Linux.gpp.c.options=-Wall -Wno-long-long -Wpointer-arith -Wconversion -m32
 i386.Linux.gpp.c.includes=**/*.c
 i386.Linux.gpp.c.excludes=
 
@@ -528,13 +528,13 @@ amd64.Linux.linker=g++
 
 amd64.Linux.gpp.cpp.compiler=g++
 amd64.Linux.gpp.cpp.defines=Linux GNU_GCC
-amd64.Linux.gpp.cpp.options=-Wall -Wno-long-long -Wpointer-arith -Wconversion -fPIC
+amd64.Linux.gpp.cpp.options=-Wall -Wno-long-long -Wpointer-arith -Wconversion -fPIC -m64
 amd64.Linux.gpp.cpp.includes=**/*.cc **/*.cpp **/*.cxx
 amd64.Linux.gpp.cpp.excludes=
 
 amd64.Linux.gpp.c.compiler=gcc
 amd64.Linux.gpp.c.defines=Linux GNU_GCC
-amd64.Linux.gpp.c.options=-Wall -Wno-long-long -Wpointer-arith -Wconversion -fPIC
+amd64.Linux.gpp.c.options=-Wall -Wno-long-long -Wpointer-arith -Wconversion -fPIC -m64
 amd64.Linux.gpp.c.includes=**/*.c
 amd64.Linux.gpp.c.excludes=