From 5e9ce905f74f28491b4ac284a73dc94f0622d988 Mon Sep 17 00:00:00 2001 From: nillerusr Date: Sat, 17 Sep 2022 18:27:50 +0300 Subject: [PATCH] tier1(android): add error message for library loading from mod apk --- tier1/interface.cpp | 8 ++++++++ wscript | 7 ++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/tier1/interface.cpp b/tier1/interface.cpp index aa701096..c605845e 100644 --- a/tier1/interface.cpp +++ b/tier1/interface.cpp @@ -311,11 +311,19 @@ CSysModule *Sys_LoadModule( const char *pModuleName, Sys_Flags flags /* = SYS_NO char *modLibPath = getenv("APP_MOD_LIB"); if( modLibPath && *modLibPath ) // first load library from mod launcher { + bool bFound = true; Q_snprintf(szAbsoluteModuleName, sizeof(szAbsoluteModuleName), "%s/lib%s", modLibPath, pModuleName); if( stat(szAbsoluteModuleName, &statBuf) != 0 ) + { Q_snprintf(szAbsoluteModuleName, sizeof(szAbsoluteModuleName), "%s/%s", modLibPath, pModuleName); + if( stat(szAbsoluteModuleName, &statBuf) != 0 ) + bFound = false; + } 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); diff --git a/wscript b/wscript index 56f55fa6..989c8e0d 100644 --- a/wscript +++ b/wscript @@ -75,6 +75,7 @@ projects={ 'vpklib', 'vstdlib', 'vtf', + 'utils/vtex', 'unicode' ], 'tests': [ @@ -500,12 +501,12 @@ def configure(conf): for i in a: 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='ati_compress_mt_vc10', uselib_store='ATI_COMPRESS_MT_VC10') conf.check(lib='SDL2', uselib_store='SDL2') - conf.check(lib='libjpeg', uselib_store='JPEG') - conf.check(lib='libpng', uselib_store='PNG') + conf.check(lib='libjpeg', uselib_store='JPEG', define_name='HAVE_JPEG') + conf.check(lib='libpng', uselib_store='PNG', define_name='HAVE_PNG') conf.check(lib='d3dx9', uselib_store='D3DX9') conf.check(lib='d3d9', uselib_store='D3D9') conf.check(lib='dsound', uselib_store='DSOUND')