H3cJP/source-engine
1
0
Fork 0
mirror of https://github.com/nillerusr/source-engine.git synced 2026-08-07 17:29:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into windows

Browse Source
This commit is contained in:
HappyDOGE
2022-07-27 12:58:56 +03:00
parent edbe1baceb a53fff833f
commit 90cd6e0e15
3089 changed files with 38639 additions and 844820 deletions
Download Patch File Download Diff File Expand all files Collapse all files
launcher/android.cpp
+20 -20
View File
@@ -2,6 +2,18 @@
#include <string.h>
#include <dlfcn.h>
#ifdef ANDROID
#include <android/log.h>
#include <SDL_version.h>
#define TAG "SRCENG"
#define PRIO ANDROID_LOG_DEBUG
#define LogPrintf(...) do { __android_log_print(PRIO, TAG, __VA_ARGS__); printf( __VA_ARGS__); } while( 0 );
#else
#define LogPrintf(...) printf(__VA_ARGS__)
#endif
typedef void (*t_set_getprocaddress)(void *(*new_proc_address)(const char *));
t_set_getprocaddress gl4es_set_getprocaddress;
@@ -18,13 +30,13 @@ void InitGL4ES()
void *lgl4es = dlopen("libgl4es.so", RTLD_LAZY);
if( !lgl4es )
{
printf("Failed to dlopen library libgl4es.so: %s\n", dlerror());
LogPrintf("Failed to dlopen library libgl4es.so: %s\n", dlerror());
}
void *lEGL = dlopen("libEGL.so", RTLD_LAZY);
if( !lEGL )
{
printf("Failed to dlopen library libEGL.so: %s\n", dlerror());
LogPrintf("Failed to dlopen library libEGL.so: %s\n", dlerror());
}
gl4es_set_getprocaddress = (t_set_getprocaddress)dlsym(lgl4es, "set_getprocaddress");
@@ -36,13 +48,11 @@ void InitGL4ES()
}
else
{
printf("Failed to call set_getprocaddress\n");
LogPrintf("Failed to call set_getprocaddress\n");
}
}
#ifdef ANDROID
#include <android/log.h>
#include <jni.h>
#include <stdlib.h>
#include <string.h>
@@ -60,18 +70,6 @@ int iLastArgs = 0;
#define LogPrintf(...) do { __android_log_print(PRIO, TAG, __VA_ARGS__); printf( __VA_ARGS__); } while( 0 );
#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)
{
LogPrintf( "Java_com_valvesoftware_ValveActivity2_setenv %s=%s", jenv->GetStringUTFChars(env, NULL), jenv->GetStringUTFChars(value, NULL) );
@@ -113,19 +111,21 @@ void SetLauncherArgs()
LogPrintf(binPath);
D(binPath);
D("-console");
A("-game", "hl2mp");
D("-nouserclip");
parseArgs(java_args);
D("-windowed");
D("-fullscreen");
D("-nosteam");
D("-insecure");
}
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();
launcher/launcher.cpp
+3
View File
@@ -765,6 +765,9 @@ bool CSourceAppSystemGroup::Create()
bool CSourceAppSystemGroup::PreInit()
{
if ( !CommandLine()->FindParm( "-nolog" ) )
DebugLogger()->Init("engine.log");
CreateInterfaceFn factory = GetFactory();
ConnectTier1Libraries( &factory, 1 );
ConVar_Register( );