Get the Mingw32 makefiles right.

2 files changed, 155 insertions, 79 deletions

diff --git a/util/pl/Mingw32.pl b/util/pl/Mingw32.pl
index 7993fe67f4..f99b015aba 100644
--- a/util/pl/Mingw32.pl
+++ b/util/pl/Mingw32.pl
@@ -1,79 +1,81 @@
-#!/usr/local/bin/perl

-#

-# unix.pl - the standard unix makefile stuff.

-#

-

-# Need the Cygwin32 file utilities

-$o='/';

-$cp='cp';

-$rm='rm';

-

-# gcc wouldn't accept backslashes in paths

-#$o='\\';

-#$cp='copy';

-#$rm='del';

-

-# C compiler stuff

-

-$cc='gcc';

-if ($debug)

-	{ $cflags="-g2 -ggdb"; }

-else

-	{ $cflags="-O3 -fomit-frame-pointer"; }

-$dcflags='n' # Make can't handle -DCFLAGS definition

-

-$obj='.o';

-$ofile='-o ';

-

-# EXE linking stuff

-$link='${CC}';

-$lflags='${CFLAGS}';

-$efile='-o ';

-$exep='';

-$ex_libs="-lwsock32 -lgdi32";

-

-# static library stuff

-$mklib='ar r';

-$mlflags='';

-$ranlib='ranlib';

-$plib='lib';

-$libp=".a";

-$shlibp=".a";

-$lfile='';

-

-$asm='as';

-$afile='-o ';

-$bn_asm_obj="";

-$bn_asm_src="";

-$des_enc_obj="";

-$des_enc_src="";

-$bf_enc_obj="";

-$bf_enc_src="";

-

-sub do_lib_rule

-	{

-	local($obj,$target,$name,$shlib)=@_;

-	local($ret,$_,$Name);

-

-	$target =~ s/\//$o/g if $o ne '/';

-	$target="$target";

-	($Name=$name) =~ tr/a-z/A-Z/;

-

-	$ret.="$target: \$(${Name}OBJ)\n";

-	$ret.="\t\$(RM) $target\n";

-	$ret.="\t\$(MKLIB) $target \$(${Name}OBJ)\n";

-	$ret.="\t\$(RANLIB) $target\n\n";

-	}

-

-sub do_link_rule

-	{

-	local($target,$files,$dep_libs,$libs)=@_;

-	local($ret,$_);

-	

-	$file =~ s/\//$o/g if $o ne '/';

-	$n=&bname($target);

-	$ret.="$target: $files $dep_libs\n";

-	$ret.="\t\$(LINK) ${efile}$target \$(LFLAGS) $files $libs\n\n";

-	return($ret);

-	}

-1;

+#!/usr/local/bin/perl
+#
+# unix.pl - the standard unix makefile stuff.
+#
+
+# Need the Cygwin32 file utilities
+$o='/';
+$cp='cp';
+$rm='rm';
+$mkdir='gmkdir';
+
+# gcc wouldn't accept backslashes in paths
+#$o='\\';
+#$cp='copy';
+#$rm='del';
+
+# C compiler stuff
+
+$cc='gcc';
+if ($debug)
+	{ $cflags="-g2 -ggdb"; }
+else
+	{ $cflags="-O3 -fomit-frame-pointer"; }
+$dcflags='n'; # Make can't handle -DCFLAGS definition
+
+$obj='.o';
+$ofile='-o ';
+
+# EXE linking stuff
+$link='${CC}';
+$lflags='${CFLAGS}';
+$efile='-o ';
+$exep='';
+$ex_libs="-lwsock32 -lgdi32";
+
+# static library stuff
+$mklib='ar r';
+$mlflags='';
+$ranlib='ranlib';
+$plib='lib';
+$libp=".a";
+$shlibp=".a";
+$lfile='';
+
+$asm='as';
+$afile='-o ';
+$bn_asm_obj="";
+$bn_asm_src="";
+$des_enc_obj="";
+$des_enc_src="";
+$bf_enc_obj="";
+$bf_enc_src="";
+
+sub do_lib_rule
+	{
+	local($obj,$target,$name,$shlib)=@_;
+	local($ret,$_,$Name);
+
+	$target =~ s/\//$o/g if $o ne '/';
+	$target="$target";
+	($Name=$name) =~ tr/a-z/A-Z/;
+
+	$ret.="$target: \$(${Name}OBJ)\n";
+	$ret.="\t\$(RM) $target\n";
+	$ret.="\t\$(MKLIB) $target \$(${Name}OBJ)\n";
+	$ret.="\t\$(RANLIB) $target\n\n";
+	}
+
+sub do_link_rule
+	{
+	local($target,$files,$dep_libs,$libs)=@_;
+	local($ret,$_);
+	
+	$file =~ s/\//$o/g if $o ne '/';
+	$n=&bname($target);
+	$ret.="$target: $files $dep_libs\n";
+	$ret.="\t\$(LINK) ${efile}$target \$(LFLAGS) $files $libs\n\n";
+	return($ret);
+	}
+1;
+
diff --git a/util/pl/Mingw32f.pl b/util/pl/Mingw32f.pl
new file mode 100644
index 0000000000..d523d70153
--- /dev/null
+++ b/util/pl/Mingw32f.pl
@@ -0,0 +1,74 @@
+#!/usr/local/bin/perl
+#
+# unix.pl - the standard unix makefile stuff.
+#
+
+$o='\\';
+$cp='copy';
+$rm='del';
+
+# C compiler stuff
+
+$cc='gcc';
+if ($debug)
+	{ $cflags="-g2 -ggdb"; }
+else
+	{ $cflags="-O3 -fomit-frame-pointer"; }
+$dcflags='n'; # Make can't handle -DCFLAGS definition
+
+$obj='.o';
+$ofile='-o ';
+
+# EXE linking stuff
+$link='${CC}';
+$lflags='${CFLAGS}';
+$efile='-o ';
+$exep='';
+$ex_libs="-lwsock32 -lgdi32";
+
+# static library stuff
+$mklib='ar r';
+$mlflags='';
+$ranlib='ranlib';
+$plib='lib';
+$libp=".a";
+$shlibp=".a";
+$lfile='';
+
+$asm='as';
+$afile='-o ';
+$bn_asm_obj="";
+$bn_asm_src="";
+$des_enc_obj="";
+$des_enc_src="";
+$bf_enc_obj="";
+$bf_enc_src="";
+
+sub do_lib_rule
+	{
+	local($obj,$target,$name,$shlib)=@_;
+	local($ret,$_,$Name);
+
+	$target =~ s/\//$o/g if $o ne '/';
+	$target="$target";
+	($Name=$name) =~ tr/a-z/A-Z/;
+
+	$ret.="$target: \$(${Name}OBJ)\n";
+	$ret.="\t\$(RM) $target\n";
+	$ret.="\t\$(MKLIB) $target \$(${Name}OBJ)\n";
+	$ret.="\t\$(RANLIB) $target\n\n";
+	}
+
+sub do_link_rule
+	{
+	local($target,$files,$dep_libs,$libs)=@_;
+	local($ret,$_);
+	
+	$file =~ s/\//$o/g if $o ne '/';
+	$n=&bname($target);
+	$ret.="$target: $files $dep_libs\n";
+	$ret.="\t\$(LINK) ${efile}$target \$(LFLAGS) $files $libs\n\n";
+	return($ret);
+	}
+1;
+