expvintl/source-engine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tier1(android): add error message for library loading from mod apk

Browse Source
This commit is contained in:
nillerusr 2022-09-17 18:27:50 +03:00
parent 2dca8fd6c7
commit 5e9ce905f7
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tier1/interface.cpp
View File

@ -311,11 +311,19 @@ CSysModule *Sys_LoadModule( const char *pModuleName, Sys_Flags flags /* = SYS_NO
char *modLibPath = getenv("APP_MOD_LIB"); char *modLibPath = getenv("APP_MOD_LIB");
if( modLibPath && *modLibPath ) // first load library from mod launcher if( modLibPath && *modLibPath ) // first load library from mod launcher
{ {
bool bFound = true;
Q_snprintf(szAbsoluteModuleName, sizeof(szAbsoluteModuleName), "%s/lib%s", modLibPath, pModuleName); Q_snprintf(szAbsoluteModuleName, sizeof(szAbsoluteModuleName), "%s/lib%s", modLibPath, pModuleName);
if( stat(szAbsoluteModuleName, &statBuf) != 0 ) if( stat(szAbsoluteModuleName, &statBuf) != 0 )
{
Q_snprintf(szAbsoluteModuleName, sizeof(szAbsoluteModuleName), "%s/%s", modLibPath, pModuleName); Q_snprintf(szAbsoluteModuleName, sizeof(szAbsoluteModuleName), "%s/%s", modLibPath, pModuleName);
if( stat(szAbsoluteModuleName, &statBuf) != 0 )
bFound = false;
}
hDLL = Sys_LoadLibrary(szAbsoluteModuleName, flags); hDLL = Sys_LoadLibrary(szAbsoluteModuleName, flags);
if( !hDLL && bFound )
Error("Can't load mod library %s\n", szAbsoluteModuleName);
} }
Q_snprintf(szAbsoluteModuleName, sizeof(szAbsoluteModuleName), "%s/lib%s", libPath ,pModuleName); Q_snprintf(szAbsoluteModuleName, sizeof(szAbsoluteModuleName), "%s/lib%s", libPath ,pModuleName);

7
wscript
View File

@ -75,6 +75,7 @@ projects={
'vpklib', 'vpklib',
'vstdlib', 'vstdlib',
'vtf', 'vtf',
'utils/vtex',
'unicode' 'unicode'
], ],
'tests': [ 'tests': [
@ -500,12 +501,12 @@ def configure(conf):
for i in a: for i in a:
conf.check_cc(lib = i) conf.check_cc(lib = i)
conf.check(lib='libz', uselib_store='ZLIB') conf.check(lib='libz', uselib_store='ZLIB', define_name='USE_ZLIB')
# conf.check(lib='nvtc', uselib_store='NVTC') # conf.check(lib='nvtc', uselib_store='NVTC')
# conf.check(lib='ati_compress_mt_vc10', uselib_store='ATI_COMPRESS_MT_VC10') # conf.check(lib='ati_compress_mt_vc10', uselib_store='ATI_COMPRESS_MT_VC10')
conf.check(lib='SDL2', uselib_store='SDL2') conf.check(lib='SDL2', uselib_store='SDL2')
conf.check(lib='libjpeg', uselib_store='JPEG') conf.check(lib='libjpeg', uselib_store='JPEG', define_name='HAVE_JPEG')
conf.check(lib='libpng', uselib_store='PNG') conf.check(lib='libpng', uselib_store='PNG', define_name='HAVE_PNG')
conf.check(lib='d3dx9', uselib_store='D3DX9') conf.check(lib='d3dx9', uselib_store='D3DX9')
conf.check(lib='d3d9', uselib_store='D3D9') conf.check(lib='d3d9', uselib_store='D3D9')
conf.check(lib='dsound', uselib_store='DSOUND') conf.check(lib='dsound', uselib_store='DSOUND')