teambeef/jkxr
0
0
Fork 0
mirror of https://github.com/DrBeef/JKXR.git synced 2024-11-25 13:31:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

can now finally see the menu!

Browse source
This commit is contained in:
Simon 2022-09-23 21:40:35 +01:00
parent 8c62569139
commit 9627464541
2 changed files with 9 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Projects/Android/jni/OpenJK/Android_gles.mk
View file

@ -16,7 +16,7 @@ LOCAL_LDLIBS := $(JK3_BASE_LDLIBS)
LOCAL_LDLIBS += -lGLESv3 -landroid -lEGL -ldl -llog LOCAL_LDLIBS += -lGLESv3 -landroid -lEGL -ldl -llog
LOCAL_STATIC_LIBRARIES := libpng libjpeg LOCAL_STATIC_LIBRARIES := libpng libjpeg
LOCAL_SHARED_LIBRARIES := gl4es # LOCAL_SHARED_LIBRARIES := gl4es
LOCAL_C_INCLUDES := $(JK3_BASE_C_INCLUDES) $(SUPPORT_LIBS)/libpng $(TOP_DIR) $(SPDir)/rd-vanilla $(SPDir)/rd-common LOCAL_C_INCLUDES := $(JK3_BASE_C_INCLUDES) $(SUPPORT_LIBS)/libpng $(TOP_DIR) $(SPDir)/rd-vanilla $(SPDir)/rd-common

28
Projects/Android/jni/OpenJK/code/android/android_window.cpp
View file

@ -34,9 +34,6 @@ enum rserr_t
RSERR_UNKNOWN RSERR_UNKNOWN
}; };
static float displayAspect;
cvar_t *r_sdlDriver;
cvar_t *r_allowSoftwareGL; cvar_t *r_allowSoftwareGL;
// Window cvars // Window cvars
@ -155,7 +152,6 @@ window_t WIN_Init( const windowDesc_t *windowDesc, glconfig_t *glConfig )
Cmd_AddCommand("modelist", R_ModeList_f); Cmd_AddCommand("modelist", R_ModeList_f);
Cmd_AddCommand("minimize", GLimp_Minimize); Cmd_AddCommand("minimize", GLimp_Minimize);
r_sdlDriver = Cvar_Get( "r_sdlDriver", "", CVAR_ROM );
r_allowSoftwareGL = Cvar_Get( "r_allowSoftwareGL", "0", CVAR_ARCHIVE_ND|CVAR_LATCH ); r_allowSoftwareGL = Cvar_Get( "r_allowSoftwareGL", "0", CVAR_ARCHIVE_ND|CVAR_LATCH );
// Window cvars // Window cvars
@ -190,22 +186,14 @@ window_t WIN_Init( const windowDesc_t *windowDesc, glconfig_t *glConfig )
window.api = windowDesc->api; window.api = windowDesc->api;
#if defined(_WIN32) int android_screen_width;
SDL_SysWMinfo info; int android_screen_height;
SDL_VERSION(&info.version); JKVR_GetScreenRes(&android_screen_width, &android_screen_height);
glConfig->vidWidth = android_screen_width;
if ( SDL_GetWindowWMInfo(screen, &info) ) glConfig->vidHeight = android_screen_height;
{ glConfig->colorBits = 32;
switch(info.subsystem) { glConfig->depthBits = 16;
case SDL_SYSWM_WINDOWS: glConfig->stencilBits = 8;
window.handle = info.info.win.window;
break;
default:
break;
}
}
#endif
return window; return window;
} }