From af6349454de70d688a4e48256431efec6d3669ed Mon Sep 17 00:00:00 2001 From: David Anderson Date: Thu, 2 Sep 2004 08:35:58 +0000 Subject: [PATCH] Updated for 0.20, fixed makefiles --- dlls/csstats2/csstats/Makefile.pl | 11 ++++++----- dlls/csstats2/csstats/meta_api.cpp | 4 ++-- dlls/dod2/dodfun/Makefile.pl | 11 ++++++----- dlls/dod2/dodx/Makefile.pl | 11 ++++++----- dlls/dod2/dodx/moduleconfig.cpp | 4 ++-- dlls/fakemeta/Makefile.pl | 11 ++++++----- dlls/geoip/Makefile.pl | 14 ++++++++------ dlls/ns/ns/Makefile.pl | 11 ++++++----- dlls/sockets/Makefile.pl | 11 ++++++----- dlls/tfc/tfcx/Makefile.pl | 11 ++++++----- dlls/tfc/tfcx/moduleconfig.cpp | 4 ++-- dlls/ts/tsx/Makefile.pl | 11 ++++++----- dlls/ts/tsx/moduleconfig.cpp | 4 ++-- 13 files changed, 64 insertions(+), 54 deletions(-) diff --git a/dlls/csstats2/csstats/Makefile.pl b/dlls/csstats2/csstats/Makefile.pl index 5c63b605..4c84c853 100755 --- a/dlls/csstats2/csstats/Makefile.pl +++ b/dlls/csstats2/csstats/Makefile.pl @@ -15,6 +15,7 @@ $PROJECT = "csstats_amxx"; $sdk = "../../../hlsdk/SourceCode"; $mm = "../../../metamod/metamod"; +$gccf = "gcc"; @CPP_SOURCE_FILES = ("amxxmodule.cpp", "CMisc.cpp", "usermsg.cpp", "meta_api.cpp", "rank.cpp", "CRank.cpp"); @@ -45,7 +46,7 @@ while ($cmd = shift) } } -$gcc = `gcc --version`; +$gcc = `$gccf --version`; if ($gcc =~ /2\.9/) { $OPT{"opt"} .= " -malign-loops=2 -malign-jumps=2 -malign-functions=2"; @@ -134,11 +135,11 @@ for ($i=0; $i<=$#CPP_SOURCE_FILES; $i++) $ofile = $file; $ofile =~ s/\.cpp/\.o/; $ofile = "$outdir/$ofile"; - $gcc = "gcc $cflags -Dstrcmpi=strcasecmp -fPIC $inc -c $file -o $ofile"; + $gcc = "$gccf $cflags -Dstrcmpi=strcasecmp -fPIC $inc -c $file -o $ofile"; if (-e $ofile) { $file_time = (stat($file))[9]; - $ofile_time = (stat($file))[9]; + $ofile_time = (stat($ofile))[9]; if ($file_time > $ofile_time) { print "$gcc\n"; @@ -160,7 +161,7 @@ for ($i=0; $i<=$#CPP_SOURCE_FILES; $i++) if (-e $ofile) { $file_time = (stat($file))[9]; - $ofile_time = (stat($file))[9]; + $ofile_time = (stat($ofile))[9]; if ($file_time > $ofile_time) { print "$gcc\n"; @@ -172,6 +173,6 @@ for ($i=0; $i<=$#CPP_SOURCE_FILES; $i++) } } -$gcc = "gcc $cflags -shared -ldl -lm @LINK -o $outdir/$bin"; +$gcc = "$gccf $cflags -shared -ldl -lm @LINK -o $outdir/$bin"; print "$gcc\n"; `$gcc`; diff --git a/dlls/csstats2/csstats/meta_api.cpp b/dlls/csstats2/csstats/meta_api.cpp index 6efa1cca..e987ebc7 100755 --- a/dlls/csstats2/csstats/meta_api.cpp +++ b/dlls/csstats2/csstats/meta_api.cpp @@ -289,7 +289,7 @@ void OnMetaAttach() { void OnAmxxAttach(){ MF_AddNatives(stats_Natives); - const char* path = get_localinfo("csstats_score","addons/amxx/data/csstats.amxx"); + const char* path = get_localinfo("csstats_score","addons/amxmodx/data/csstats.amxx"); if ( path && *path ) { char error[128]; @@ -299,7 +299,7 @@ void OnAmxxAttach(){ if ( !g_rank.begin() ) { g_rank.loadRank( MF_BuildPathname("%s", - get_localinfo("csstats","addons/amxx/data/csstats.dat") ) ); + get_localinfo("csstats","addons/amxmodx/data/csstats.dat") ) ); } } diff --git a/dlls/dod2/dodfun/Makefile.pl b/dlls/dod2/dodfun/Makefile.pl index 46ead84f..0c2711ef 100755 --- a/dlls/dod2/dodfun/Makefile.pl +++ b/dlls/dod2/dodfun/Makefile.pl @@ -15,6 +15,7 @@ $PROJECT = "dodfun_amxx"; $sdk = "../../../hlsdk/SourceCode"; $mm = "../../../metamod/metamod"; +$gccf = "gcc"; @CPP_SOURCE_FILES = ("CMisc.cpp", "NPD.cpp", "NBase.cpp", "Utils.cpp", "moduleconfig.cpp", "usermsg.cpp", "amxxmodule.cpp"); @@ -45,7 +46,7 @@ while ($cmd = shift) } } -$gcc = `gcc --version`; +$gcc = `$gccf --version`; if ($gcc =~ /2\.9/) { $OPT{"opt"} .= " -malign-loops=2 -malign-jumps=2 -malign-functions=2"; @@ -134,11 +135,11 @@ for ($i=0; $i<=$#CPP_SOURCE_FILES; $i++) $ofile = $file; $ofile =~ s/\.cpp/\.o/; $ofile = "$outdir/$ofile"; - $gcc = "gcc $cflags -Dstrcmpi=strcasecmp -fPIC $inc -c $file -o $ofile"; + $gcc = "$gccf $cflags -Dstrcmpi=strcasecmp -fPIC $inc -c $file -o $ofile"; if (-e $ofile) { $file_time = (stat($file))[9]; - $ofile_time = (stat($file))[9]; + $ofile_time = (stat($ofile))[9]; if ($file_time > $ofile_time) { print "$gcc\n"; @@ -160,7 +161,7 @@ for ($i=0; $i<=$#CPP_SOURCE_FILES; $i++) if (-e $ofile) { $file_time = (stat($file))[9]; - $ofile_time = (stat($file))[9]; + $ofile_time = (stat($ofile))[9]; if ($file_time > $ofile_time) { print "$gcc\n"; @@ -172,6 +173,6 @@ for ($i=0; $i<=$#CPP_SOURCE_FILES; $i++) } } -$gcc = "gcc $cflags -shared -ldl -lm @LINK -o $outdir/$bin"; +$gcc = "$gccf $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 fa32c118..977a1736 100755 --- a/dlls/dod2/dodx/Makefile.pl +++ b/dlls/dod2/dodx/Makefile.pl @@ -15,6 +15,7 @@ $PROJECT = "dodx_amxx"; $sdk = "../../../hlsdk/SourceCode"; $mm = "../../../metamod/metamod"; +$gccf = "gcc"; @CPP_SOURCE_FILES = ("CMisc.cpp", "CRank.cpp", "NBase.cpp", "NRank.cpp", "Utils.cpp", "moduleconfig.cpp", "usermsg.cpp", "amxxmodule.cpp"); @@ -45,7 +46,7 @@ while ($cmd = shift) } } -$gcc = `gcc --version`; +$gcc = `$gccf --version`; if ($gcc =~ /2\.9/) { $OPT{"opt"} .= " -malign-loops=2 -malign-jumps=2 -malign-functions=2"; @@ -134,11 +135,11 @@ for ($i=0; $i<=$#CPP_SOURCE_FILES; $i++) $ofile = $file; $ofile =~ s/\.cpp/\.o/; $ofile = "$outdir/$ofile"; - $gcc = "gcc $cflags -Dstrcmpi=strcasecmp -fPIC $inc -c $file -o $ofile"; + $gcc = "$gccf $cflags -Dstrcmpi=strcasecmp -fPIC $inc -c $file -o $ofile"; if (-e $ofile) { $file_time = (stat($file))[9]; - $ofile_time = (stat($file))[9]; + $ofile_time = (stat($ofile))[9]; if ($file_time > $ofile_time) { print "$gcc\n"; @@ -160,7 +161,7 @@ for ($i=0; $i<=$#CPP_SOURCE_FILES; $i++) if (-e $ofile) { $file_time = (stat($file))[9]; - $ofile_time = (stat($file))[9]; + $ofile_time = (stat($ofile))[9]; if ($file_time > $ofile_time) { print "$gcc\n"; @@ -172,6 +173,6 @@ for ($i=0; $i<=$#CPP_SOURCE_FILES; $i++) } } -$gcc = "gcc $cflags -shared -ldl -lm @LINK -o $outdir/$bin"; +$gcc = "$gccf $cflags -shared -ldl -lm @LINK -o $outdir/$bin"; print "$gcc\n"; `$gcc`; diff --git a/dlls/dod2/dodx/moduleconfig.cpp b/dlls/dod2/dodx/moduleconfig.cpp index 25603bbb..c592efdc 100755 --- a/dlls/dod2/dodx/moduleconfig.cpp +++ b/dlls/dod2/dodx/moduleconfig.cpp @@ -372,7 +372,7 @@ void OnAmxxAttach() { MF_AddNatives( stats_Natives ); MF_AddNatives( base_Natives ); - const char* path = get_localinfo("dodstats_score","addons/amxx/data/dodstats.amxx"); + const char* path = get_localinfo("dodstats_score","addons/amxmodx/data/dodstats.amxx"); if ( path && *path ) { char error[128]; g_rank.loadCalc( MF_BuildPathname("%s",path) , error ); @@ -380,7 +380,7 @@ void OnAmxxAttach() { if ( !g_rank.begin() ){ g_rank.loadRank( MF_BuildPathname("%s", - get_localinfo("dodstats","addons/amxx/data/dodstats.dat") ) ); + get_localinfo("dodstats","addons/amxmodx/data/dodstats.dat") ) ); } g_map.Init(); diff --git a/dlls/fakemeta/Makefile.pl b/dlls/fakemeta/Makefile.pl index e67a6f43..fabaec6f 100755 --- a/dlls/fakemeta/Makefile.pl +++ b/dlls/fakemeta/Makefile.pl @@ -15,6 +15,7 @@ $PROJECT = "fakemeta_amxx"; $sdk = "../../hlsdk/SourceCode"; $mm = "../../metamod/metamod"; +$gccf = "gcc"; @CPP_SOURCE_FILES = ("dllfunc.cpp", "fakemeta_amxx.cpp", "forward.cpp", "pdata.cpp", "pev.cpp", "engfunc.cpp", "sdk/amxxmodule.cpp"); @@ -45,7 +46,7 @@ while ($cmd = shift) } } -$gcc = `gcc --version`; +$gcc = `$gccf --version`; if ($gcc =~ /2\.9/) { $OPT{"opt"} .= " -malign-loops=2 -malign-jumps=2 -malign-functions=2"; @@ -139,11 +140,11 @@ for ($i=0; $i<=$#CPP_SOURCE_FILES; $i++) $ofile = $file; $ofile =~ s/\.cpp/\.o/; $ofile = "$outdir/$ofile"; - $gcc = "gcc $cflags -Dstrcmpi=strcasecmp -fPIC $inc -c $file -o $ofile"; + $gcc = "$gccf $cflags -Dstrcmpi=strcasecmp -fPIC $inc -c $file -o $ofile"; if (-e $ofile) { $file_time = (stat($file))[9]; - $ofile_time = (stat($file))[9]; + $ofile_time = (stat($ofile))[9]; if ($file_time > $ofile_time) { print "$gcc\n"; @@ -165,7 +166,7 @@ for ($i=0; $i<=$#CPP_SOURCE_FILES; $i++) if (-e $ofile) { $file_time = (stat($file))[9]; - $ofile_time = (stat($file))[9]; + $ofile_time = (stat($ofile))[9]; if ($file_time > $ofile_time) { print "$gcc\n"; @@ -177,6 +178,6 @@ for ($i=0; $i<=$#CPP_SOURCE_FILES; $i++) } } -$gcc = "gcc $cflags -shared -ldl -lm @LINK -o $outdir/$bin"; +$gcc = "$gccf $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 0789ab93..802afc97 100755 --- a/dlls/geoip/Makefile.pl +++ b/dlls/geoip/Makefile.pl @@ -16,6 +16,8 @@ $PROJECT = "geoip_amxx"; $sdk = "../../hlsdk/SourceCode"; $mm = "../../metamod/metamod"; $geoip = "geolib/libGeoIP"; +$gccf = "gcc"; +$ccf = "cc"; @CPP_SOURCE_FILES = ("geoip_amxx.cpp", "amxxmodule.cpp"); @@ -46,7 +48,7 @@ while ($cmd = shift) } } -$gcc = `gcc --version`; +$gcc = `$gccf --version`; if ($gcc =~ /2\.9/) { $OPT{"opt"} .= " -malign-loops=2 -malign-jumps=2 -malign-functions=2"; @@ -135,11 +137,11 @@ for ($i=0; $i<=$#CPP_SOURCE_FILES; $i++) $ofile = $file; $ofile =~ s/\.cpp/\.o/; $ofile = "$outdir/$ofile"; - $gcc = "gcc $cflags -Dstrcmpi=strcasecmp -fPIC $inc -c $file -o $ofile"; + $gcc = "$gccf $cflags -Dstrcmpi=strcasecmp -fPIC $inc -c $file -o $ofile"; if (-e $ofile) { $file_time = (stat($file))[9]; - $ofile_time = (stat($file))[9]; + $ofile_time = (stat($ofile))[9]; if ($file_time > $ofile_time) { print "$gcc\n"; @@ -157,11 +159,11 @@ for ($i=0; $i<=$#CPP_SOURCE_FILES; $i++) $ofile = $file; $ofile =~ s/\.c/\.o/; $ofile = "$outdir/$ofile"; - $gcc = "cc $cflags -Dstrcmpi=strcasecmp -fPIC $inc -c $file -o $ofile"; + $gcc = "$ccf $cflags -Dstrcmpi=strcasecmp -fPIC $inc -c $file -o $ofile"; if (-e $ofile) { $file_time = (stat($file))[9]; - $ofile_time = (stat($file))[9]; + $ofile_time = (stat($ofile))[9]; if ($file_time > $ofile_time) { print "$gcc\n"; @@ -173,6 +175,6 @@ for ($i=0; $i<=$#CPP_SOURCE_FILES; $i++) } } -$gcc = "gcc $cflags -shared -ldl -lm @LINK -o $outdir/$bin"; +$gcc = "$gccf $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 7a17af23..0ea54aad 100755 --- a/dlls/ns/ns/Makefile.pl +++ b/dlls/ns/ns/Makefile.pl @@ -15,6 +15,7 @@ $PROJECT = "ns_amxx"; $sdk = "../../../hlsdk/SourceCode"; $mm = "../../../metamod/metamod"; +$gccf = "gcc"; @CPP_SOURCE_FILES = ("amxxmodule.cpp", "CPlayer.cpp", "CSpawn.cpp", "NMisc.cpp", "NPData.cpp", "hookedfunctions.cpp"); @@ -45,7 +46,7 @@ while ($cmd = shift) } } -$gcc = `gcc --version`; +$gcc = `$gccf --version`; if ($gcc =~ /2\.9/) { $OPT{"opt"} .= " -malign-loops=2 -malign-jumps=2 -malign-functions=2"; @@ -134,11 +135,11 @@ for ($i=0; $i<=$#CPP_SOURCE_FILES; $i++) $ofile = $file; $ofile =~ s/\.cpp/\.o/; $ofile = "$outdir/$ofile"; - $gcc = "gcc $cflags -Dstrcmpi=strcasecmp -fPIC $inc -c $file -o $ofile"; + $gcc = "$gccf $cflags -Dstrcmpi=strcasecmp -fPIC $inc -c $file -o $ofile"; if (-e $ofile) { $file_time = (stat($file))[9]; - $ofile_time = (stat($file))[9]; + $ofile_time = (stat($ofile))[9]; if ($file_time > $ofile_time) { print "$gcc\n"; @@ -160,7 +161,7 @@ for ($i=0; $i<=$#CPP_SOURCE_FILES; $i++) if (-e $ofile) { $file_time = (stat($file))[9]; - $ofile_time = (stat($file))[9]; + $ofile_time = (stat($ofile))[9]; if ($file_time > $ofile_time) { print "$gcc\n"; @@ -172,6 +173,6 @@ for ($i=0; $i<=$#CPP_SOURCE_FILES; $i++) } } -$gcc = "gcc $cflags -shared -ldl -lm @LINK -o $outdir/$bin"; +$gcc = "$gccf $cflags -shared -ldl -lm @LINK -o $outdir/$bin"; print "$gcc\n"; `$gcc`; diff --git a/dlls/sockets/Makefile.pl b/dlls/sockets/Makefile.pl index 0e1512e2..b418347f 100755 --- a/dlls/sockets/Makefile.pl +++ b/dlls/sockets/Makefile.pl @@ -15,6 +15,7 @@ $PROJECT = "sockets_amxx"; $sdk = "../hlsdk/SourceCode"; $mm = "../metamod/metamod"; +$gccf = "gcc"; @CPP_SOURCE_FILES = ("sockets.cpp", "amxxmodule.cpp"); @@ -45,7 +46,7 @@ while ($cmd = shift) } } -$gcc = `gcc --version`; +$gcc = `$gccf --version`; if ($gcc =~ /2\.9/) { $OPT{"opt"} .= " -malign-loops=2 -malign-jumps=2 -malign-functions=2"; @@ -134,11 +135,11 @@ for ($i=0; $i<=$#CPP_SOURCE_FILES; $i++) $ofile = $file; $ofile =~ s/\.cpp/\.o/; $ofile = "$outdir/$ofile"; - $gcc = "gcc $cflags -Dstrcmpi=strcasecmp -fPIC $inc -c $file -o $ofile"; + $gcc = "$gccf $cflags -Dstrcmpi=strcasecmp -fPIC $inc -c $file -o $ofile"; if (-e $ofile) { $file_time = (stat($file))[9]; - $ofile_time = (stat($file))[9]; + $ofile_time = (stat($ofile))[9]; if ($file_time > $ofile_time) { print "$gcc\n"; @@ -160,7 +161,7 @@ for ($i=0; $i<=$#CPP_SOURCE_FILES; $i++) if (-e $ofile) { $file_time = (stat($file))[9]; - $ofile_time = (stat($file))[9]; + $ofile_time = (stat($ofile))[9]; if ($file_time > $ofile_time) { print "$gcc\n"; @@ -172,6 +173,6 @@ for ($i=0; $i<=$#CPP_SOURCE_FILES; $i++) } } -$gcc = "gcc $cflags -shared -ldl -lm @LINK -o $outdir/$bin"; +$gcc = "$gccf $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 5205eb20..efc654c3 100755 --- a/dlls/tfc/tfcx/Makefile.pl +++ b/dlls/tfc/tfcx/Makefile.pl @@ -15,6 +15,7 @@ $PROJECT = "tfcx_amxx"; $sdk = "../../../hlsdk/SourceCode"; $mm = "../../../metamod/metamod"; +$gccf = "gcc"; @CPP_SOURCE_FILES = ("CMisc.cpp", "CRank.cpp", "NBase.cpp", "NRank.cpp", "Utils.cpp", "moduleconfig.cpp", "usermsg.cpp", "amxxmodule.cpp"); @@ -45,7 +46,7 @@ while ($cmd = shift) } } -$gcc = `gcc --version`; +$gcc = `$gccf --version`; if ($gcc =~ /2\.9/) { $OPT{"opt"} .= " -malign-loops=2 -malign-jumps=2 -malign-functions=2"; @@ -134,11 +135,11 @@ for ($i=0; $i<=$#CPP_SOURCE_FILES; $i++) $ofile = $file; $ofile =~ s/\.cpp/\.o/; $ofile = "$outdir/$ofile"; - $gcc = "gcc $cflags -Dstrcmpi=strcasecmp -fPIC $inc -c $file -o $ofile"; + $gcc = "$gccf $cflags -Dstrcmpi=strcasecmp -fPIC $inc -c $file -o $ofile"; if (-e $ofile) { $file_time = (stat($file))[9]; - $ofile_time = (stat($file))[9]; + $ofile_time = (stat($ofile))[9]; if ($file_time > $ofile_time) { print "$gcc\n"; @@ -160,7 +161,7 @@ for ($i=0; $i<=$#CPP_SOURCE_FILES; $i++) if (-e $ofile) { $file_time = (stat($file))[9]; - $ofile_time = (stat($file))[9]; + $ofile_time = (stat($ofile))[9]; if ($file_time > $ofile_time) { print "$gcc\n"; @@ -172,6 +173,6 @@ for ($i=0; $i<=$#CPP_SOURCE_FILES; $i++) } } -$gcc = "gcc $cflags -shared -ldl -lm @LINK -o $outdir/$bin"; +$gcc = "$gccf $cflags -shared -ldl -lm @LINK -o $outdir/$bin"; print "$gcc\n"; `$gcc`; diff --git a/dlls/tfc/tfcx/moduleconfig.cpp b/dlls/tfc/tfcx/moduleconfig.cpp index bbc30790..fbb6e49c 100755 --- a/dlls/tfc/tfcx/moduleconfig.cpp +++ b/dlls/tfc/tfcx/moduleconfig.cpp @@ -326,7 +326,7 @@ void OnAmxxAttach() { MF_AddNatives( stats_Natives ); MF_AddNatives( base_Natives ); - const char* path = get_localinfo("tfcstats_score","addons/amxx/data/tfcstats.amxx"); + const char* path = get_localinfo("tfcstats_score","addons/amxmodx/data/tfcstats.amxx"); if ( path && *path ) { char error[128]; @@ -334,7 +334,7 @@ void OnAmxxAttach() { } if ( !g_rank.begin() ) { - g_rank.loadRank( MF_BuildPathname("%s",get_localinfo("tfcstats","addons/amxx/data/tfcstats.dat") ) ); + g_rank.loadRank( MF_BuildPathname("%s",get_localinfo("tfcstats","addons/amxmodx/data/tfcstats.dat") ) ); } // set default PrivateData offsets diff --git a/dlls/ts/tsx/Makefile.pl b/dlls/ts/tsx/Makefile.pl index 35da8272..316a44ea 100755 --- a/dlls/ts/tsx/Makefile.pl +++ b/dlls/ts/tsx/Makefile.pl @@ -15,6 +15,7 @@ $PROJECT = "tsx_amxx"; $sdk = "../../../hlsdk/SourceCode"; $mm = "../../../metamod/metamod"; +$gccf = "gcc"; @CPP_SOURCE_FILES = ("CMisc.cpp", "CRank.cpp", "NBase.cpp", "NRank.cpp", "Utils.cpp", "moduleconfig.cpp", "usermsg.cpp", "amxxmodule.cpp"); @@ -45,7 +46,7 @@ while ($cmd = shift) } } -$gcc = `gcc --version`; +$gcc = `$gccf --version`; if ($gcc =~ /2\.9/) { $OPT{"opt"} .= " -malign-loops=2 -malign-jumps=2 -malign-functions=2"; @@ -134,11 +135,11 @@ for ($i=0; $i<=$#CPP_SOURCE_FILES; $i++) $ofile = $file; $ofile =~ s/\.cpp/\.o/; $ofile = "$outdir/$ofile"; - $gcc = "gcc $cflags -Dstrcmpi=strcasecmp -fPIC $inc -c $file -o $ofile"; + $gcc = "$gccf $cflags -Dstrcmpi=strcasecmp -fPIC $inc -c $file -o $ofile"; if (-e $ofile) { $file_time = (stat($file))[9]; - $ofile_time = (stat($file))[9]; + $ofile_time = (stat($ofile))[9]; if ($file_time > $ofile_time) { print "$gcc\n"; @@ -160,7 +161,7 @@ for ($i=0; $i<=$#CPP_SOURCE_FILES; $i++) if (-e $ofile) { $file_time = (stat($file))[9]; - $ofile_time = (stat($file))[9]; + $ofile_time = (stat($ofile))[9]; if ($file_time > $ofile_time) { print "$gcc\n"; @@ -172,6 +173,6 @@ for ($i=0; $i<=$#CPP_SOURCE_FILES; $i++) } } -$gcc = "gcc $cflags -shared -ldl -lm @LINK -o $outdir/$bin"; +$gcc = "$gccf $cflags -shared -ldl -lm @LINK -o $outdir/$bin"; print "$gcc\n"; `$gcc`; diff --git a/dlls/ts/tsx/moduleconfig.cpp b/dlls/ts/tsx/moduleconfig.cpp index 08596727..f5486131 100755 --- a/dlls/ts/tsx/moduleconfig.cpp +++ b/dlls/ts/tsx/moduleconfig.cpp @@ -295,7 +295,7 @@ void OnAmxxAttach() { MF_AddNatives( stats_Natives ); MF_AddNatives( base_Natives ); - const char* path = get_localinfo("tsstats_score","addons/amxx/data/tsstats.amxx"); + const char* path = get_localinfo("tsstats_score","addons/amxmodx/data/tsstats.amxx"); if ( path && *path ) { char error[128]; @@ -303,7 +303,7 @@ void OnAmxxAttach() { } if ( !g_rank.begin() ) { - g_rank.loadRank( MF_BuildPathname("%s",get_localinfo("tsstats","addons/amxx/data/tsstats.dat") ) ); + g_rank.loadRank( MF_BuildPathname("%s",get_localinfo("tsstats","addons/amxmodx/data/tsstats.dat") ) ); } }