Flummi/amxmodx
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update modules paths

Browse Source
This commit is contained in:
xPaw 2015-03-13 15:23:05 +02:00
parent e09f434ed8
commit fddebce313
4 changed files with 41 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
AMBuildScript
View File

@ -373,31 +373,31 @@ builder.RunBuildScripts(
'amxmodx/AMBuilder', 'amxmodx/AMBuilder',
'compiler/amxxpc/AMBuilder', 'compiler/amxxpc/AMBuilder',
'compiler/libpc300/AMBuilder', 'compiler/libpc300/AMBuilder',
'dlls/cstrike/cstrike/AMBuilder', 'modules/cstrike/cstrike/AMBuilder',
'dlls/cstrike/csx/AMBuilder', 'modules/cstrike/csx/AMBuilder',
'dlls/dod/dodfun/AMBuilder', 'modules/dod/dodfun/AMBuilder',
'dlls/dod/dodx/AMBuilder', 'modules/dod/dodx/AMBuilder',
'dlls/engine/AMBuilder', 'modules/engine/AMBuilder',
'dlls/fakemeta/AMBuilder', 'modules/fakemeta/AMBuilder',
'dlls/fun/AMBuilder', 'modules/fun/AMBuilder',
'dlls/geoip/AMBuilder', 'modules/geoip/AMBuilder',
'dlls/hamsandwich/AMBuilder', 'modules/hamsandwich/AMBuilder',
'dlls/mysqlx/AMBuilder', 'modules/mysqlx/AMBuilder',
'dlls/ns/AMBuilder', 'modules/ns/AMBuilder',
'dlls/nvault/AMBuilder', 'modules/nvault/AMBuilder',
'dlls/regex/AMBuilder', 'modules/regex/AMBuilder',
'dlls/sockets/AMBuilder', 'modules/sockets/AMBuilder',
'dlls/sqlite/AMBuilder', 'modules/sqlite/AMBuilder',
'dlls/tfcx/AMBuilder', 'modules/tfcx/AMBuilder',
'dlls/ts/tsfun/AMBuilder', 'modules/ts/tsfun/AMBuilder',
'dlls/ts/tsx/AMBuilder', 'modules/ts/tsx/AMBuilder',
], ],
{ 'AMXX': AMXX } { 'AMXX': AMXX }
) )
# The csstats.dat reader is Windows-only. # The csstats.dat reader is Windows-only.
if builder.target_platform == 'windows': if builder.target_platform == 'windows':
builder.RunScript('dlls/cstrike/csx/WinCSX/AMBuilder', { 'AMXX': AMXX }) builder.RunScript('modules/cstrike/csx/WinCSX/AMBuilder', { 'AMXX': AMXX })
if builder.backend == 'amb2': if builder.backend == 'amb2':
builder.RunBuildScripts([ builder.RunBuildScripts([

38
amxmodx/msvc12/amxmodx_mm.sln
View File

@ -7,43 +7,43 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "amxmodx_mm", "amxmodx_mm.vc
EndProject EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Modules", "Modules", "{1A75873D-E05D-4F07-A4E2-28DC1BB03226}" Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Modules", "Modules", "{1A75873D-E05D-4F07-A4E2-28DC1BB03226}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cstrike", "..\..\dlls\cstrike\cstrike\msvc12\cstrike.vcxproj", "{AB148B92-4F47-42E6-8268-AB4E588EC6A2}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cstrike", "..\..\modules\cstrike\cstrike\msvc12\cstrike.vcxproj", "{AB148B92-4F47-42E6-8268-AB4E588EC6A2}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "csx", "..\..\dlls\cstrike\csx\msvc12\csx.vcxproj", "{1DC4A99A-F23F-4AAE-881C-79D157C91155}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "csx", "..\..\modules\cstrike\csx\msvc12\csx.vcxproj", "{1DC4A99A-F23F-4AAE-881C-79D157C91155}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinCSX", "..\..\dlls\cstrike\csx\WinCSX\msvc12\WinCSX.vcxproj", "{39A1E5DD-81A1-441D-B99A-E50A01DB05D7}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinCSX", "..\..\modules\cstrike\csx\WinCSX\msvc12\WinCSX.vcxproj", "{39A1E5DD-81A1-441D-B99A-E50A01DB05D7}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dodfun", "..\..\dlls\dod\dodfun\msvc12\dodfun.vcxproj", "{2742C607-9FAB-47B3-8A13-E999BC6FDB54}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dodfun", "..\..\modules\dod\dodfun\msvc12\dodfun.vcxproj", "{2742C607-9FAB-47B3-8A13-E999BC6FDB54}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dodx", "..\..\dlls\dod\dodx\msvc12\dodx.vcxproj", "{9008A886-2DD0-443C-B468-AD84868D89B0}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dodx", "..\..\modules\dod\dodx\msvc12\dodx.vcxproj", "{9008A886-2DD0-443C-B468-AD84868D89B0}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "engine", "..\..\dlls\engine\msvc12\engine.vcxproj", "{B3F4467B-6148-4EBF-B897-168D81CF8D9B}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "engine", "..\..\modules\engine\msvc12\engine.vcxproj", "{B3F4467B-6148-4EBF-B897-168D81CF8D9B}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fakemeta", "..\..\dlls\fakemeta\msvc12\fakemeta.vcxproj", "{5E393C37-22F2-4CA2-9022-6400DC582447}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fakemeta", "..\..\modules\fakemeta\msvc12\fakemeta.vcxproj", "{5E393C37-22F2-4CA2-9022-6400DC582447}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fun", "..\..\dlls\fun\msvc12\fun.vcxproj", "{43B95C78-8D1A-4D12-B668-2520B38E1DA3}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fun", "..\..\modules\fun\msvc12\fun.vcxproj", "{43B95C78-8D1A-4D12-B668-2520B38E1DA3}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "geoip", "..\..\dlls\geoip\msvc12\geoip.vcxproj", "{036FA046-A6BF-4D80-8986-71FDD1528B55}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "geoip", "..\..\modules\geoip\msvc12\geoip.vcxproj", "{036FA046-A6BF-4D80-8986-71FDD1528B55}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hamsandwich", "..\..\dlls\hamsandwich\msvc12\hamsandwich.vcxproj", "{A8B3717F-2663-4099-AE96-AF5B7266FDA8}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hamsandwich", "..\..\modules\hamsandwich\msvc12\hamsandwich.vcxproj", "{A8B3717F-2663-4099-AE96-AF5B7266FDA8}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mysqlx", "..\..\dlls\mysqlx\msvc12\mysqlx.vcxproj", "{7877D370-E48E-4A85-8EE4-131863A5B09F}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mysqlx", "..\..\modules\mysqlx\msvc12\mysqlx.vcxproj", "{7877D370-E48E-4A85-8EE4-131863A5B09F}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ns", "..\..\dlls\ns\msvc12\ns.vcxproj", "{5B5DEFD0-28ED-4D0E-A1B0-50F9304A65DF}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ns", "..\..\modules\ns\msvc12\ns.vcxproj", "{5B5DEFD0-28ED-4D0E-A1B0-50F9304A65DF}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nvault", "..\..\dlls\nvault\msvc12\nvault.vcxproj", "{E2827EDF-F83F-4D54-8FD1-F47BA1E4D328}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nvault", "..\..\modules\nvault\msvc12\nvault.vcxproj", "{E2827EDF-F83F-4D54-8FD1-F47BA1E4D328}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "regex", "..\..\dlls\regex\msvc12\regex.vcxproj", "{1D4E991A-7EC1-43C5-90FC-DC9D713052D8}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "regex", "..\..\modules\regex\msvc12\regex.vcxproj", "{1D4E991A-7EC1-43C5-90FC-DC9D713052D8}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sockets", "..\..\dlls\sockets\msvc12\sockets.vcxproj", "{F15BBA96-2F66-44BB-9DDF-D91AE6D33AE7}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sockets", "..\..\modules\sockets\msvc12\sockets.vcxproj", "{F15BBA96-2F66-44BB-9DDF-D91AE6D33AE7}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sqlite", "..\..\dlls\sqlite\msvc12\sqlite.vcxproj", "{4FDFD106-7163-44F0-85C4-9FAFECD14973}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sqlite", "..\..\modules\sqlite\msvc12\sqlite.vcxproj", "{4FDFD106-7163-44F0-85C4-9FAFECD14973}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tfcx", "..\..\dlls\tfcx\msvc12\tfcx.vcxproj", "{87519113-8E9D-4C6F-BA1F-55F4D8829E83}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tfcx", "..\..\modules\tfcx\msvc12\tfcx.vcxproj", "{87519113-8E9D-4C6F-BA1F-55F4D8829E83}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tsfun", "..\..\dlls\ts\tsfun\msvc12\tsfun.vcxproj", "{9036672C-71DB-4DC9-90CC-B14C02465497}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tsfun", "..\..\modules\ts\tsfun\msvc12\tsfun.vcxproj", "{9036672C-71DB-4DC9-90CC-B14C02465497}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tsx", "..\..\dlls\ts\tsx\msvc12\tsx.vcxproj", "{7F18E00C-6271-4CAB-B18A-746BE3EC68E7}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tsx", "..\..\modules\ts\tsx\msvc12\tsx.vcxproj", "{7F18E00C-6271-4CAB-B18A-746BE3EC68E7}"
EndProject EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Compiler", "Compiler", "{0BB61E37-4EA5-4B18-A164-6CB4810E50F4}" Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Compiler", "Compiler", "{0BB61E37-4EA5-4B18-A164-6CB4810E50F4}"
EndProject EndProject

4
modules/dod/dodfun/moduleconfig.cpp
View File

@ -233,8 +233,8 @@ void SetModel_Post(edict_t *e, const char *m) {
w_id = newNade ? DODW_STICKGRENADE : DODW_STICKGRENADE_EX; w_id = newNade ? DODW_STICKGRENADE : DODW_STICKGRENADE_EX;
} else if(m[9]=='m' && m[10]=='i') { // w_mills.mdl (British) } else if(m[9]=='m' && m[10]=='i') { // w_mills.mdl (British)
w_id = newNade ? DODW_MILLS_BOMB : DODW_HANDGRENADE_EX; w_id = newNade ? DODW_MILLS_BOMB : DODW_HANDGRENADE_EX;
// A mills_ex weapon should be added in dlls/dod/dodfun/CMisc.h, plugins/include/dodconst.inc, // A mills_ex weapon should be added in modules/dod/dodfun/CMisc.h, plugins/include/dodconst.inc,
// and probably dlls/dod/dodx/NBase.cpp. The DODMAX_WEAPONS define should be updated too. // and probably modules/dod/dodx/NBase.cpp. The DODMAX_WEAPONS define should be updated too.
} }
if(!w_id) { // Fail-safe, just in case.. if(!w_id) { // Fail-safe, just in case..

2
support/PackageScript
View File

@ -311,7 +311,7 @@ for filename in scripting_files:
# Copy weird things. # Copy weird things.
weirdfiles = [ weirdfiles = [
('dlls/geoip/GeoLite2-Country.mmdb', 'base/addons/amxmodx/data'), ('modules/geoip/GeoLite2-Country.mmdb', 'base/addons/amxmodx/data'),
('plugins/esf/ESF_mod_tutorial.txt', 'esf/addons/amxmodx/scripting'), ('plugins/esf/ESF_mod_tutorial.txt', 'esf/addons/amxmodx/scripting'),
] ]