teambeef/quakequest
0
0
Fork 0
mirror of https://github.com/DrBeef/QuakeQuest.git synced 2025-02-16 09:11:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Added support for OGG files

Browse source 
Added support for OGG files via libvorbis. Must have this in a new SupportLibs folder in JNI
This commit is contained in:
Grant Bagwell 2021-03-11 18:37:57 +01:00
parent 0e92c7b70c
commit e98f71ccfd
3 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Projects/Android/jni/Android.mk
View file

@ -10,9 +10,11 @@ LOCAL_CFLAGS := -std=c99
LOCAL_MODULE := quakequest LOCAL_MODULE := quakequest
LOCAL_LDLIBS := -llog -landroid -lGLESv3 -lEGL # include default libraries LOCAL_LDLIBS := -llog -landroid -lGLESv3 -lEGL # include default libraries
LOCAL_C_INCLUDES := ../QuakeQuestSrc/ ../darkplaces/ LOCAL_C_INCLUDES := ../QuakeQuestSrc/ \
../darkplaces/ \
$(SUPPORT_LIBS)/liboggvorbis/include
LOCAL_SHARED_LIBRARIES := vrapi LOCAL_SHARED_LIBRARIES := vrapi libvorbis libogg libvorbis-jni
SRC_SND_COMMON := \ SRC_SND_COMMON := \
darkplaces/snd_main.c \ darkplaces/snd_main.c \
@ -131,5 +133,6 @@ LOCAL_SRC_FILES := \
$(SRC_COMMON) $(SRC_COMMON)
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)
include $(SUPPORT_LIBS)/liboggvorbis/Android.mk
$(call import-module,VrApi/Projects/AndroidPrebuilt/jni) $(call import-module,VrApi/Projects/AndroidPrebuilt/jni)

8
Projects/Android/jni/Application.mk
View file

@ -2,10 +2,16 @@
# one. I use that to obtain the Application.mk dir then import the root # one. I use that to obtain the Application.mk dir then import the root
# Application.mk. # Application.mk.
ROOT_DIR := $(dir $(lastword $(MAKEFILE_LIST)))../../../../.. ROOT_DIR := $(dir $(lastword $(MAKEFILE_LIST)))../../../../..
NDK_MODULE_PATH := $(ROOT_DIR)
APP_PLATFORM := android-24 APP_PLATFORM := android-24
NDK_MODULE_PATH := $(ROOT_DIR) APP_CFLAGS += -Wl,--no-undefined
APPLICATIONMK_PATH = $(call my-dir)
TOP_DIR := $(APPLICATIONMK_PATH)
SUPPORT_LIBS := $(APPLICATIONMK_PATH)/SupportLibs
APP_STL := c++_shared APP_STL := c++_shared

1
Projects/Android/jni/darkplaces/quakedef.h
View file

@ -420,6 +420,7 @@ extern cvar_t sessionid;
# define DP_OS_NAME "Android" # define DP_OS_NAME "Android"
# define DP_OS_STR "android" # define DP_OS_STR "android"
# define USE_GLES2 1 # define USE_GLES2 1
# define LINK_TO_LIBVORBIS 1
#if defined(__GNUC__) #if defined(__GNUC__)
# if defined(__i386__) # if defined(__i386__)