--Cleaned up setting of preprocessor flags