Simplify the defintiion of optimization flags in Windows makefiles

The setting of -O1 for release mode builds can be factored out of the
x86 and x64 cases following commit 688ea162f4.