YGGverse/xash3d-fwgs
1
0
Fork 0
mirror of https://github.com/YGGverse/xash3d-fwgs.git synced 2025-01-30 16:54:29 +00:00
Code Issues Projects Releases Wiki Activity

engine: android: allow building dedicated on Android

Browse Source
This commit is contained in:
Alibek Omarov 2019-09-19 17:08:16 +03:00
parent b91e97ca53
commit 07aa9595c0
6 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engine/common/sys_con.c
View File

@ -162,7 +162,7 @@ void Sys_PrintLog( const char *pMsg )
time( &crt_time ); time( &crt_time );
crt_tm = localtime( &crt_time ); crt_tm = localtime( &crt_time );
#ifdef __ANDROID__ #if XASH_ANDROID && !XASH_DEDICATED
__android_log_print( ANDROID_LOG_DEBUG, "Xash", "%s", pMsg ); __android_log_print( ANDROID_LOG_DEBUG, "Xash", "%s", pMsg );
#endif #endif

4
engine/platform/android/android.c
View File

@ -13,7 +13,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
*/ */
#include "platform/platform.h" #include "platform/platform.h"
#if defined __ANDROID__ || 1 #if !defined(XASH_DEDICATED)
#include "input.h" #include "input.h"
#include "client.h" #include "client.h"
#include "sound.h" #include "sound.h"
@ -973,4 +973,4 @@ void Platform_RunEvents()
pthread_mutex_lock( &events.framemutex ); pthread_mutex_lock( &events.framemutex );
} }
#endif // __ANDROID__ #endif // XASH_DEDICATED

1
engine/platform/android/dlsym-weak.h
View File

@ -12,6 +12,7 @@ but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
*/ */
#pragma once
#ifndef DLSYM_WEAH_H #ifndef DLSYM_WEAH_H
#define DLSYM_WEAK_H #define DLSYM_WEAK_H

15
engine/platform/android/lib_android.c
View File

@ -12,8 +12,6 @@ but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
*/ */
#ifdef __ANDROID__
#include "common.h" #include "common.h"
#include "library.h" #include "library.h"
#include "filesystem.h" #include "filesystem.h"
@ -54,11 +52,12 @@ void *ANDROID_LoadLibrary( const char *dllname )
void *ANDROID_GetProcAddress( void *hInstance, const char *name ) void *ANDROID_GetProcAddress( void *hInstance, const char *name )
{ {
void *p = dlsym( hInstance, name ); void *p = dlsym( hInstance, name );
#ifndef XASH_64BIT
if( p ) return p; if( p ) return p;
return dlsym_weak( hInstance, name ); p = dlsym_weak( hInstance, name );
#endif // XASH_64BIT
return p;
} }
#endif // __ANDROID__

2
engine/platform/android/lib_android.h
View File

@ -13,7 +13,6 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
*/ */
#pragma once #pragma once
#ifdef __ANDROID__
#ifndef ANDROID_LIB_H #ifndef ANDROID_LIB_H
#define ANDROID_LIB_H #define ANDROID_LIB_H
@ -21,4 +20,3 @@ void *ANDROID_LoadLibrary( const char *dllname );
void *ANDROID_GetProcAddress( void *hInstance, const char *name ); void *ANDROID_GetProcAddress( void *hInstance, const char *name );
#endif // ANDROID_LIB_H #endif // ANDROID_LIB_H
#endif // __ANDROID__

2
engine/platform/android/vid_android.c
View File

@ -1,5 +1,5 @@
#include "platform/platform.h" #include "platform/platform.h"
#if defined XASH_VIDEO == VIDEO_ANDROID || 1 #if defined XASH_VIDEO == VIDEO_ANDROID
#include "input.h" #include "input.h"
#include "client.h" #include "client.h"
#include "filesystem.h" #include "filesystem.h"