d4708/source-engine
1
0
Fork 0
mirror of https://github.com/nillerusr/source-engine.git synced 2025-01-12 16:18:03 +00:00
Code Issues Projects Releases Wiki Activity

android: remove some jni functions, use APP_LIB_PATH instead of APP_DATA_PATH

Browse Source
This commit is contained in:
nillerusr 2022-06-19 17:42:55 +03:00
parent f8c6d23362
commit ff99055be1
4 changed files with 15 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
launcher/android.cpp
View File

@ -4,6 +4,7 @@
#ifdef ANDROID #ifdef ANDROID
#include <android/log.h> #include <android/log.h>
#include <SDL_version.h>
#define TAG "SRCENG" #define TAG "SRCENG"
#define PRIO ANDROID_LOG_DEBUG #define PRIO ANDROID_LOG_DEBUG
@ -69,18 +70,6 @@ int iLastArgs = 0;
#define LogPrintf(...) do { __android_log_print(PRIO, TAG, __VA_ARGS__); printf( __VA_ARGS__); } while( 0 ); #define LogPrintf(...) do { __android_log_print(PRIO, TAG, __VA_ARGS__); printf( __VA_ARGS__); } while( 0 );
#define DLLEXPORT extern "C" __attribute__((visibility("default"))) #define DLLEXPORT extern "C" __attribute__((visibility("default")))
DLLEXPORT void Java_com_valvesoftware_ValveActivity2_setDataDirectoryPath(JNIEnv *env, jclass *clazz, jstring path)
{
setenv( "APP_DATA_PATH", env->GetStringUTFChars(path, NULL), 1);
LogPrintf( "Java_com_valvesoftware_ValveActivity2_setDataDirectoryPath: %s", getenv("APP_DATA_PATH") );
}
DLLEXPORT void Java_com_valvesoftware_ValveActivity2_setGameDirectoryPath(JNIEnv *env, jclass *clazz, jstring path)
{
LogPrintf( "Java_com_valvesoftware_ValveActivity2_setGameDirectoryPath" );
setenv( "VALVE_GAME_PATH", env->GetStringUTFChars(path, NULL), 1 );
}
DLLEXPORT int Java_com_valvesoftware_ValveActivity2_setenv(JNIEnv *jenv, jclass *jclass, jstring env, jstring value, jint over) DLLEXPORT int Java_com_valvesoftware_ValveActivity2_setenv(JNIEnv *jenv, jclass *jclass, jstring env, jstring value, jint over)
{ {
LogPrintf( "Java_com_valvesoftware_ValveActivity2_setenv %s=%s", jenv->GetStringUTFChars(env, NULL), jenv->GetStringUTFChars(value, NULL) ); LogPrintf( "Java_com_valvesoftware_ValveActivity2_setenv %s=%s", jenv->GetStringUTFChars(env, NULL), jenv->GetStringUTFChars(value, NULL) );
@ -133,6 +122,10 @@ void SetLauncherArgs()
DLLEXPORT int LauncherMainAndroid( int argc, char **argv ) DLLEXPORT int LauncherMainAndroid( int argc, char **argv )
{ {
SDL_version ver;
SDL_GetVersion( &ver );
LogPrintf("SDL version: %d.%d.%d rev: %s\n", (int)ver.major, (int)ver.minor, (int)ver.patch, SDL_GetRevision());
SetLauncherArgs(); SetLauncherArgs();

8
public/filesystem_init.cpp
View File

@ -307,6 +307,9 @@ static bool Sys_GetExecutableName( char *out, int len )
bool FileSystem_GetExecutableDir( char *exedir, int exeDirLen ) bool FileSystem_GetExecutableDir( char *exedir, int exeDirLen )
{ {
#ifdef ANDROID
Q_snprintf( exedir, exeDirLen, "%s", getenv("APP_LIB_PATH") );
#else
exedir[0] = 0; exedir[0] = 0;
if ( s_bUseVProjectBinDir ) if ( s_bUseVProjectBinDir )
@ -341,11 +344,7 @@ bool FileSystem_GetExecutableDir( char *exedir, int exeDirLen )
Q_FixSlashes( exedir ); Q_FixSlashes( exedir );
#ifdef ANDROID
const char* libDir = "lib";
#else
const char* libDir = "bin"; const char* libDir = "bin";
#endif
// Return the bin directory as the executable dir if it's not in there // Return the bin directory as the executable dir if it's not in there
// because that's really where we're running from... // because that's really where we're running from...
@ -357,6 +356,7 @@ bool FileSystem_GetExecutableDir( char *exedir, int exeDirLen )
Q_strncat( exedir, libDir, exeDirLen, COPY_ALL_CHARACTERS ); Q_strncat( exedir, libDir, exeDirLen, COPY_ALL_CHARACTERS );
Q_FixSlashes( exedir ); Q_FixSlashes( exedir );
} }
#endif
return true; return true;
} }

4
public/materialsystem/imesh.h
View File

@ -1156,7 +1156,7 @@ inline void CVertexBuilder::FastAdvanceNVertices( int n )
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
inline void CVertexBuilder::FastVertex( const ModelVertexDX7_t &vertex ) inline void CVertexBuilder::FastVertex( const ModelVertexDX7_t &vertex )
{ {
#if defined(__arm__) || defined(__arm64__) #if defined(__arm__) || defined(__aarch64__)
FastVertexSSE( vertex ); FastVertexSSE( vertex );
#else #else
Assert( m_CompressionType == VERTEX_COMPRESSION_NONE ); // FIXME: support compressed verts if needed Assert( m_CompressionType == VERTEX_COMPRESSION_NONE ); // FIXME: support compressed verts if needed
@ -1326,7 +1326,7 @@ inline void CVertexBuilder::Fast4VerticesSSE(
inline void CVertexBuilder::FastVertex( const ModelVertexDX8_t &vertex ) inline void CVertexBuilder::FastVertex( const ModelVertexDX8_t &vertex )
{ {
#if defined(__arm__) || defined(__arm64__) #if defined(__arm__) || defined(__aarch64__)
FastVertexSSE( vertex ); FastVertexSSE( vertex );
#else #else
Assert( m_CompressionType == VERTEX_COMPRESSION_NONE ); // FIXME: support compressed verts if needed Assert( m_CompressionType == VERTEX_COMPRESSION_NONE ); // FIXME: support compressed verts if needed

6
tier1/interface.cpp
View File

@ -306,7 +306,7 @@ CSysModule *Sys_LoadModule( const char *pModuleName, Sys_Flags flags /* = SYS_NO
#ifdef ANDROID #ifdef ANDROID
struct stat statBuf; struct stat statBuf;
char *dataPath = getenv("APP_DATA_PATH"); char *libPath = getenv("APP_LIB_PATH");
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
@ -318,9 +318,9 @@ CSysModule *Sys_LoadModule( const char *pModuleName, Sys_Flags flags /* = SYS_NO
hDLL = Sys_LoadLibrary(szAbsoluteModuleName, flags); hDLL = Sys_LoadLibrary(szAbsoluteModuleName, flags);
} }
Q_snprintf(szAbsoluteModuleName, sizeof(szAbsoluteModuleName), "%s/lib/lib%s", dataPath ,pModuleName); Q_snprintf(szAbsoluteModuleName, sizeof(szAbsoluteModuleName), "%s/lib%s", libPath ,pModuleName);
if( stat(szAbsoluteModuleName, &statBuf) != 0 ) if( stat(szAbsoluteModuleName, &statBuf) != 0 )
Q_snprintf(szAbsoluteModuleName, sizeof(szAbsoluteModuleName), "%s/lib/%s", dataPath ,pModuleName); Q_snprintf(szAbsoluteModuleName, sizeof(szAbsoluteModuleName), "%s/%s", libPath ,pModuleName);
#else #else
#ifdef POSIX #ifdef POSIX
struct stat statBuf; struct stat statBuf;