Change crlf() to use \n if $^O is MSWin32

3 files changed, 23 insertions, 8 deletions

diff --git a/bin/MakeProjectCreator/modules/NMakeProjectCreator.pm b/bin/MakeProjectCreator/modules/NMakeProjectCreator.pm
index f784182571a..f1eaa4935bd 100644
--- a/bin/MakeProjectCreator/modules/NMakeProjectCreator.pm
+++ b/bin/MakeProjectCreator/modules/NMakeProjectCreator.pm
@@ -48,14 +48,19 @@ sub sort_files {
 sub file_sorter {
   my($self)  = shift;
   my($left)  = shift;
-  my($right) = shift;   
+  my($right) = shift;
   return lc($left) cmp lc($right);
 }
 
 
 sub crlf {
   my($self) = shift;
-  return "\r\n";
+  if ($^O eq 'MSWin32') {
+    return "\n";
+  }
+  else {
+    return "\r\n";
+  }
 }
 
 
diff --git a/bin/MakeProjectCreator/modules/VC6ProjectCreator.pm b/bin/MakeProjectCreator/modules/VC6ProjectCreator.pm
index 5debe0c6b3c..069f0eb9d1c 100644
--- a/bin/MakeProjectCreator/modules/VC6ProjectCreator.pm
+++ b/bin/MakeProjectCreator/modules/VC6ProjectCreator.pm
@@ -102,14 +102,19 @@ sub sort_files {
 sub file_sorter {
   my($self)  = shift;
   my($left)  = shift;
-  my($right) = shift;   
+  my($right) = shift;
   return lc($left) cmp lc($right);
 }
 
 
 sub crlf {
   my($self) = shift;
-  return "\r\n";
+  if ($^O eq 'MSWin32') {
+    return "\n";
+  }
+  else {
+    return "\r\n";
+  }
 }
 
 
@@ -126,7 +131,7 @@ sub fill_value {
 }
 
 
-sub separate_static_project {   
+sub separate_static_project {
   my($self) = shift;
   return 1;
 }
@@ -156,8 +161,8 @@ sub override_valid_component_extensions {
 
   return $array;
 }
- 
- 
+
+
 sub override_exclude_component_extensions {
   my($self)  = shift;
   my($comp)  = shift;
diff --git a/bin/MakeProjectCreator/modules/VC7ProjectCreator.pm b/bin/MakeProjectCreator/modules/VC7ProjectCreator.pm
index c18ba892951..16240bfb340 100644
--- a/bin/MakeProjectCreator/modules/VC7ProjectCreator.pm
+++ b/bin/MakeProjectCreator/modules/VC7ProjectCreator.pm
@@ -67,7 +67,12 @@ sub file_sorter {
 
 sub crlf {
   my($self) = shift;
-  return "\r\n";
+  if ($^O eq 'MSWin32') {
+    return "\n";
+  }
+  else {
+    return "\r\n";
+  }
 }