Merge: Fix dosbox build on all targets