lpnf
/
lovr
mirror of https://github.com/bjornbytes/lovr.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix broken android lua module 

The LOVR_ENABLE_ANDROID flag wasn't getting passed to C, and the getApplicationId code had bugs
This commit is contained in:
mcc 2018-11-26 02:12:21 -05:00 committed by Bjorn Swenson
parent 99026af5ca
commit adabf4c6ef
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeLists.txt
View File

@ -571,7 +571,12 @@ elseif(EMSCRIPTEN)
target_sources(lovr PRIVATE src/platform/web.c)
elseif(ANDROID)
target_link_libraries(lovr log EGL GLESv3)
target_sources(lovr PRIVATE src/platform/android.c src/api/android.c)
target_sources(lovr PRIVATE src/platform/android.c)
if (LOVR_ENABLE_ANDROID)
add_definitions(-DLOVR_ENABLE_ANDROID)
target_sources(lovr PRIVATE src/api/android.c)
endif()
elseif(UNIX)
target_sources(lovr PRIVATE src/platform/linux.c)
endif()

6
src/api/android.c
View File

@ -1,19 +1,21 @@
#include "api.h"
#include "lib/sds/sds.h"
#include <unistd.h>
#include "platform.h"
static int l_lovrGetApplicationId(lua_State *L) {
pid_t pid = getpid();
sds procPath = sdscatfmt(sdsempty(), "/proc/%d/cmdline", (int)pid);
sds procPath = sdscatfmt(sdsempty(), "/proc/%i/cmdline", (int)pid);
FILE *procFile = fopen(procPath, "r");
sdsfree(procPath);
if (procFile) {
sds procData = sdsempty();
char data[64];
int read;
while ((read = fread(data, sizeof(data), 1, procFile))) {
while ((read = fread(data, 1, sizeof(data), procFile))) {
procData = sdscatlen(procData, data, read);
}
lua_pushstring(L, procData);
sdsfree(procData);
} else {
lua_pushnil(L);