Fix Windows and static-only makefiles