Put back fix for cuda on windows, Remove #defines to simplify build
Link proble, add cuda/cudart libs manually