From 5464977fb7826022d3a5c260b477bdf3b87c6876 Mon Sep 17 00:00:00 2001
From: David Anderson <dvander@alliedmods.net>
Date: Tue, 24 Aug 2004 05:50:59 +0000
Subject: [PATCH] New makefiles

---
 dlls/dod2/dodfun/Makefile.pl | 6 +++---
 dlls/dod2/dodx/Makefile.pl   | 6 +++---
 dlls/fakemeta/Makefile.pl    | 6 +++---
 dlls/geoip/Makefile.pl       | 6 +++---
 dlls/ns/ns/Makefile.pl       | 6 +++---
 dlls/pgsql/Makefile.pl       | 6 +++---
 dlls/sockets/Makefile.pl     | 6 +++---
 dlls/tfc/tfcx/Makefile.pl    | 6 +++---
 dlls/ts/tsx/Makefile.pl      | 6 +++---
 9 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/dlls/dod2/dodfun/Makefile.pl b/dlls/dod2/dodfun/Makefile.pl
index bd8338bb..46ead84f 100755
--- a/dlls/dod2/dodfun/Makefile.pl
+++ b/dlls/dod2/dodfun/Makefile.pl
@@ -45,7 +45,7 @@ while ($cmd = shift)
 	}
 }
 
-$gcc = `g++ --version`;
+$gcc = `gcc --version`;
 if ($gcc =~ /2\.9/)
 {
 	$OPT{"opt"} .= " -malign-loops=2 -malign-jumps=2 -malign-functions=2";
@@ -134,7 +134,7 @@ for ($i=0; $i<=$#CPP_SOURCE_FILES; $i++)
 	$ofile = $file;
 	$ofile =~ s/\.cpp/\.o/;
 	$ofile = "$outdir/$ofile";
-	$gcc = "g++ $cflags -Dstrcmpi=strcasecmp -fPIC $inc -c $file -o $ofile";
+	$gcc = "gcc $cflags -Dstrcmpi=strcasecmp -fPIC $inc -c $file -o $ofile";
 	if (-e $ofile)
 	{
 		$file_time = (stat($file))[9];
@@ -172,6 +172,6 @@ for ($i=0; $i<=$#CPP_SOURCE_FILES; $i++)
 	}
 }
 
-$gcc = "g++ $cflags -shared -ldl -lm @LINK -o $outdir/$bin";
+$gcc = "gcc $cflags -shared -ldl -lm @LINK -o $outdir/$bin";
 print "$gcc\n";
 `$gcc`;
diff --git a/dlls/dod2/dodx/Makefile.pl b/dlls/dod2/dodx/Makefile.pl
index 4cbcd40d..fa32c118 100755
--- a/dlls/dod2/dodx/Makefile.pl
+++ b/dlls/dod2/dodx/Makefile.pl
@@ -45,7 +45,7 @@ while ($cmd = shift)
 	}
 }
 
-$gcc = `g++ --version`;
+$gcc = `gcc --version`;
 if ($gcc =~ /2\.9/)
 {
 	$OPT{"opt"} .= " -malign-loops=2 -malign-jumps=2 -malign-functions=2";
@@ -134,7 +134,7 @@ for ($i=0; $i<=$#CPP_SOURCE_FILES; $i++)
 	$ofile = $file;
 	$ofile =~ s/\.cpp/\.o/;
 	$ofile = "$outdir/$ofile";
-	$gcc = "g++ $cflags -Dstrcmpi=strcasecmp -fPIC $inc -c $file -o $ofile";
+	$gcc = "gcc $cflags -Dstrcmpi=strcasecmp -fPIC $inc -c $file -o $ofile";
 	if (-e $ofile)
 	{
 		$file_time = (stat($file))[9];
@@ -172,6 +172,6 @@ for ($i=0; $i<=$#CPP_SOURCE_FILES; $i++)
 	}
 }
 
-$gcc = "g++ $cflags -shared -ldl -lm @LINK -o $outdir/$bin";
+$gcc = "gcc $cflags -shared -ldl -lm @LINK -o $outdir/$bin";
 print "$gcc\n";
 `$gcc`;
diff --git a/dlls/fakemeta/Makefile.pl b/dlls/fakemeta/Makefile.pl
index e9c13956..e67a6f43 100755
--- a/dlls/fakemeta/Makefile.pl
+++ b/dlls/fakemeta/Makefile.pl
@@ -45,7 +45,7 @@ while ($cmd = shift)
 	}
 }
 
-$gcc = `g++ --version`;
+$gcc = `gcc --version`;
 if ($gcc =~ /2\.9/)
 {
 	$OPT{"opt"} .= " -malign-loops=2 -malign-jumps=2 -malign-functions=2";
@@ -139,7 +139,7 @@ for ($i=0; $i<=$#CPP_SOURCE_FILES; $i++)
 	$ofile = $file;
 	$ofile =~ s/\.cpp/\.o/;
 	$ofile = "$outdir/$ofile";
-	$gcc = "g++ $cflags -Dstrcmpi=strcasecmp -fPIC $inc -c $file -o $ofile";
+	$gcc = "gcc $cflags -Dstrcmpi=strcasecmp -fPIC $inc -c $file -o $ofile";
 	if (-e $ofile)
 	{
 		$file_time = (stat($file))[9];
@@ -177,6 +177,6 @@ for ($i=0; $i<=$#CPP_SOURCE_FILES; $i++)
 	}
 }
 
-$gcc = "g++ $cflags -shared -ldl -lm @LINK -o $outdir/$bin";
+$gcc = "gcc $cflags -shared -ldl -lm @LINK -o $outdir/$bin";
 print "$gcc\n";
 `$gcc`;
diff --git a/dlls/geoip/Makefile.pl b/dlls/geoip/Makefile.pl
index 9c67fbb1..0789ab93 100755
--- a/dlls/geoip/Makefile.pl
+++ b/dlls/geoip/Makefile.pl
@@ -46,7 +46,7 @@ while ($cmd = shift)
 	}
 }
 
-$gcc = `g++ --version`;
+$gcc = `gcc --version`;
 if ($gcc =~ /2\.9/)
 {
 	$OPT{"opt"} .= " -malign-loops=2 -malign-jumps=2 -malign-functions=2";
@@ -135,7 +135,7 @@ for ($i=0; $i<=$#CPP_SOURCE_FILES; $i++)
 	$ofile = $file;
 	$ofile =~ s/\.cpp/\.o/;
 	$ofile = "$outdir/$ofile";
-	$gcc = "g++ $cflags -Dstrcmpi=strcasecmp -fPIC $inc -c $file -o $ofile";
+	$gcc = "gcc $cflags -Dstrcmpi=strcasecmp -fPIC $inc -c $file -o $ofile";
 	if (-e $ofile)
 	{
 		$file_time = (stat($file))[9];
@@ -173,6 +173,6 @@ for ($i=0; $i<=$#CPP_SOURCE_FILES; $i++)
 	}
 }
 
-$gcc = "g++ $cflags -shared -ldl -lm @LINK -o $outdir/$bin";
+$gcc = "gcc $cflags -shared -ldl -lm @LINK -o $outdir/$bin";
 print "$gcc\n";
 `$gcc`;
diff --git a/dlls/ns/ns/Makefile.pl b/dlls/ns/ns/Makefile.pl
index 046023dc..7a17af23 100755
--- a/dlls/ns/ns/Makefile.pl
+++ b/dlls/ns/ns/Makefile.pl
@@ -45,7 +45,7 @@ while ($cmd = shift)
 	}
 }
 
-$gcc = `g++ --version`;
+$gcc = `gcc --version`;
 if ($gcc =~ /2\.9/)
 {
 	$OPT{"opt"} .= " -malign-loops=2 -malign-jumps=2 -malign-functions=2";
@@ -134,7 +134,7 @@ for ($i=0; $i<=$#CPP_SOURCE_FILES; $i++)
 	$ofile = $file;
 	$ofile =~ s/\.cpp/\.o/;
 	$ofile = "$outdir/$ofile";
-	$gcc = "g++ $cflags -Dstrcmpi=strcasecmp -fPIC $inc -c $file -o $ofile";
+	$gcc = "gcc $cflags -Dstrcmpi=strcasecmp -fPIC $inc -c $file -o $ofile";
 	if (-e $ofile)
 	{
 		$file_time = (stat($file))[9];
@@ -172,6 +172,6 @@ for ($i=0; $i<=$#CPP_SOURCE_FILES; $i++)
 	}
 }
 
-$gcc = "g++ $cflags -shared -ldl -lm @LINK -o $outdir/$bin";
+$gcc = "gcc $cflags -shared -ldl -lm @LINK -o $outdir/$bin";
 print "$gcc\n";
 `$gcc`;
diff --git a/dlls/pgsql/Makefile.pl b/dlls/pgsql/Makefile.pl
index 984b2585..6c796902 100755
--- a/dlls/pgsql/Makefile.pl
+++ b/dlls/pgsql/Makefile.pl
@@ -46,7 +46,7 @@ while ($cmd = shift)
 	}
 }
 
-$gcc = `g++ --version`;
+$gcc = `gcc --version`;
 if ($gcc =~ /2\.9/)
 {
 	$OPT{"opt"} .= " -malign-loops=2 -malign-jumps=2 -malign-functions=2";
@@ -135,7 +135,7 @@ for ($i=0; $i<=$#CPP_SOURCE_FILES; $i++)
 	$ofile = $file;
 	$ofile =~ s/\.cpp/\.o/;
 	$ofile = "$outdir/$ofile";
-	$gcc = "g++ $cflags -Dstrcmpi=strcasecmp -fPIC $inc -c $file -o $ofile";
+	$gcc = "gcc $cflags -Dstrcmpi=strcasecmp -fPIC $inc -c $file -o $ofile";
 	if (-e $ofile)
 	{
 		$file_time = (stat($file))[9];
@@ -173,6 +173,6 @@ for ($i=0; $i<=$#CPP_SOURCE_FILES; $i++)
 	}
 }
 
-$gcc = "g++ $cflags $inc -shared -ldl -lm @LINK -lpq -lz -lcrypt -o $outdir/$bin";
+$gcc = "gcc $cflags $inc -shared -ldl -lm @LINK -lpq -lz -lcrypt -o $outdir/$bin";
 print "$gcc\n";
 `$gcc`;
diff --git a/dlls/sockets/Makefile.pl b/dlls/sockets/Makefile.pl
index 60e8650e..0e1512e2 100755
--- a/dlls/sockets/Makefile.pl
+++ b/dlls/sockets/Makefile.pl
@@ -45,7 +45,7 @@ while ($cmd = shift)
 	}
 }
 
-$gcc = `g++ --version`;
+$gcc = `gcc --version`;
 if ($gcc =~ /2\.9/)
 {
 	$OPT{"opt"} .= " -malign-loops=2 -malign-jumps=2 -malign-functions=2";
@@ -134,7 +134,7 @@ for ($i=0; $i<=$#CPP_SOURCE_FILES; $i++)
 	$ofile = $file;
 	$ofile =~ s/\.cpp/\.o/;
 	$ofile = "$outdir/$ofile";
-	$gcc = "g++ $cflags -Dstrcmpi=strcasecmp -fPIC $inc -c $file -o $ofile";
+	$gcc = "gcc $cflags -Dstrcmpi=strcasecmp -fPIC $inc -c $file -o $ofile";
 	if (-e $ofile)
 	{
 		$file_time = (stat($file))[9];
@@ -172,6 +172,6 @@ for ($i=0; $i<=$#CPP_SOURCE_FILES; $i++)
 	}
 }
 
-$gcc = "g++ $cflags -shared -ldl -lm @LINK -o $outdir/$bin";
+$gcc = "gcc $cflags -shared -ldl -lm @LINK -o $outdir/$bin";
 print "$gcc\n";
 `$gcc`;
diff --git a/dlls/tfc/tfcx/Makefile.pl b/dlls/tfc/tfcx/Makefile.pl
index 5e23476c..5205eb20 100755
--- a/dlls/tfc/tfcx/Makefile.pl
+++ b/dlls/tfc/tfcx/Makefile.pl
@@ -45,7 +45,7 @@ while ($cmd = shift)
 	}
 }
 
-$gcc = `g++ --version`;
+$gcc = `gcc --version`;
 if ($gcc =~ /2\.9/)
 {
 	$OPT{"opt"} .= " -malign-loops=2 -malign-jumps=2 -malign-functions=2";
@@ -134,7 +134,7 @@ for ($i=0; $i<=$#CPP_SOURCE_FILES; $i++)
 	$ofile = $file;
 	$ofile =~ s/\.cpp/\.o/;
 	$ofile = "$outdir/$ofile";
-	$gcc = "g++ $cflags -Dstrcmpi=strcasecmp -fPIC $inc -c $file -o $ofile";
+	$gcc = "gcc $cflags -Dstrcmpi=strcasecmp -fPIC $inc -c $file -o $ofile";
 	if (-e $ofile)
 	{
 		$file_time = (stat($file))[9];
@@ -172,6 +172,6 @@ for ($i=0; $i<=$#CPP_SOURCE_FILES; $i++)
 	}
 }
 
-$gcc = "g++ $cflags -shared -ldl -lm @LINK -o $outdir/$bin";
+$gcc = "gcc $cflags -shared -ldl -lm @LINK -o $outdir/$bin";
 print "$gcc\n";
 `$gcc`;
diff --git a/dlls/ts/tsx/Makefile.pl b/dlls/ts/tsx/Makefile.pl
index da52dbe1..35da8272 100755
--- a/dlls/ts/tsx/Makefile.pl
+++ b/dlls/ts/tsx/Makefile.pl
@@ -45,7 +45,7 @@ while ($cmd = shift)
 	}
 }
 
-$gcc = `g++ --version`;
+$gcc = `gcc --version`;
 if ($gcc =~ /2\.9/)
 {
 	$OPT{"opt"} .= " -malign-loops=2 -malign-jumps=2 -malign-functions=2";
@@ -134,7 +134,7 @@ for ($i=0; $i<=$#CPP_SOURCE_FILES; $i++)
 	$ofile = $file;
 	$ofile =~ s/\.cpp/\.o/;
 	$ofile = "$outdir/$ofile";
-	$gcc = "g++ $cflags -Dstrcmpi=strcasecmp -fPIC $inc -c $file -o $ofile";
+	$gcc = "gcc $cflags -Dstrcmpi=strcasecmp -fPIC $inc -c $file -o $ofile";
 	if (-e $ofile)
 	{
 		$file_time = (stat($file))[9];
@@ -172,6 +172,6 @@ for ($i=0; $i<=$#CPP_SOURCE_FILES; $i++)
 	}
 }
 
-$gcc = "g++ $cflags -shared -ldl -lm @LINK -o $outdir/$bin";
+$gcc = "gcc $cflags -shared -ldl -lm @LINK -o $outdir/$bin";
 print "$gcc\n";
 `$gcc`;