From 9a98b20d1b489e1f9d585f2befd98ab64516ba63 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Mon, 23 Aug 2004 14:25:31 +0000 Subject: [PATCH] gcc --- dlls/csstats2/csstats/Makefile.pl | 6 +++--- dlls/cstrike/Makefile.pl | 6 +++--- dlls/engine/Makefile.pl | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/csstats2/csstats/Makefile.pl b/dlls/csstats2/csstats/Makefile.pl index 4ff3c4b1..5c63b605 100755 --- a/dlls/csstats2/csstats/Makefile.pl +++ b/dlls/csstats2/csstats/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/cstrike/Makefile.pl b/dlls/cstrike/Makefile.pl index 8d68d749..fd752dff 100755 --- a/dlls/cstrike/Makefile.pl +++ b/dlls/cstrike/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,5 +172,5 @@ 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"; `$gcc`; diff --git a/dlls/engine/Makefile.pl b/dlls/engine/Makefile.pl index 9a549bc0..cb48c953 100755 --- a/dlls/engine/Makefile.pl +++ b/dlls/engine/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,5 +172,5 @@ 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"; `$gcc`;