WIP: generalize Makefile to allow compilation on windows
Compare changes
Conflict: This file was modified in both the source and target branches.
Ask someone with write access to resolve it.
+ 8
− 6
@@ -2,15 +2,17 @@