From 2a490d398cc02bf603275ba201b220fd104078a5 Mon Sep 17 00:00:00 2001 From: nillerusr Date: Thu, 2 Sep 2021 20:31:11 +0300 Subject: [PATCH] Revert "Fix code for Android" This reverts commit 7a91fbebd9bef4c1a47747ef71960d646ab90d8d. --- appframework/sdlmgr.cpp | 8 - common/freetype/config/ftconfig.h | 4 - filesystem/basefilesystem.cpp | 10 +- filesystem/filesystem_stdio.cpp | 4 - game/client/mumble.cpp | 2 - launcher/launcher.cpp | 319 +------------------- public/filesystem_init.cpp | 10 +- public/tier0/memoverride.cpp | 10 - scripts/waifulib/compiler_optimizations.pyc | Bin 4663 -> 0 bytes scripts/waifulib/fwgslib.pyc | Bin 5667 -> 0 bytes scripts/waifulib/xcompile.pyc | Bin 15030 -> 0 bytes tier0/assert_dialog.cpp | 2 +- tier0/dbg.cpp | 12 - tier0/platform_posix.cpp | 3 - tier0/threadtools.cpp | 5 - tier1/interface.cpp | 19 +- tier1/pathmatch.cpp | 7 +- tier1/strtools.cpp | 4 - togl/linuxwin/glentrypoints.cpp | 4 +- 19 files changed, 18 insertions(+), 405 deletions(-) delete mode 100644 scripts/waifulib/compiler_optimizations.pyc delete mode 100644 scripts/waifulib/fwgslib.pyc delete mode 100644 scripts/waifulib/xcompile.pyc diff --git a/appframework/sdlmgr.cpp b/appframework/sdlmgr.cpp index 74566da5..7234f4d1 100644 --- a/appframework/sdlmgr.cpp +++ b/appframework/sdlmgr.cpp @@ -482,14 +482,6 @@ InitReturnVal_t CSDLMgr::Init() fprintf(stderr, "SDL video target is '%s'\n", SDL_GetCurrentVideoDriver()); Msg("SDL video target is '%s'\n", SDL_GetCurrentVideoDriver()); - - SDL_version compiled; - SDL_version linked; - - SDL_VERSION(&compiled); - SDL_GetVersion(&linked); - - Msg("SDL compiled version: %d.%d.%d, linked: %d.%d.%d\n", compiled.major, compiled.minor, compiled.patch, linked.major, linked.minor, linked.patch); m_bForbidMouseGrab = true; if ( !CommandLine()->FindParm("-nomousegrab") && CommandLine()->FindParm("-mousegrab") ) diff --git a/common/freetype/config/ftconfig.h b/common/freetype/config/ftconfig.h index 5e19c414..8d4a074b 100644 --- a/common/freetype/config/ftconfig.h +++ b/common/freetype/config/ftconfig.h @@ -1,11 +1,7 @@ #ifndef __FTCONFIG_H__MULTILIB #define __FTCONFIG_H__MULTILIB -#ifdef ANDROID -#include -#else #include -#endif #if __WORDSIZE == 32 # include "ftconfig-32.h" diff --git a/filesystem/basefilesystem.cpp b/filesystem/basefilesystem.cpp index 4bd5dfbd..4423cb4c 100644 --- a/filesystem/basefilesystem.cpp +++ b/filesystem/basefilesystem.cpp @@ -3770,10 +3770,8 @@ bool CBaseFileSystem::IsFileWritable( char const *pFileName, char const *pPathID { #ifdef WIN32 if( buf.st_mode & _S_IWRITE ) -#elif defined (LINUX) && !defined (ANDROID) +#elif LINUX if( buf.st_mode & S_IWRITE ) -#elif ANDROID - if( buf.st_mode & S_IWUSR ) #else if( buf.st_mode & S_IWRITE ) #endif @@ -3794,10 +3792,8 @@ bool CBaseFileSystem::IsFileWritable( char const *pFileName, char const *pPathID { #ifdef WIN32 if ( buf.st_mode & _S_IWRITE ) -#elif defined (LINUX) && !defined (ANDROID) +#elif LINUX if ( buf.st_mode & S_IWRITE ) -#elif ANDROID - if ( buf.st_mode & S_IWUSR ) #else if ( buf.st_mode & S_IWRITE ) #endif @@ -3816,8 +3812,6 @@ bool CBaseFileSystem::SetFileWritable( char const *pFileName, bool writable, con #ifdef _WIN32 int pmode = writable ? ( _S_IWRITE | _S_IREAD ) : ( _S_IREAD ); -#elif ANDROID - int pmode = writable ? ( S_IWUSR | S_IRUSR ) : ( S_IRUSR ); #else int pmode = writable ? ( S_IWRITE | S_IREAD ) : ( S_IREAD ); #endif diff --git a/filesystem/filesystem_stdio.cpp b/filesystem/filesystem_stdio.cpp index 3bb7c5b5..43916fe3 100644 --- a/filesystem/filesystem_stdio.cpp +++ b/filesystem/filesystem_stdio.cpp @@ -972,11 +972,7 @@ void CStdioFile::FS_fclose() AUTO_LOCK( m_MutexLockedFD ); struct _stat buf; -#ifdef ANDROID - int fd = fileno( m_pFile ); // need to test this -#else int fd = fileno_unlocked( m_pFile ); -#endif fstat( fd, &buf ); fflush( m_pFile ); diff --git a/game/client/mumble.cpp b/game/client/mumble.cpp index 9d16acc5..8e58bc22 100644 --- a/game/client/mumble.cpp +++ b/game/client/mumble.cpp @@ -98,8 +98,6 @@ void CMumbleSystem::LevelInitPostEntity() g_hMapObject = NULL; return; } -#elif defined( ANDROID ) - return; // TODO: implement #elif defined( POSIX ) char memname[256]; V_sprintf_safe( memname, "/MumbleLink.%d", getuid() ); diff --git a/launcher/launcher.cpp b/launcher/launcher.cpp index 890b76e1..d34ae113 100644 --- a/launcher/launcher.cpp +++ b/launcher/launcher.cpp @@ -642,8 +642,6 @@ void ReportDirtyDiskNoMaterialSystem() //----------------------------------------------------------------------------- bool CSourceAppSystemGroup::Create() { - Warning( "CSourceAppSystemGroup::Create\n" ); - IFileSystem *pFileSystem = (IFileSystem*)FindSystem( FILESYSTEM_INTERFACE_VERSION ); pFileSystem->InstallDirtyDiskReportFunc( ReportDirtyDiskNoMaterialSystem ); @@ -676,18 +674,13 @@ bool CSourceAppSystemGroup::Create() { "", "" } // Required to terminate the list }; - Warning( "PreAddSystem\n" ); - #if defined( USE_SDL ) AddSystem( (IAppSystem *)CreateSDLMgr(), SDLMGR_INTERFACE_VERSION ); #endif - Warning( "PreAddSystems\n" ); - if ( !AddSystems( appSystems ) ) return false; - - Warning( "PostAddSystems\n" ); + // This will be NULL for games that don't support VR. That's ok. Just don't load the DLL AppModule_t sourceVRModule = LoadModule( "sourcevr" DLL_EXT_STRING ); @@ -764,8 +757,6 @@ bool CSourceAppSystemGroup::Create() bool CSourceAppSystemGroup::PreInit() { - Warning( "CSourceAppSystemGroup::PreInit\n" ); - CreateInterfaceFn factory = GetFactory(); ConnectTier1Libraries( &factory, 1 ); ConVar_Register( ); @@ -943,9 +934,7 @@ bool GrabSourceMutex() CRC32_ProcessBuffer( &gameCRC, (void *)pchGameParam, Q_strlen( pchGameParam ) ); CRC32_Final( &gameCRC ); -#ifdef ANDROID - return true; -#elif defined (LINUX) +#ifdef LINUX /* * Linux */ @@ -1177,306 +1166,6 @@ static const char *BuildCommand() return (const char *)build.Base(); } -#ifdef ANDROID -#include -#include "jni.h" - -char dataDir[512]; - -const char *LauncherArgv[512]; -char javaArgv[2048]; -char gameName[512]; -char startArgs[256][128]; -char language[1024] = "english"; -int iLastArgs = 0; -static int scr_width,scr_height; - -bool bClient_loaded = false; -bool bShowTouch = true; -void *libclient; - -static struct jnimethods_s -{ - jclass actcls; - JavaVM *vm; - JNIEnv *env; - jmethodID enableTextInput; -} jni; - - -DLL_EXPORT int Java_com_valvesoftware_ValveActivity2_setMainPackFilePath(JNIEnv *env, jclass *clazz, jstring str) -{ - __android_log_print( ANDROID_LOG_DEBUG, "SourceSDK2013", "Java_com_valvesoftware_ValveActivity_setMainPackFilePath" ); - return setenv( "VALVE_PAK0_PATH", env->GetStringUTFChars(str, NULL), 1 ); -} -DLL_EXPORT int Java_com_valvesoftware_ValveActivity2_setPatchPackFilePath(JNIEnv *env, jclass *clazz, jstring str) -{ - __android_log_print( ANDROID_LOG_DEBUG, "SourceSDK2013", "Java_com_valvesoftware_ValveActivity_setPatchPackFilePath" ); - return setenv( "VALVE_PAK1_PATH", env->GetStringUTFChars(str, NULL), 1 ); -} -DLL_EXPORT void Java_com_valvesoftware_ValveActivity2_setCacheDirectoryPath(JNIEnv *env, jclass *clazz, jstring str) -{ - __android_log_print( ANDROID_LOG_DEBUG, "SourceSDK2013", "Java_com_valvesoftware_ValveActivity_setCacheDirectoryPath" ); - //return setenv( "VALVE_CACHE_PATH", env->GetStringUTFChars(str, NULL), 1 ); -} -DLL_EXPORT void Java_com_valvesoftware_ValveActivity2_gpgsStart() -{ - __android_log_print( ANDROID_LOG_DEBUG, "SourceSDK2013", "Java_com_valvesoftware_ValveActivity_gpgsStart" ); -} -DLL_EXPORT void Java_com_valvesoftware_ValveActivity2_nativeOnActivityResult() -{ - __android_log_print( ANDROID_LOG_DEBUG, "SourceSDK2013", "Java_com_valvesoftware_ValveActivity_nativeOnActivityResult" ); -} - -DLL_EXPORT void Java_com_valvesoftware_ValveActivity2_setNativeLibPath(JNIEnv *env, jclass *clazz, jstring str) -{ - __android_log_print( ANDROID_LOG_DEBUG, "SourceSDK2013", "Java_com_valvesoftware_ValveActivity_setNativeLibPath" ); -// snprintf(dataDir, sizeof dataDir, env->GetStringUTFChars(str, NULL)); -} -DLL_EXPORT void Java_com_valvesoftware_ValveActivity2_setLanguage(JNIEnv *env, jclass *clazz, jstring str) -{ - snprintf(language, sizeof language, "%s", env->GetStringUTFChars(str, NULL)); - __android_log_print( ANDROID_LOG_DEBUG, "SourceSDK2013", "Java_com_valvesoftware_ValveActivity_setLanguage" ); -} -DLL_EXPORT int Java_com_valvesoftware_ValveActivity2_setDocumentDirectoryPath(JNIEnv *env, jclass *clazz, jstring str) -{ - __android_log_print( ANDROID_LOG_DEBUG, "SourceSDK2013", "Java_com_valvesoftware_ValveActivity_setDocumentDirectoryPath" ); - setenv( "HOME", env->GetStringUTFChars(str, NULL), 1); - return setenv( "VALVE_CACHE_PATH", env->GetStringUTFChars(str, NULL), 1 ); -} -DLL_EXPORT int Java_com_valvesoftware_ValveActivity2_setDropMip(int a1, int a2, signed int a3) -{ - __android_log_print( ANDROID_LOG_DEBUG, "SourceSDK2013", "Java_com_valvesoftware_ValveActivity_setDropMip" ); -} - -DLL_EXPORT int Java_com_valvesoftware_ValveActivity2_saveGame() -{ - __android_log_print( ANDROID_LOG_DEBUG, "SourceSDK2013", "Java_com_valvesoftware_ValveActivity_saveGame" ); -} - -DLL_EXPORT int Java_com_valvesoftware_ValveActivity2_setDataDirectoryPath(JNIEnv *env, jclass *clazz, jstring str) -{ - __android_log_print( ANDROID_LOG_DEBUG, "SourceSDK2013", "Java_com_valvesoftware_ValveActivity_setDataDirectoryPath" ); - snprintf(dataDir, sizeof dataDir, env->GetStringUTFChars(str, NULL)); -} - -DLL_EXPORT int Java_com_valvesoftware_ValveActivity2_setExtrasPackFilePath(JNIEnv *env, jclass *clazz, jstring str) -{ - __android_log_print( ANDROID_LOG_DEBUG, "SourceSDK2013", "Java_com_valvesoftware_ValveActivity2_setExtrasPackFilePath" ); - return setenv( "VALVE_PAK2_PATH", env->GetStringUTFChars(str, NULL), 1 ); -} - -DLL_EXPORT int Java_com_valvesoftware_ValveActivity2_setenv(JNIEnv *jenv, jclass *jclass, jstring env, jstring value, jint over) -{ - __android_log_print( ANDROID_LOG_DEBUG, "SourceSDK2013", "Java_com_valvesoftware_ValveActivity2_setenv %s=%s", jenv->GetStringUTFChars(env, NULL),jenv->GetStringUTFChars(value, NULL) ); - return setenv( jenv->GetStringUTFChars(env, NULL), jenv->GetStringUTFChars(value, NULL), over ); -} - -DLL_EXPORT int Java_com_valvesoftware_ValveActivity2_setGame(JNIEnv *jenv, jclass *jclass, jstring game) -{ - snprintf(gameName, sizeof dataDir, "-game %s", jenv->GetStringUTFChars(game, NULL)); - return setenv( "VALVE_MOD", jenv->GetStringUTFChars(game, NULL), 1); -} - -typedef void (*t_TouchEvent)(int finger, int x, int y, int act); -t_TouchEvent TouchEvent; - -DLL_EXPORT void clientLoaded( void ) -{ - bClient_loaded = true; - libclient = dlopen("libclient.so",0); - TouchEvent = (t_TouchEvent)dlsym(libclient, "TouchEvent"); - ((void (*)(bool, int, int))dlsym(libclient, "showTouch"))(bShowTouch, scr_width, scr_height); -} - -DLL_EXPORT void showKeyboard( int show ) -{ - jni.env->CallStaticVoidMethod( jni.actcls, jni.enableTextInput, show ); -} - -DLL_EXPORT void JNICALL Java_com_valvesoftware_ValveActivity2_showTouch(JNIEnv *env, jobject obj, jboolean show_touch, jint width, jint height) -{ - scr_width = width; - scr_height = height; - bShowTouch = show_touch; -} - -DLL_EXPORT void JNICALL Java_com_valvesoftware_ValveActivity2_TouchEvent(JNIEnv *env, jobject obj, jint fingerid, jint x, jint y, jint action) -{ - if( !bClient_loaded ) - return; - - TouchEvent( fingerid, x, y, action ); -} - -DLL_EXPORT const char* getSystemLanguage() -{ - return language; -} - -typedef void (*t_SDL_Android_Init)(JNIEnv* env, jclass cls); -t_SDL_Android_Init SDL_Android_Init; - -//typedef void *(*t_SDL_StartTextInput)(); -//t_SDL_StartTextInput SDL_StartTextInput; - -typedef void (*t_egl_init)(); -t_egl_init egl_init; - -bool bUseGL; - -void SetRenderer() -{ - if ( bUseGL ) - { - //setenv("USE_BIG_GL", "1", 1); - } - else - { - setenv("REGAL_LOG", "0", 1); - setenv("REGAL_LOG_ERROR", "0", 1); - setenv("REGAL_LOG_WARNING", "0", 1); - setenv("REGAL_LOG_INFO", "0", 1); - setenv("REGAL_LOG_HTTP", "0", 1); - setenv("REGAL_LOG_JSON", "0", 1); - setenv("REGAL_LOG_CALLBACK", "0", 1); - setenv("REGAL_LOG_ONCE", "0", 1); - setenv("REGAL_LOG_POINTERS", "0", 1); - setenv("REGAL_LOG_THREAD", "0", 1); - setenv("REGAL_LOG_PROCESS", "0", 1); - setenv("REGAL_LOG_ALL", "0", 1); - setenv("REGAL_DEBUG", "0", 1); - setenv("REGAL_ERROR", "0", 1); - setenv("REGAL_LOG_FILE", "/dev/null", 1); - setenv("REGAL_EMU_SO", "0", 1); - setenv("REGAL_THREAD_LOCKING", "0", 1); - setenv("REGAL_FORCE_ES2_PROFILE", "1", 1); - setenv("REGAL_SYS_GLX", "0", 1); - setenv("REGAL_SYS_ES2", "1", 1); - setenv("REGAL_SYS_EGL", "1", 1); - setenv("REGAL_SYS_GL", "0", 1); - setenv("REGAL_GL_VERSION", "2.1", 1); - setenv("REGAL_GL_EXTENSIONS", "GL_EXT_framebuffer_object GL_EXT_framebuffer_blit GL_OES_mapbuffer GL_EXT_texture_sRGB_decode GL_EXT_texture_compression_s3tc GL_EXT_texture_compression_dxt1", 1); - } -} - -void SetArg( const char *arg ) -{ - char *pch; - char str[1024]; - strncpy( str, arg, sizeof str ); - pch = strtok (str," "); - while (pch != NULL) - { - strncpy( startArgs[iLastArgs], pch, sizeof startArgs[0] ); - LauncherArgv[iLastArgs] = startArgs[iLastArgs]; - iLastArgs++; - pch = strtok (NULL, " "); - } -} - -DLL_EXPORT int Java_com_valvesoftware_ValveActivity2_setArgs(JNIEnv *env, jclass *clazz, jstring str) -{ - snprintf( javaArgv, sizeof javaArgv, env->GetStringUTFChars(str, NULL) ); -} - -void SetStartArgs() -{ - char lang[2048]; - snprintf(lang, sizeof lang, "-language %s +cc_lang %s", language, language); - - SetArg(dataDir); - SetArg(lang); - SetArg(gameName); - SetArg(javaArgv); - SetArg("-window " - "-nosteam " - "-nouserclip " - "+sv_unlockedchapters 99 " - "+mat_queue_mode 2 " - "-ignoredxsupportcfg " - "-regal " - "+gl_rt_forcergba 1 " - "+mat_antialias 1 " - "-mat_antialias 1 " - "+r_flashlightdepthtexture 1 " - "+gl_dropmips 1 " - "-insecure"); - - if( bUseGL ) - SetArg("-userclip " - "-gl_disablesamplerobjects " -// "-egl " - "+gl_enabletexsubimage 1 " - "+gl_blitmode 1 " - "+gl_supportMapBuffer 0 " - "-gl_separatedepthstencil 0 " - "-gl_nodepthtexture 0 " - "+r_flashlight_version2 0 " - "+gl_emurgba16 0 " - "+gl_emunooverwrite 0"); - else - SetArg("-nouserclip " - "-gl_disablesamplerobjects " - "+gl_enabletexsubimage 0 " - "+mat_reducefillrate 1 " - "+gl_blitmode 1 " - "+gl_supportMapBuffer 1 " - "-gl_separatedepthstencil 0 "// default is 1 - "-gl_nodepthtexture 1 " - "+r_flashlight_version2 1 " - "+gl_emurgba16 1 " - "+gl_emunooverwrite 1"); -} - -int LauncherMain( int argc, char **argv ); - -DLL_EXPORT int SDL_main() -{ - // init sdl - void *sdlHandle = dlopen("libSDL2.so", 0); - - SDL_Android_Init = (t_SDL_Android_Init)dlsym(sdlHandle, "SDL_Android_Init"); - SDL_Android_Init(env, cls); - - //SDL_StartTextInput = (t_SDL_StartTextInput)dlsym(sdlHandle, "SDL_StartTextInput"); - //SDL_StartTextInput(); - - chdir(dataDir); - getcwd(dataDir, sizeof dataDir); - setenv( "VALVE_GAME_PATH", dataDir, 1 ); - snprintf(dataDir, sizeof dataDir, "%s/hl2_linux", dataDir); - - bUseGL = false; - - SetRenderer(); - SetStartArgs(); - - void *engineHandle = dlopen("libengine.so", 0); - void *launcherHandle = dlopen("liblauncher.so", 0); - -#ifdef GL4ES - - void *glHandle = dlopen("libRegal.so", 0); - egl_init = (t_egl_init)dlsym(glHandle, "egl_init"); - if( egl_init ) - egl_init(); -#endif - - jni.env = env; - jni.actcls = env->FindClass("org/libsdl/app/SDLActivity"); - jni.enableTextInput = env->GetStaticMethodID(jni.actcls, "showKeyboard", "(I)V"); - - LauncherMain(iLastArgs, LauncherArgv); - - dlclose(launcherHandle); - dlclose(engineHandle); - - return 0; -} - -#endif - //----------------------------------------------------------------------------- // Purpose: The real entry point for the application // Input : hInstance - @@ -1486,7 +1175,7 @@ DLL_EXPORT int SDL_main() // Output : int APIENTRY //----------------------------------------------------------------------------- #ifdef WIN32 -extern "C" __declspec(DLL_EXPORT) int LauncherMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow ) +extern "C" __declspec(dllexport) int LauncherMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow ) #else DLL_EXPORT int LauncherMain( int argc, char **argv ) #endif @@ -1540,7 +1229,7 @@ DLL_EXPORT int LauncherMain( int argc, char **argv ) { return -1; } - + const char *filename; #ifdef WIN32 CommandLine()->CreateCmdLine( IsPC() ? VCRHook_GetCommandLine() : lpCmdLine ); diff --git a/public/filesystem_init.cpp b/public/filesystem_init.cpp index 10006487..d6126578 100644 --- a/public/filesystem_init.cpp +++ b/public/filesystem_init.cpp @@ -341,20 +341,14 @@ bool FileSystem_GetExecutableDir( char *exedir, int exeDirLen ) Q_FixSlashes( exedir ); -#ifdef ANDROID - const char* libDir = "lib"; -#else - const char* libDir = "bin"; -#endif - // Return the bin directory as the executable dir if it's not in there // because that's really where we're running from... char ext[MAX_PATH]; Q_StrRight( exedir, 4, ext, sizeof( ext ) ); - if ( ext[0] != CORRECT_PATH_SEPARATOR || Q_stricmp( ext+1, libDir ) != 0 ) + if ( ext[0] != CORRECT_PATH_SEPARATOR || Q_stricmp( ext+1, "bin" ) != 0 ) { Q_strncat( exedir, CORRECT_PATH_SEPARATOR_S, exeDirLen, COPY_ALL_CHARACTERS ); - Q_strncat( exedir, libDir, exeDirLen, COPY_ALL_CHARACTERS ); + Q_strncat( exedir, "bin", exeDirLen, COPY_ALL_CHARACTERS ); Q_FixSlashes( exedir ); } diff --git a/public/tier0/memoverride.cpp b/public/tier0/memoverride.cpp index c0f8e2af..925f9d2a 100644 --- a/public/tier0/memoverride.cpp +++ b/public/tier0/memoverride.cpp @@ -392,8 +392,6 @@ extern "C" #ifndef NO_MEMOVERRIDE_NEW_DELETE #ifdef OSX void *__cdecl operator new( size_t nSize ) throw (std::bad_alloc) -#elif ANDROID -void *__cdecl operator new( size_t nSize ) throw (std::bad_alloc) #else void *__cdecl operator new( size_t nSize ) #endif @@ -408,8 +406,6 @@ void *__cdecl operator new( size_t nSize, int nBlockUse, const char *pFileName, #ifdef OSX void __cdecl operator delete( void *pMem ) throw() -#elif ANDROID -void __cdecl operator delete( void *pMem ) throw() #else void __cdecl operator delete( void *pMem ) #endif @@ -419,8 +415,6 @@ void __cdecl operator delete( void *pMem ) #ifdef OSX void operator delete(void*pMem, std::size_t) -#elif ANDROID -void operator delete(void*pMem, std::size_t) #else void operator delete(void*pMem, std::size_t) throw() #endif @@ -430,8 +424,6 @@ void operator delete(void*pMem, std::size_t) throw() #ifdef OSX void *__cdecl operator new[]( size_t nSize ) throw (std::bad_alloc) -#elif ANDROID -void *__cdecl operator new[]( size_t nSize ) throw (std::bad_alloc) #else void *__cdecl operator new[]( size_t nSize ) #endif @@ -446,8 +438,6 @@ void *__cdecl operator new[] ( size_t nSize, int nBlockUse, const char *pFileNam #ifdef OSX void __cdecl operator delete[]( void *pMem ) throw() -#elif ANDROID -void __cdecl operator delete[]( void *pMem ) throw() #else void __cdecl operator delete[]( void *pMem ) #endif diff --git a/scripts/waifulib/compiler_optimizations.pyc b/scripts/waifulib/compiler_optimizations.pyc deleted file mode 100644 index a672032de5ab423ba9248a7aee708fade9fe8a12..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4663 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%0D5QQRSbM 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 Y #endif -#if defined( LINUX ) || defined( USE_SDL ) +#if defined( USE_SDL ) // We lazily load the SDL shared object, and only reference functions if it's // available, so this can be included on the dedicated server too. diff --git a/tier0/dbg.cpp b/tier0/dbg.cpp index 9bbe1348..ce01801f 100644 --- a/tier0/dbg.cpp +++ b/tier0/dbg.cpp @@ -31,10 +31,6 @@ #include "xbox/xbox_console.h" #endif -#ifdef ANDROID -#include -#endif - #include "tier0/etwprof.h" #ifndef STEAM @@ -317,10 +313,6 @@ static SpewRetval_t _SpewMessage( SpewType_t spewType, const char *pGroupName, i ret = s_SpewOutputFunc( spewType, pTempBuffer ); g_pSpewInfo = (int)NULL; -#ifdef ANDROID - __android_log_print( ANDROID_LOG_INFO, "SRCENGINE", "%s", pTempBuffer ); -#endif - switch (ret) { // Asserts put the break into the macro so it occurs in the right place @@ -911,10 +903,6 @@ void COM_TimestampedLog( char const *fmt, ... ) XBX_rTimeStampLog( curStamp, string ); #endif -#ifdef ANDROID - __android_log_print( ANDROID_LOG_INFO, "SRCENGINE", "%s", string ); -#endif - if ( IsPC() ) { // If ETW profiling is enabled then do it only. diff --git a/tier0/platform_posix.cpp b/tier0/platform_posix.cpp index 9a12bc3b..ba2783a5 100644 --- a/tier0/platform_posix.cpp +++ b/tier0/platform_posix.cpp @@ -28,9 +28,6 @@ #include #include #endif -#ifdef ANDROID -#include -#endif #include "tier0/memdbgon.h" // Benchmark mode uses this heavy-handed method diff --git a/tier0/threadtools.cpp b/tier0/threadtools.cpp index 99da9d66..caafef6c 100644 --- a/tier0/threadtools.cpp +++ b/tier0/threadtools.cpp @@ -23,13 +23,8 @@ #elif defined(POSIX) #if !defined(OSX) -#if defined(ANDROID) - #include - #include -#else #include #include -#endif #define sem_unlink( arg ) #define OS_TO_PTHREAD(x) (x) #else diff --git a/tier1/interface.cpp b/tier1/interface.cpp index 45ba5c90..3c91cc30 100644 --- a/tier1/interface.cpp +++ b/tier1/interface.cpp @@ -304,26 +304,15 @@ CSysModule *Sys_LoadModule( const char *pModuleName, Sys_Flags flags /* = SYS_NO #ifdef POSIX struct stat statBuf; -#ifdef ANDROID - Q_snprintf(szModuleName, sizeof(szModuleName), "lib/lib%s", pModuleName); -#else Q_snprintf(szModuleName, sizeof(szModuleName), "bin/lib%s", pModuleName); -#endif bUseLibPrefix |= stat(szModuleName, &statBuf) == 0; #endif -#ifdef ANDROID - char* szModulePath = "%s/lib/lib%s"; - if (!bUseLibPrefix) - szModulePath = "%s/lib/%s"; -#else - char* szModulePath = "%s/bin/lib%s"; - if (!bUseLibPrefix) - szModulePath = "%s/bin/%s"; -#endif + if( bUseLibPrefix ) + Q_snprintf( szAbsoluteModuleName, sizeof(szAbsoluteModuleName), "%s/bin/lib%s", szCwd, pModuleName ); + else + Q_snprintf( szAbsoluteModuleName, sizeof(szAbsoluteModuleName), "%s/bin/%s", szCwd, pModuleName ); - Q_snprintf( szAbsoluteModuleName, sizeof(szAbsoluteModuleName), szModulePath, szCwd, pModuleName ); - hDLL = Sys_LoadLibrary( szAbsoluteModuleName, flags ); } diff --git a/tier1/pathmatch.cpp b/tier1/pathmatch.cpp index 8e439dfe..bd8d3cbd 100644 --- a/tier1/pathmatch.cpp +++ b/tier1/pathmatch.cpp @@ -750,7 +750,7 @@ extern "C" { return CALL(freopen)( mpath, mode, stream ); } -#ifndef ANDROID + WRAP(fopen, FILE *, const char *path, const char *mode) { // if mode does not have w, a, or +, it's open for read. @@ -788,7 +788,7 @@ extern "C" { { return __wrap_open( pathname, O_CREAT|O_WRONLY|O_TRUNC, mode ); } -#endif + int __wrap_access(const char *pathname, int mode) { return __real_access( CWrap( pathname, false ), mode ); @@ -815,7 +815,6 @@ extern "C" { { return CALL(opendir)( CWrap( name, false ) ); } -#ifndef ANDROID WRAP(__xstat, int, int __ver, __const char *__filename, struct stat *__stat_buf) { @@ -836,7 +835,7 @@ extern "C" { { return CALL(__lxstat64)( __ver, CWrap( __filename, false), __stat_buf ); } -#endif + WRAP(chmod, int, const char *path, mode_t mode) { return CALL(chmod)( CWrap( path, false), mode ); diff --git a/tier1/strtools.cpp b/tier1/strtools.cpp index 09a95cba..cfef6b13 100644 --- a/tier1/strtools.cpp +++ b/tier1/strtools.cpp @@ -47,11 +47,7 @@ #include #ifdef POSIX -#ifdef ANDROID -#include <../thirdparty/libiconv-1.14/include/iconv.h> -#else #include -#endif #include #include #include diff --git a/togl/linuxwin/glentrypoints.cpp b/togl/linuxwin/glentrypoints.cpp index fad300d7..25e49ab3 100644 --- a/togl/linuxwin/glentrypoints.cpp +++ b/togl/linuxwin/glentrypoints.cpp @@ -43,7 +43,7 @@ #include "tier1.h" #include "tier2/tier2.h" -#if defined(_LINUX) && !defined(__ANDROID__) +#ifdef _LINUX #include #endif @@ -296,7 +296,7 @@ static bool CheckOpenGLExtension_internal(const char *ext, const int coremajor, return false; } } -#elif !defined ( OSX ) && !defined( __ANDROID__ ) +#elif !defined ( OSX ) if (!ptr) { static CDynamicFunctionOpenGL< true, Display *( APIENTRY *)( ), Display* > glXGetCurrentDisplay("glXGetCurrentDisplay");