Removed -DSTANDALONE option