some defines, makefile and other misc changes for anticheat builds
fix merge conflict