Some project restructuring

Projects/Android/Android.iml

@@ -4,8 +4,8 @@
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
         <option name="GRADLE_PROJECT_PATH" value=":VrSamples:QuakeQuest:Projects:Android" />
-        <option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" value="3.1.2" />
+        <option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" value="3.5.3" />
-        <option name="LAST_KNOWN_AGP_VERSION" value="3.1.2" />
+        <option name="LAST_KNOWN_AGP_VERSION" value="3.5.3" />
       </configuration>
     </facet>
     <facet type="native-android-gradle" name="Native-Android-Gradle">
@@ -30,27 +30,25 @@
     </facet>
   </component>
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
-    <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
+    <output url="file://$MODULE_DIR$/build/intermediates/javac/debug/classes" />
-    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
+    <output-test url="file://$MODULE_DIR$/build/intermediates/javac/debugUnitTest/classes" />
     <exclude-output />
-    <content url="file://$MODULE_DIR$/../..">
-      <sourceFolder url="file://$MODULE_DIR$/../.." isTestSource="false" />
-    </content>
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/jni" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/jni/QuakeQuestSrc" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/jni/darkplaces" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debug/compileDebugRenderscript/out" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debugAndroidTest/out" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debugAndroidTest/compileDebugAndroidTestAidl/out" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debugAndroidTest/compileDebugAndroidTestRenderscript/out" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/test/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debugUnitTest/out" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
@@ -96,13 +94,11 @@
       <sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/jni" isTestSource="false" />
       <excludeFolder url="file://$MODULE_DIR$/.cxx" />
       <excludeFolder url="file://$MODULE_DIR$/.externalNativeBuild" />
       <excludeFolder url="file://$MODULE_DIR$/build" />
     </content>
-    <content url="file://$MODULE_DIR$/../../Src">
-      <sourceFolder url="file://$MODULE_DIR$/../../Src" isTestSource="false" />
-    </content>
     <content url="file://$MODULE_DIR$/../../assets">
       <sourceFolder url="file://$MODULE_DIR$/../../assets" type="java-resource" />
     </content>
@@ -112,11 +108,11 @@
     <content url="file://$MODULE_DIR$/../../res">
       <sourceFolder url="file://$MODULE_DIR$/../../res" type="java-resource" />
     </content>
-    <orderEntry type="jdk" jdkName="Android API 24 Platform" jdkType="Android SDK" />
+    <orderEntry type="jdk" jdkName="Android API 26 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Gradle: com.android.support:support-annotations:24.2.0@jar" level="project" />
     <orderEntry type="library" name="Gradle: com.android.support:support-core-utils:24.2.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.android.support:support-compat:24.2.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: android-android-24" level="project" />
+    <orderEntry type="library" name="Gradle: android-android-26" level="project" />
   </component>
 </module>

Projects/Android/AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 		package="com.drbeef.quakequest"
-		android:versionCode="16"
+		android:versionCode="17"
-		android:versionName="1.4.8" android:installLocation="auto" >
+		android:versionName="1.4.9" android:installLocation="auto" >
 
 	<!-- Tell the system this app requires OpenGL ES 3.1. -->
 	<uses-feature android:glEsVersion="0x00030001" android:required="true"/>
@@ -30,7 +30,7 @@
 				android:label="@string/quakequest"
 				android:launchMode="singleTask"
 				android:screenOrientation="landscape"
-				android:excludeFromRecents="false"
+				android:excludeFromRecents="true"
 				android:configChanges="screenSize|screenLayout|orientation|keyboardHidden|keyboard|navigation|uiMode">
 			<!-- Tell NativeActivity the name of the .so -->
 			<meta-data android:name="android.app.lib_name" android:value="quakequest" />

Projects/Android/build.gradle

@@ -17,10 +17,10 @@ android {
     // override app plugin abiFilters for both 32 and 64-bit support
     externalNativeBuild {
         ndk {
-                abiFilters 'armeabi-v7a','arm64-v8a'
+                abiFilters 'arm64-v8a'
         }
         ndkBuild {
-                abiFilters 'armeabi-v7a','arm64-v8a'
+                abiFilters 'arm64-v8a'
         }
     }
       minSdkVersion 24
@@ -40,7 +40,7 @@ android {
         sourceCompatibility = '1.8'
         targetCompatibility = '1.8'
     }
-    compileSdkVersion = 24
+    compileSdkVersion = 26
     buildToolsVersion = '29.0.1'
 }
 

Projects/Android/jni/Android.mk

@@ -8,113 +8,126 @@ include $(CLEAR_VARS)
 
 LOCAL_CFLAGS			:= -std=c99
 LOCAL_MODULE			:= quakequest
-LOCAL_SRC_FILES			:= ../../../Src/QuakeQuest_SurfaceView.c
 LOCAL_LDLIBS			:= -llog -landroid -lGLESv3 -lEGL		# include default libraries
 
+LOCAL_C_INCLUDES := ../QuakeQuestSrc/ ../darkplaces/
+
 LOCAL_SHARED_LIBRARIES	:= vrapi
 
-# CD objects
+SRC_SND_COMMON := \
-SRC_NOCD=cd_null.c
+	darkplaces/snd_main.c \
-
+	darkplaces/snd_mem.c \
-SRC_SND_COMMON=snd_main.c snd_mem.c snd_mix.c snd_ogg.c snd_wav.c snd_modplug.c
+	darkplaces/snd_mix.c \
-
+	darkplaces/snd_ogg.c \
+	darkplaces/snd_wav.c \
+	darkplaces/snd_modplug.c
 
 
 ###### Common objects and flags #####
 
 # Common objects
-SRC_COMMON= \
+SRC_COMMON := \
-	argtable3.c \
+	darkplaces/cd_null.c \
-	bih.c \
+	darkplaces/bih.c \
-	cap_avi.c \
+	darkplaces/cap_avi.c \
-	cap_ogg.c \
+	darkplaces/cap_ogg.c \
-	cd_shared.c \
+	darkplaces/cd_shared.c \
-	crypto.c \
+	darkplaces/crypto.c \
-	cl_collision.c \
+	darkplaces/cl_collision.c \
-	cl_demo.c \
+	darkplaces/cl_demo.c \
-	cl_dyntexture.c \
+	darkplaces/cl_dyntexture.c \
-	cl_input.c \
+	darkplaces/cl_input.c \
-	cl_main.c \
+	darkplaces/cl_main.c \
-	cl_parse.c \
+	darkplaces/cl_parse.c \
-	cl_particles.c \
+	darkplaces/cl_particles.c \
-	cl_screen.c \
+	darkplaces/cl_screen.c \
-	cl_video.c \
+	darkplaces/cl_video.c \
-	clvm_cmds.c \
+	darkplaces/clvm_cmds.c \
-	cmd.c \
+	darkplaces/cmd.c \
-	collision.c \
+	darkplaces/collision.c \
-	common.c \
+	darkplaces/common.c \
-	console.c \
+	darkplaces/console.c \
-	csprogs.c \
+	darkplaces/csprogs.c \
-	curves.c \
+	darkplaces/curves.c \
-	cvar.c \
+	darkplaces/cvar.c \
-	dpsoftrast.c \
+	darkplaces/dpsoftrast.c \
-	dpvsimpledecode.c \
+	darkplaces/dpvsimpledecode.c \
-	filematch.c \
+	darkplaces/filematch.c \
-	fractalnoise.c \
+	darkplaces/fractalnoise.c \
-	fs.c \
+	darkplaces/fs.c \
-	ft2.c \
+	darkplaces/ft2.c \
-	utf8lib.c \
+	darkplaces/utf8lib.c \
-	gl_backend.c \
+	darkplaces/gl_backend.c \
-	gl_draw.c \
+	darkplaces/gl_draw.c \
-	gl_rmain.c \
+	darkplaces/gl_rmain.c \
-	gl_rsurf.c \
+	darkplaces/gl_rsurf.c \
-	gl_textures.c \
+	darkplaces/gl_textures.c \
-	hmac.c \
+	darkplaces/hmac.c \
-	host.c \
+	darkplaces/host.c \
-	host_cmd.c \
+	darkplaces/host_cmd.c \
-	image.c \
+	darkplaces/image.c \
-	image_png.c \
+	darkplaces/image_png.c \
-	jpeg.c \
+	darkplaces/jpeg.c \
-	keys.c \
+	darkplaces/keys.c \
-	lhnet.c \
+	darkplaces/lhnet.c \
-	libcurl.c \
+	darkplaces/libcurl.c \
-	mathlib.c \
+	darkplaces/mathlib.c \
-	matrixlib.c \
+	darkplaces/matrixlib.c \
-	mdfour.c \
+	darkplaces/mdfour.c \
-	menu.c \
+	darkplaces/menu.c \
-	meshqueue.c \
+	darkplaces/meshqueue.c \
-	mod_skeletal_animatevertices_sse.c \
+	darkplaces/mod_skeletal_animatevertices_sse.c \
-	mod_skeletal_animatevertices_generic.c \
+	darkplaces/mod_skeletal_animatevertices_generic.c \
-	model_alias.c \
+	darkplaces/model_alias.c \
-	model_brush.c \
+	darkplaces/model_brush.c \
-	model_shared.c \
+	darkplaces/model_shared.c \
-	model_sprite.c \
+	darkplaces/model_sprite.c \
-	mvm_cmds.c \
+	darkplaces/mvm_cmds.c \
-	netconn.c \
+	darkplaces/netconn.c \
-	palette.c \
+	darkplaces/palette.c \
-	polygon.c \
+	darkplaces/polygon.c \
-	portals.c \
+	darkplaces/portals.c \
-	protocol.c \
+	darkplaces/protocol.c \
-	prvm_cmds.c \
+	darkplaces/prvm_cmds.c \
-	prvm_edict.c \
+	darkplaces/prvm_edict.c \
-	prvm_exec.c \
+	darkplaces/prvm_exec.c \
-	r_explosion.c \
+	darkplaces/r_explosion.c \
-	r_lerpanim.c \
+	darkplaces/r_lerpanim.c \
-	r_lightning.c \
+	darkplaces/r_lightning.c \
-	r_lasersight.c \
+	darkplaces/r_lasersight.c \
-	r_modules.c \
+	darkplaces/r_modules.c \
-	r_shadow.c \
+	darkplaces/r_shadow.c \
-	r_sky.c \
+	darkplaces/r_sky.c \
-	r_sprites.c \
+	darkplaces/r_sprites.c \
-	sbar.c \
+	darkplaces/sbar.c \
-	snprintf.c \
+	darkplaces/snprintf.c \
-	sv_demo.c \
+	darkplaces/sv_demo.c \
-	sv_main.c \
+	darkplaces/sv_main.c \
-	sv_move.c \
+	darkplaces/sv_move.c \
-	sv_phys.c \
+	darkplaces/sv_phys.c \
-	sv_user.c \
+	darkplaces/sv_user.c \
-	svbsp.c \
+	darkplaces/svbsp.c \
-	svvm_cmds.c \
+	darkplaces/svvm_cmds.c \
-	sys_shared.c \
+	darkplaces/sys_shared.c \
-	vid_shared.c \
+	darkplaces/vid_shared.c \
-	view.c \
+	darkplaces/view.c \
-	wad.c \
+	darkplaces/wad.c \
-	world.c \
+	darkplaces/world.c \
-	zone.c
+	darkplaces/zone.c
 
-SRC_ANDROID= builddate.c sys_linux.c vid_android.c thread_pthread.c snd_android.c $(SRC_SND_COMMON) $(SRC_NOCD) $(SRC_COMMON)
+SRC_QUEST := \
+	QuakeQuestSrc/argtable3.c \
+	QuakeQuestSrc/QuakeQuest_SurfaceView.c
 
-LOCAL_SRC_FILES += $(SRC_ANDROID) 
+LOCAL_SRC_FILES := \
+	$(SRC_QUEST) \
+	darkplaces/builddate.c \
+	darkplaces/sys_linux.c \
+	darkplaces/vid_android.c \
+	darkplaces/thread_pthread.c \
+	darkplaces/snd_android.c  \
+	$(SRC_SND_COMMON) \
+	$(SRC_COMMON)
 
 include $(BUILD_SHARED_LIBRARY)
 

Projects/Android/jni/Application.mk

@@ -3,7 +3,7 @@
 # Application.mk.
 ROOT_DIR := $(dir $(lastword $(MAKEFILE_LIST)))../../../../..
 
-APP_PLATFORM := android-21
+APP_PLATFORM := android-24
 
 NDK_MODULE_PATH := $(ROOT_DIR)
 

Projects/Android/jni/QuakeQuestSrc/QuakeQuest_SurfaceView.c

@@ -31,9 +31,10 @@ Copyright	:	Copyright 2015 Oculus VR, LLC. All Rights reserved.
 #include <GLES3/gl3.h>
 #include <GLES3/gl3ext.h>
 
-#include <qtypes.h>
+#include "../darkplaces/qtypes.h"
-#include <quakedef.h>
+#include "../darkplaces/quakedef.h"
-#include <menu.h>
+#include "../darkplaces/menu.h"
+
 #include <VrApi_Types.h>
 
 #if !defined( EGL_OPENGL_ES3_BIT_KHR )