Revert "Patch for re done 2D GPU OC (shaky156)"

This reverts commit 4fc678c069a29570be7f8bc0cfe980f1634e4c2b.
Makefile: Re add flags. Hopefully this thing will build