Fixed linux cmake
We need a dummy test.cpp file on linux
Added source files to c make lists
More compile flags
fixed conflict
Merge remote-tracking branch 'upstream/master'
Simple grid
Merge branch 'master' of https://github.com/emiax/pink-fluid