diff --git a/dlls/csstats2/csstats/CRank.cpp b/dlls/csstats2/csstats/CRank.cpp index 48838bcc..fd2614e4 100755 --- a/dlls/csstats2/csstats/CRank.cpp +++ b/dlls/csstats2/csstats/CRank.cpp @@ -305,4 +305,5 @@ void RankSystem::saveRank( const char* filename ) fwrite( &i , 1, sizeof(short int), bfp); // null terminator fclose(bfp); -} \ No newline at end of file +} + diff --git a/dlls/csstats2/csstats/CRank.h b/dlls/csstats2/csstats/CRank.h index 20a23430..797799e1 100755 --- a/dlls/csstats2/csstats/CRank.h +++ b/dlls/csstats2/csstats/CRank.h @@ -119,4 +119,5 @@ public: }; -#endif \ No newline at end of file +#endif + diff --git a/dlls/csstats2/csstats/Makefile.pl b/dlls/csstats2/csstats/Makefile.pl new file mode 100755 index 00000000..cf8094eb --- /dev/null +++ b/dlls/csstats2/csstats/Makefile.pl @@ -0,0 +1,177 @@ +#!/usr/bin/perl +#(C)2004 AMX Mod X Development Team +# by David "BAILOPAN" Anderson + +# output will occur in bin.x.proc +# where x is debug or opt and proc is ix86 or amd64 +# You must use this script from the project src dir + +#options = +# debug - enable gdb debugging +# amd64 - compile for AMD64 +# proc=ix86 - assumed not amd64 +# clean - clean the specifications above + +$PROJECT = "csstats_amxx"; +$sdk = "../../../hlsdk/SourceCode"; +$mm = "../../../metamod/metamod"; + +@CPP_SOURCE_FILES = ("amxxmodule.cpp", "CMisc.cpp", "usermsg.cpp", "meta_api.cpp", "rank.cpp", "CRank.cpp"); + +@C_SOURCE_FILES = (); +my %OPTIONS, %OPT; + +$OPT{"debug"} = "-g -ggdb"; +$OPT{"opt"} = "-O2 -ffast-math -funroll-loops -fomit-frame-pointer -s -DNDEBUG -Wall -Wno-unknown-pragmas -DOPT_TYPE=\"optimized\""; + +$OPTIONS{"include"} = "-I$sdk -I. -I$mm -I$sdk/engine -I$sdk/common -I$sdk/pm_shared -I$sdk/dlls"; + +while ($cmd = shift) +{ + if ($cmd =~ /amd64/) { + $OPTIONS{"amd64"} = 1; + } elsif ($cmd =~ /debug/) { + $OPTIONS{"debug"} = 1; + } elsif ($cmd =~ /proc=i(\d)86/) { + $proc = $1; + if ($OPTIONS{"amd64"}) + { + die "You cannot compile for i".$proc."86 and AMD64.\n"; + } else { + $OPTIONS{"proc"} = "i".$proc."86"; + } + } elsif ($cmd =~ /clean/) { + $OPTIONS{"clean"} = 1; + } +} + +$gcc = `g++ --version`; +if ($gcc =~ /2\.9/) +{ + $OPT{"opt"} .= " -malign-loops=2 -malign-jumps=2 -malign-functions=2"; +} else { + $OPT{"opt"} .= " -falign-loops=2 -falign-jumps=2 -falign-functions=2"; +} + +if ($OPTIONS{"debug"}) +{ + $cflags = $OPT{"debug"}; +} else { + if (!$OPTIONS{"amd64"}) + { + $proc = $OPTIONS{"proc"}; + if (!$proc) + { + $proc = 3; + } + $cflags = "-march=i".$proc."86 ".$OPT{"opt"}; + } else { + $cflags = $OPT{"opt"}; + } +} + +if ($OPTIONS{"amd64"}) +{ + $cflags .= " -m64 -DHAVE_I64 -DSMALL_CELL_SIZE=64 $cflags"; +} + +if ($OPTIONS{"debug"}) +{ + $outdir = "bin.debug"; +} else { + $outdir = "bin.opt"; +} + +if ($OPTIONS{"amd64"}) +{ + $outdir .= ".amd64"; + $bin = $PROJECT."_amd64.so"; +} else { + $proc = $OPTIONS{"proc"}; + if ($proc) + { + $outdir .= ".i".$proc."86"; + $bin = $PROJECT."_i".$proc."86.so"; + } else { + $outdir .= ".i386"; + $bin = $PROJECT."_i386.so"; + } +} + +unlink("$outdir/$bin"); +if ($OPTIONS{"clean"}) +{ + `rm $outdir/*.o`; + die("Project cleaned.\n"); +} + +#create the dirs +#build link list +my @LINK; +for ($i=0; $i<=$#CPP_SOURCE_FILES; $i++) +{ + $file = $CPP_SOURCE_FILES[$i]; + $file =~ s/\.cpp/\.o/; + push(@LINK, $outdir."/".$file); +} +for ($i=0; $i<=$#C_SOURCE_FILES; $i++) +{ + $file = $C_SOURCE_FILES[$i]; + $file =~ s/\.c/\.o/; + push(@LINK, $outdir."/".$file); +} + +if (!(-d $outdir)) +{ + mkdir($outdir); +} + +$inc = $OPTIONS{"include"}; + +for ($i=0; $i<=$#CPP_SOURCE_FILES; $i++) +{ + $file = $CPP_SOURCE_FILES[$i]; + $ofile = $file; + $ofile =~ s/\.cpp/\.o/; + $ofile = "$outdir/$ofile"; + $gcc = "g++ $cflags -Dstrcmpi=strcasecmp -fPIC $inc -c $file -o $ofile"; + if (-e $ofile) + { + $file_time = (stat($file))[9]; + $ofile_time = (stat($file))[9]; + if ($file_time > $ofile_time) + { + print "$gcc\n"; + `$gcc`; + } + } else { + print "$gcc\n"; + `$gcc`; + } +} + +for ($i=0; $i<=$#CPP_SOURCE_FILES; $i++) +{ + $file = $C_SOURCE_FILES[$i]; + $ofile = $file; + $ofile =~ s/\.c/\.o/; + $ofile = "$outdir/$ofile"; + $gcc = "cc $cflags -Dstrcmpi=strcasecmp -fPIC $inc -c $file -o $ofile"; + if (-e $ofile) + { + $file_time = (stat($file))[9]; + $ofile_time = (stat($file))[9]; + if ($file_time > $ofile_time) + { + print "$gcc\n"; + `$gcc`; + } + } else { + print "$gcc\n"; + `$gcc`; + } +} + +$gcc = "g++ $cflags -shared -lstdc++ -ldl -lm @LINK -o $outdir/$bin"; +print "$gcc\n"; +`$gcc`; diff --git a/dlls/csstats2/csstats/moduleconfig.h b/dlls/csstats2/csstats/moduleconfig.h index ae652eef..4e2eb1f1 100755 --- a/dlls/csstats2/csstats/moduleconfig.h +++ b/dlls/csstats2/csstats/moduleconfig.h @@ -458,4 +458,5 @@ #endif // USE_METAMOD -#endif // __MODULECONFIG_H__ \ No newline at end of file +#endif // __MODULECONFIG_H__ + diff --git a/dlls/dod2/dodfun/CMisc.h b/dlls/dod2/dodfun/CMisc.h index 3bcff1c0..45a234dc 100755 --- a/dlls/dod2/dodfun/CMisc.h +++ b/dlls/dod2/dodfun/CMisc.h @@ -124,4 +124,5 @@ public: -#endif // CMISC_H \ No newline at end of file +#endif // CMISC_H + diff --git a/dlls/dod2/dodfun/Makefile.pl b/dlls/dod2/dodfun/Makefile.pl index 0b3cf811..bd8338bb 100755 --- a/dlls/dod2/dodfun/Makefile.pl +++ b/dlls/dod2/dodfun/Makefile.pl @@ -72,7 +72,7 @@ if ($OPTIONS{"debug"}) if ($OPTIONS{"amd64"}) { - $cflags .= "-m64 -DSMALL_CELLSIZE=64 $cflags"; + $cflags .= " -m64 -DHAVE_I64 -DSMALL_CELL_SIZE=64 $cflags"; } if ($OPTIONS{"debug"}) @@ -98,10 +98,10 @@ if ($OPTIONS{"amd64"}) } } +unlink("$outdir/$bin"); if ($OPTIONS{"clean"}) { `rm $outdir/*.o`; - `rm $outdir/$bin`; die("Project cleaned.\n"); } @@ -173,4 +173,5 @@ for ($i=0; $i<=$#CPP_SOURCE_FILES; $i++) } $gcc = "g++ $cflags -shared -ldl -lm @LINK -o $outdir/$bin"; +print "$gcc\n"; `$gcc`; diff --git a/dlls/dod2/dodfun/moduleconfig.h b/dlls/dod2/dodfun/moduleconfig.h index 5a870903..0b472677 100755 --- a/dlls/dod2/dodfun/moduleconfig.h +++ b/dlls/dod2/dodfun/moduleconfig.h @@ -459,4 +459,5 @@ #endif // USE_METAMOD -#endif // __MODULECONFIG_H__ \ No newline at end of file +#endif // __MODULECONFIG_H__ + diff --git a/dlls/dod2/dodx/CMisc.h b/dlls/dod2/dodx/CMisc.h index 2d2c7627..f0467e66 100755 --- a/dlls/dod2/dodx/CMisc.h +++ b/dlls/dod2/dodx/CMisc.h @@ -182,4 +182,5 @@ public: }; #endif -#endif // CMISC_H \ No newline at end of file +#endif // CMISC_H + diff --git a/dlls/dod2/dodx/CRank.h b/dlls/dod2/dodx/CRank.h index 004bb69a..e5b623d4 100755 --- a/dlls/dod2/dodx/CRank.h +++ b/dlls/dod2/dodx/CRank.h @@ -141,4 +141,5 @@ public: }; -#endif \ No newline at end of file +#endif + diff --git a/dlls/dod2/dodx/Makefile.pl b/dlls/dod2/dodx/Makefile.pl index 9b1066e4..4cbcd40d 100755 --- a/dlls/dod2/dodx/Makefile.pl +++ b/dlls/dod2/dodx/Makefile.pl @@ -72,7 +72,7 @@ if ($OPTIONS{"debug"}) if ($OPTIONS{"amd64"}) { - $cflags .= "-m64 -DSMALL_CELLSIZE=64 $cflags"; + $cflags .= " -m64 -DHAVE_I64 -DSMALL_CELL_SIZE=64 $cflags"; } if ($OPTIONS{"debug"}) @@ -98,10 +98,10 @@ if ($OPTIONS{"amd64"}) } } +unlink("%outdir/$bin"); if ($OPTIONS{"clean"}) { `rm $outdir/*.o`; - `rm $outdir/$bin`; die("Project cleaned.\n"); } @@ -173,4 +173,5 @@ for ($i=0; $i<=$#CPP_SOURCE_FILES; $i++) } $gcc = "g++ $cflags -shared -ldl -lm @LINK -o $outdir/$bin"; +print "$gcc\n"; `$gcc`; diff --git a/dlls/dod2/dodx/moduleconfig.h b/dlls/dod2/dodx/moduleconfig.h index f91065ae..e0a1a2fb 100755 --- a/dlls/dod2/dodx/moduleconfig.h +++ b/dlls/dod2/dodx/moduleconfig.h @@ -464,4 +464,5 @@ #endif // USE_METAMOD -#endif // __MODULECONFIG_H__ \ No newline at end of file +#endif // __MODULECONFIG_H__ + diff --git a/dlls/fakemeta/Makefile.pl b/dlls/fakemeta/Makefile.pl index ab46ac7a..dfad7aba 100755 --- a/dlls/fakemeta/Makefile.pl +++ b/dlls/fakemeta/Makefile.pl @@ -72,7 +72,7 @@ if ($OPTIONS{"debug"}) if ($OPTIONS{"amd64"}) { - $cflags .= "-m64 -DSMALL_CELLSIZE=64 $cflags"; + $cflags .= " -m64 -DHAVE_I64 -DSMALL_CELL_SIZE=64 $cflags"; } if ($OPTIONS{"debug"}) @@ -98,11 +98,11 @@ if ($OPTIONS{"amd64"}) } } +unlink("$outdir/$bin"); if ($OPTIONS{"clean"}) { `rm $outdir/*.o`; `rm $outdir/sdk/*.o`; - `rm $outdir/$bin`; die("Project cleaned.\n"); } @@ -178,4 +178,5 @@ for ($i=0; $i<=$#CPP_SOURCE_FILES; $i++) } $gcc = "g++ $cflags -shared -lstdc++ -ldl -lm @LINK -o $outdir/$bin"; +print "$gcc\n"; `$gcc`; diff --git a/dlls/fakemeta/dllfunc.h b/dlls/fakemeta/dllfunc.h index aae01b46..d3c6cdf4 100755 --- a/dlls/fakemeta/dllfunc.h +++ b/dlls/fakemeta/dllfunc.h @@ -51,4 +51,5 @@ enum MetaFunc_CallGameEntity // bool (plid_t plid, const char *entStr,entvars_t *pev); }; -#endif //_INCLUDE_DLLFUNC_H \ No newline at end of file +#endif //_INCLUDE_DLLFUNC_H + diff --git a/dlls/fakemeta/engfunc.h b/dlls/fakemeta/engfunc.h index 2726b156..1262e285 100755 --- a/dlls/fakemeta/engfunc.h +++ b/dlls/fakemeta/engfunc.h @@ -80,4 +80,5 @@ enum { EngFunc_SetClientKeyValue // void ) (int clientIndex, char *infobuffer, char *key, char *value); }; -#endif //_ENGFUNC_INCLUDE_H \ No newline at end of file +#endif //_ENGFUNC_INCLUDE_H + diff --git a/dlls/fakemeta/fakemeta_amxx.h b/dlls/fakemeta/fakemeta_amxx.h index b8848acd..83ae1a3e 100755 --- a/dlls/fakemeta/fakemeta_amxx.h +++ b/dlls/fakemeta/fakemeta_amxx.h @@ -38,4 +38,5 @@ extern enginefuncs_t *g_pengfuncsTable; extern enginefuncs_t *g_pengfuncsTable_Post; -#endif //_FAKEMETA_INCLUDE_H \ No newline at end of file +#endif //_FAKEMETA_INCLUDE_H + diff --git a/dlls/fakemeta/forward.h b/dlls/fakemeta/forward.h index 0dfec451..ed91ff3d 100755 --- a/dlls/fakemeta/forward.h +++ b/dlls/fakemeta/forward.h @@ -161,4 +161,5 @@ extern const char *mlStringResult; extern int lastFmRes; extern int retType; -#endif //_INCLUDE_FORWARD_H \ No newline at end of file +#endif //_INCLUDE_FORWARD_H + diff --git a/dlls/fakemeta/pev.h b/dlls/fakemeta/pev.h index 8d253c6f..4a93c2d1 100755 --- a/dlls/fakemeta/pev.h +++ b/dlls/fakemeta/pev.h @@ -157,4 +157,5 @@ enum pev_pointers pev_vecarray_end }; -#endif //_INCLUDE_PEV_H \ No newline at end of file +#endif //_INCLUDE_PEV_H + diff --git a/dlls/fakemeta/sdk/moduleconfig.h b/dlls/fakemeta/sdk/moduleconfig.h index e4fb27eb..f9791943 100755 --- a/dlls/fakemeta/sdk/moduleconfig.h +++ b/dlls/fakemeta/sdk/moduleconfig.h @@ -459,4 +459,5 @@ #endif // USE_METAMOD -#endif // __MODULECONFIG_H__ \ No newline at end of file +#endif // __MODULECONFIG_H__ + diff --git a/dlls/geoip/Makefile.pl b/dlls/geoip/Makefile.pl index 99983e8a..e4e835bf 100755 --- a/dlls/geoip/Makefile.pl +++ b/dlls/geoip/Makefile.pl @@ -73,7 +73,7 @@ if ($OPTIONS{"debug"}) if ($OPTIONS{"amd64"}) { - $cflags .= "-m64 -DSMALL_CELLSIZE=64 $cflags"; + $cflags .= " -m64 -DHAVE_I64 -DSMALL_CELL_SIZE=64 $cflags"; } if ($OPTIONS{"debug"}) @@ -99,10 +99,10 @@ if ($OPTIONS{"amd64"}) } } +unlink("$outdir/$bin"); if ($OPTIONS{"clean"}) { `rm $outdir/*.o`; - `rm $outdir/$bin`; die("Project cleaned.\n"); } @@ -174,4 +174,5 @@ for ($i=0; $i<=$#CPP_SOURCE_FILES; $i++) } $gcc = "g++ $cflags -shared -lstdc++ -ldl -lm @LINK -o $outdir/$bin"; +print "$gcc\n"; `$gcc`; diff --git a/dlls/geoip/moduleconfig.h b/dlls/geoip/moduleconfig.h index 624a7008..db0b998f 100755 --- a/dlls/geoip/moduleconfig.h +++ b/dlls/geoip/moduleconfig.h @@ -459,4 +459,5 @@ #endif // USE_METAMOD -#endif // __MODULECONFIG_H__ \ No newline at end of file +#endif // __MODULECONFIG_H__ + diff --git a/dlls/ns/ns/CPlayer.h b/dlls/ns/ns/CPlayer.h index 26063dc4..db30581a 100755 --- a/dlls/ns/ns/CPlayer.h +++ b/dlls/ns/ns/CPlayer.h @@ -38,4 +38,5 @@ public: int iclass; }; -#endif \ No newline at end of file +#endif + diff --git a/dlls/ns/ns/CSpawn.h b/dlls/ns/ns/CSpawn.h index a7c02964..02bb7d92 100755 --- a/dlls/ns/ns/CSpawn.h +++ b/dlls/ns/ns/CSpawn.h @@ -17,4 +17,5 @@ public: float getnum(int type); vec3_t getpoint(int type, int num); }; -#endif \ No newline at end of file +#endif + diff --git a/dlls/ns/ns/Makefile.pl b/dlls/ns/ns/Makefile.pl index ead61eb9..046023dc 100755 --- a/dlls/ns/ns/Makefile.pl +++ b/dlls/ns/ns/Makefile.pl @@ -72,7 +72,7 @@ if ($OPTIONS{"debug"}) if ($OPTIONS{"amd64"}) { - $cflags .= "-m64 -DSMALL_CELLSIZE=64 $cflags"; + $cflags .= " -m64 -DHAVE_I64 -DSMALL_CELL_SIZE=64 $cflags"; } if ($OPTIONS{"debug"}) @@ -98,10 +98,10 @@ if ($OPTIONS{"amd64"}) } } +unlink("$outdir/$bin"); if ($OPTIONS{"clean"}) { `rm $outdir/*.o`; - `rm $outdir/$bin`; die("Project cleaned.\n"); } @@ -173,4 +173,5 @@ for ($i=0; $i<=$#CPP_SOURCE_FILES; $i++) } $gcc = "g++ $cflags -shared -ldl -lm @LINK -o $outdir/$bin"; +print "$gcc\n"; `$gcc`; diff --git a/dlls/ns/ns/NPData.cpp b/dlls/ns/ns/NPData.cpp index 52e081c5..3e0cffca 100755 --- a/dlls/ns/ns/NPData.cpp +++ b/dlls/ns/ns/NPData.cpp @@ -116,7 +116,7 @@ static cell AMX_NATIVE_CALL ns_set_points(AMX *amx, cell *params) CPlayer *player = GET_PLAYER_I(id); if (!player->connected || player->edict->pvPrivateData == NULL) return 0; - set_private(player->edict,OFFSET_WIN_POINTS,OFFSET_LIN_POINTS,params[2]); + set_private(player->edict,OFFSET_WIN_POINTS,OFFSET_LIN_POINTS,(int)params[2]); return 1; } static cell AMX_NATIVE_CALL ns_set_weapon_dmg(AMX *amx, cell *params) @@ -172,7 +172,7 @@ static cell AMX_NATIVE_CALL ns_set_weapon_ammo(AMX *amx, cell *params) edict_t *pEntity = INDEXENT2(id); if (pEntity->pvPrivateData == NULL) return 0; - set_private(pEntity,OFFSET_WIN_WEAPCLIP,OFFSET_LIN_WEAPCLIP,params[2]); + set_private(pEntity,OFFSET_WIN_WEAPCLIP,OFFSET_LIN_WEAPCLIP,(int)params[2]); return 1; } static cell AMX_NATIVE_CALL ns_get_weapon_ammo(AMX *amx, cell *params) @@ -221,19 +221,19 @@ static cell AMX_NATIVE_CALL ns_set_weap_reserve(AMX *amx, cell *params) switch (params[2]) { case WEAPON_PISTOL: - set_private(player->edict,OFFSET_WIN_AMMO_PISTOL,OFFSET_LIN_AMMO_PISTOL,params[3]); + set_private(player->edict,OFFSET_WIN_AMMO_PISTOL,OFFSET_LIN_AMMO_PISTOL,(int)params[3]); return 1; case WEAPON_LMG: - set_private(player->edict,OFFSET_WIN_AMMO_LMG,OFFSET_LIN_AMMO_LMG,params[3]); + set_private(player->edict,OFFSET_WIN_AMMO_LMG,OFFSET_LIN_AMMO_LMG,(int)params[3]); return 1; case WEAPON_HMG: - set_private(player->edict,OFFSET_WIN_AMMO_HMG,OFFSET_LIN_AMMO_HMG,params[3]); + set_private(player->edict,OFFSET_WIN_AMMO_HMG,OFFSET_LIN_AMMO_HMG,(int)params[3]); return 1; case WEAPON_GRENADE_GUN: - set_private(player->edict,OFFSET_WIN_AMMO_GL,OFFSET_LIN_AMMO_GL,params[3]); + set_private(player->edict,OFFSET_WIN_AMMO_GL,OFFSET_LIN_AMMO_GL,(int)params[3]); return 1; case WEAPON_GRENADE: - set_private(player->edict,OFFSET_WIN_AMMO_HG,OFFSET_LIN_AMMO_HG,params[3]); + set_private(player->edict,OFFSET_WIN_AMMO_HG,OFFSET_LIN_AMMO_HG,(int)params[3]); return 1; default: return 0; @@ -258,7 +258,7 @@ static cell AMX_NATIVE_CALL ns_set_score(AMX *amx, cell *params) CPlayer *player = GET_PLAYER_I(id); if (!player->connected || player->edict->pvPrivateData == NULL) return 0; - set_private(player->edict,OFFSET_WIN_SCORE,OFFSET_LIN_SCORE,params[2]); + set_private(player->edict,OFFSET_WIN_SCORE,OFFSET_LIN_SCORE,(int)params[2]); return 1; } static cell AMX_NATIVE_CALL ns_set_hive_trait(AMX *amx, cell *params) @@ -269,7 +269,7 @@ static cell AMX_NATIVE_CALL ns_set_hive_trait(AMX *amx, cell *params) edict_t *pEntity = INDEXENT2(id); if (pEntity->pvPrivateData == NULL) return 0; - set_private(pEntity,OFFSET_WIN_HIVE_TRAIT,OFFSET_LIN_HIVE_TRAIT,params[2]); + set_private(pEntity,OFFSET_WIN_HIVE_TRAIT,OFFSET_LIN_HIVE_TRAIT,(int)params[2]); return 1; } static cell AMX_NATIVE_CALL ns_get_hive_trait(AMX *amx, cell *params) @@ -296,7 +296,7 @@ static cell AMX_NATIVE_CALL ns_set_deaths(AMX *amx, cell *params) if (id < 1 || id > gpGlobals->maxClients) return 0; CPlayer *player = GET_PLAYER_I(id); - set_private(player->edict,OFFSET_WIN_DEATHS,OFFSET_LIN_DEATHS,params[2]); + set_private(player->edict,OFFSET_WIN_DEATHS,OFFSET_LIN_DEATHS,(int)params[2]); return 1; } static cell AMX_NATIVE_CALL ns_get_icon(AMX *amx, cell *params) @@ -313,7 +313,7 @@ static cell AMX_NATIVE_CALL ns_set_icon(AMX *amx, cell *params) if (id < 1 || id > gpGlobals->maxClients) return 0; CPlayer *player = GET_PLAYER_I(id); - set_private(player->edict,OFFSET_WIN_ICON,OFFSET_LIN_ICON,params[2]); + set_private(player->edict,OFFSET_WIN_ICON,OFFSET_LIN_ICON,(int)params[2]); return 1; } @@ -353,4 +353,5 @@ AMX_NATIVE_INFO ns_pdata_natives[] = { { "ns_set_hive_trait", ns_set_hive_trait }, { NULL, NULL } -}; \ No newline at end of file +}; + diff --git a/dlls/ns/ns/moduleconfig.h b/dlls/ns/ns/moduleconfig.h index 9c73c3a7..63ebf99d 100755 --- a/dlls/ns/ns/moduleconfig.h +++ b/dlls/ns/ns/moduleconfig.h @@ -458,3 +458,4 @@ #endif // USE_METAMOD #endif // __MODULECONFIG_H__ + diff --git a/dlls/ns/ns/ns.h b/dlls/ns/ns/ns.h index eed71801..06bfd8fb 100755 --- a/dlls/ns/ns/ns.h +++ b/dlls/ns/ns/ns.h @@ -33,4 +33,5 @@ extern int BuiltForward; -#endif // NS_H \ No newline at end of file +#endif // NS_H + diff --git a/dlls/ns/ns/ns_const.h b/dlls/ns/ns/ns_const.h index 04cff160..7da4c078 100755 --- a/dlls/ns/ns/ns_const.h +++ b/dlls/ns/ns/ns_const.h @@ -274,4 +274,5 @@ enum classes #define MENUDEFAULT_HOLDTIME 30.0; -#endif \ No newline at end of file +#endif + diff --git a/dlls/ns/ns/utilfunctions.h b/dlls/ns/ns/utilfunctions.h index cd334152..51dcde56 100755 --- a/dlls/ns/ns/utilfunctions.h +++ b/dlls/ns/ns/utilfunctions.h @@ -68,4 +68,5 @@ inline BOOL isValidEntity(int x) #define CHECK_PARAMS(x) if (*params/sizeof(cell) < x) return 0; -#endif // UTILFUNCTIONS_H \ No newline at end of file +#endif // UTILFUNCTIONS_H + diff --git a/dlls/sockets/Makefile.pl b/dlls/sockets/Makefile.pl index 01029efc..7937baed 100755 --- a/dlls/sockets/Makefile.pl +++ b/dlls/sockets/Makefile.pl @@ -72,7 +72,7 @@ if ($OPTIONS{"debug"}) if ($OPTIONS{"amd64"}) { - $cflags .= "-m64 -DSMALL_CELLSIZE=64 $cflags"; + $cflags .= " -m64 -DHAVE_I64 -DSMALL_CELL_SIZE=64 $cflags"; } if ($OPTIONS{"debug"}) @@ -98,10 +98,10 @@ if ($OPTIONS{"amd64"}) } } +unlink("$outdir/$bin"); if ($OPTIONS{"clean"}) { `rm $outdir/*.o`; - `rm $outdir/$bin`; die("Project cleaned.\n"); } @@ -173,4 +173,5 @@ for ($i=0; $i<=$#CPP_SOURCE_FILES; $i++) } $gcc = "g++ $cflags -shared -lstdc++ -ldl -lm @LINK -o $outdir/$bin"; +print "$gcc\n"; `$gcc`; diff --git a/dlls/sockets/moduleconfig.h b/dlls/sockets/moduleconfig.h index 079245c6..336a525e 100755 --- a/dlls/sockets/moduleconfig.h +++ b/dlls/sockets/moduleconfig.h @@ -459,4 +459,5 @@ #endif // USE_METAMOD -#endif // __MODULECONFIG_H__ \ No newline at end of file +#endif // __MODULECONFIG_H__ + diff --git a/dlls/tfc/tfcx/CRank.h b/dlls/tfc/tfcx/CRank.h index daf62b3e..0fff54ea 100755 --- a/dlls/tfc/tfcx/CRank.h +++ b/dlls/tfc/tfcx/CRank.h @@ -110,4 +110,5 @@ public: }; -#endif \ No newline at end of file +#endif + diff --git a/dlls/tfc/tfcx/Makefile.pl b/dlls/tfc/tfcx/Makefile.pl index a811ee5f..5e23476c 100755 --- a/dlls/tfc/tfcx/Makefile.pl +++ b/dlls/tfc/tfcx/Makefile.pl @@ -72,7 +72,7 @@ if ($OPTIONS{"debug"}) if ($OPTIONS{"amd64"}) { - $cflags .= "-m64 -DSMALL_CELLSIZE=64 $cflags"; + $cflags .= " -m64 -DHAVE_I64 -DSMALL_CELL_SIZE=64 $cflags"; } if ($OPTIONS{"debug"}) @@ -98,10 +98,10 @@ if ($OPTIONS{"amd64"}) } } +unlink("$outdir/$bin"); if ($OPTIONS{"clean"}) { `rm $outdir/*.o`; - `rm $outdir/$bin`; die("Project cleaned.\n"); } @@ -173,4 +173,5 @@ for ($i=0; $i<=$#CPP_SOURCE_FILES; $i++) } $gcc = "g++ $cflags -shared -ldl -lm @LINK -o $outdir/$bin"; +print "$gcc\n"; `$gcc`; diff --git a/dlls/tfc/tfcx/moduleconfig.h b/dlls/tfc/tfcx/moduleconfig.h index eb79114a..1522852c 100755 --- a/dlls/tfc/tfcx/moduleconfig.h +++ b/dlls/tfc/tfcx/moduleconfig.h @@ -459,4 +459,5 @@ #endif // USE_METAMOD -#endif // __MODULECONFIG_H__ \ No newline at end of file +#endif // __MODULECONFIG_H__ + diff --git a/dlls/ts/tsx/CMisc.h b/dlls/ts/tsx/CMisc.h index fff275ad..5f21e401 100755 --- a/dlls/ts/tsx/CMisc.h +++ b/dlls/ts/tsx/CMisc.h @@ -148,4 +148,5 @@ public: void exec(int p1,int p2); }; -#endif // CMISC_H \ No newline at end of file +#endif // CMISC_H + diff --git a/dlls/ts/tsx/CRank.h b/dlls/ts/tsx/CRank.h index daf62b3e..0fff54ea 100755 --- a/dlls/ts/tsx/CRank.h +++ b/dlls/ts/tsx/CRank.h @@ -110,4 +110,5 @@ public: }; -#endif \ No newline at end of file +#endif + diff --git a/dlls/ts/tsx/Makefile.pl b/dlls/ts/tsx/Makefile.pl index df0b1883..da52dbe1 100755 --- a/dlls/ts/tsx/Makefile.pl +++ b/dlls/ts/tsx/Makefile.pl @@ -72,7 +72,7 @@ if ($OPTIONS{"debug"}) if ($OPTIONS{"amd64"}) { - $cflags .= "-m64 -DSMALL_CELLSIZE=64 $cflags"; + $cflags .= " -m64 -DHAVE_I64 -DSMALL_CELL_SIZE=64 $cflags"; } if ($OPTIONS{"debug"}) @@ -98,10 +98,10 @@ if ($OPTIONS{"amd64"}) } } +unlink("$outdir/$bin"); if ($OPTIONS{"clean"}) { `rm $outdir/*.o`; - `rm $outdir/$bin`; die("Project cleaned.\n"); } @@ -173,4 +173,5 @@ for ($i=0; $i<=$#CPP_SOURCE_FILES; $i++) } $gcc = "g++ $cflags -shared -ldl -lm @LINK -o $outdir/$bin"; +print "$gcc\n"; `$gcc`; diff --git a/dlls/ts/tsx/moduleconfig.h b/dlls/ts/tsx/moduleconfig.h index bb187737..b237005a 100755 --- a/dlls/ts/tsx/moduleconfig.h +++ b/dlls/ts/tsx/moduleconfig.h @@ -459,4 +459,5 @@ #endif // USE_METAMOD -#endif // __MODULECONFIG_H__ \ No newline at end of file +#endif // __MODULECONFIG_H__ +