Moved source files

so that it is easier to debug in Android Studio
2024-11-10 06:41:58 +00:00 · 2022-02-25 23:18:45 +00:00 · 2022-02-25 23:18:45 +00:00 · 9489c0f106
commit 9489c0f106
parent 7afb11c4b6
1140 changed files with 6 additions and 7 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,5 +1,5 @@
 build
-code/VrApi/
+android/app/src/main/cpp/code/VrApi/
 *.swp
 *tags
 *~
@ -47,7 +47,6 @@ profile
 .gradle/
 .cxx/
 .settings/
-assets/
 jniLibs/
 Debug/
 Release/
@ -55,3 +54,4 @@ Release/
 .classpath
 .project
 local.properties
+drbeef-release-key.keystore
--- a/2
+++ b/2
@ -144,7 +144,7 @@ COPYBINDIR=$(COPYDIR)
 endif

 ifndef MOUNT_DIR
-MOUNT_DIR=code
+MOUNT_DIR=android/app/src/main/cpp/code
 endif

 ifndef BUILD_DIR
--- a/android/app/src/main/cpp/CMakeLists.txt
+++ b/android/app/src/main/cpp/CMakeLists.txt
@ -27,9 +27,9 @@ add_custom_target(copy_libs
 add_dependencies(main copy_libs)

 target_include_directories(main PRIVATE
-	${CMAKE_SOURCE_DIR}/../../../../../code/VrApi/Include
-	${CMAKE_SOURCE_DIR}/../../../../../code/SDL2/include
-	${CMAKE_SOURCE_DIR}/../../../../../code)
+	${CMAKE_SOURCE_DIR}/code/VrApi/Include
+	${CMAKE_SOURCE_DIR}/code/SDL2/include
+	${CMAKE_SOURCE_DIR}/code)

 target_compile_definitions(main PRIVATE
 	ARCH_STRING=android)
--- a/android/app/src/main/cpp/code
+++ b/android/app/src/main/cpp/code
@ -1 +0,0 @@
-E:/ioq3quest/code
--- a/android/app/src/main/cpp/code/AL/VERSION
+++ b/android/app/src/main/cpp/code/AL/VERSION
--- a/android/app/src/main/cpp/code/AL/al.h
+++ b/android/app/src/main/cpp/code/AL/al.h
--- a/android/app/src/main/cpp/code/AL/alc.h
+++ b/android/app/src/main/cpp/code/AL/alc.h
--- a/android/app/src/main/cpp/code/AL/alext.h
+++ b/android/app/src/main/cpp/code/AL/alext.h
--- a/android/app/src/main/cpp/code/AL/efx-creative.h
+++ b/android/app/src/main/cpp/code/AL/efx-creative.h
--- a/android/app/src/main/cpp/code/AL/efx-presets.h
+++ b/android/app/src/main/cpp/code/AL/efx-presets.h
--- a/android/app/src/main/cpp/code/AL/efx.h
+++ b/android/app/src/main/cpp/code/AL/efx.h
--- a/android/app/src/main/cpp/code/SDL2/include-macppc/SDL.h
+++ b/android/app/src/main/cpp/code/SDL2/include-macppc/SDL.h
--- a/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_assert.h
+++ b/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_assert.h
--- a/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_atomic.h
+++ b/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_atomic.h
--- a/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_audio.h
+++ b/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_audio.h
--- a/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_bits.h
+++ b/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_bits.h
--- a/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_blendmode.h
+++ b/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_blendmode.h
--- a/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_clipboard.h
+++ b/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_clipboard.h
--- a/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_config.h
+++ b/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_config.h
--- a/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_config_android.h
+++ b/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_config_android.h
--- a/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_config_iphoneos.h
+++ b/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_config_iphoneos.h
--- a/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_config_macosx.h
+++ b/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_config_macosx.h
--- a/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_config_minimal.h
+++ b/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_config_minimal.h
--- a/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_config_pandora.h
+++ b/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_config_pandora.h
--- a/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_config_psp.h
+++ b/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_config_psp.h
--- a/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_config_windows.h
+++ b/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_config_windows.h
--- a/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_config_wiz.h
+++ b/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_config_wiz.h
--- a/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_copying.h
+++ b/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_copying.h
--- a/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_cpuinfo.h
+++ b/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_cpuinfo.h
--- a/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_endian.h
+++ b/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_endian.h
--- a/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_error.h
+++ b/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_error.h
--- a/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_events.h
+++ b/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_events.h
--- a/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_filesystem.h
+++ b/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_filesystem.h
--- a/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_gamecontroller.h
+++ b/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_gamecontroller.h
--- a/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_gesture.h
+++ b/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_gesture.h
--- a/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_haptic.h
+++ b/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_haptic.h
--- a/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_hints.h
+++ b/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_hints.h
--- a/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_joystick.h
+++ b/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_joystick.h
--- a/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_keyboard.h
+++ b/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_keyboard.h
--- a/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_keycode.h
+++ b/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_keycode.h
--- a/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_loadso.h
+++ b/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_loadso.h
--- a/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_log.h
+++ b/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_log.h
--- a/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_main.h
+++ b/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_main.h
--- a/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_messagebox.h
+++ b/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_messagebox.h
--- a/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_mouse.h
+++ b/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_mouse.h
--- a/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_mutex.h
+++ b/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_mutex.h
--- a/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_name.h
+++ b/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_name.h
--- a/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_opengl.h
+++ b/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_opengl.h
--- a/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_opengles.h
+++ b/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_opengles.h
--- a/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_opengles2.h
+++ b/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_opengles2.h
--- a/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_pixels.h
+++ b/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_pixels.h
--- a/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_platform.h
+++ b/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_platform.h
--- a/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_power.h
+++ b/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_power.h
--- a/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_quit.h
+++ b/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_quit.h
--- a/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_rect.h
+++ b/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_rect.h
--- a/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_render.h
+++ b/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_render.h
--- a/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_revision.h
+++ b/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_revision.h
--- a/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_rwops.h
+++ b/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_rwops.h
--- a/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_scancode.h
+++ b/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_scancode.h
--- a/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_shape.h
+++ b/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_shape.h
--- a/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_stdinc.h
+++ b/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_stdinc.h
--- a/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_surface.h
+++ b/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_surface.h
--- a/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_system.h
+++ b/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_system.h
--- a/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_syswm.h
+++ b/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_syswm.h
--- a/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_test.h
+++ b/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_test.h
--- a/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_test_assert.h
+++ b/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_test_assert.h
--- a/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_test_common.h
+++ b/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_test_common.h
--- a/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_test_compare.h
+++ b/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_test_compare.h
--- a/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_test_crc32.h
+++ b/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_test_crc32.h
--- a/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_test_font.h
+++ b/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_test_font.h
--- a/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_test_fuzzer.h
+++ b/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_test_fuzzer.h
--- a/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_test_harness.h
+++ b/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_test_harness.h
--- a/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_test_images.h
+++ b/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_test_images.h
--- a/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_test_log.h
+++ b/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_test_log.h
--- a/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_test_md5.h
+++ b/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_test_md5.h
--- a/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_test_random.h
+++ b/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_test_random.h
--- a/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_thread.h
+++ b/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_thread.h
--- a/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_timer.h
+++ b/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_timer.h
--- a/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_touch.h
+++ b/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_touch.h
--- a/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_types.h
+++ b/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_types.h
--- a/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_version.h
+++ b/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_version.h
--- a/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_video.h
+++ b/android/app/src/main/cpp/code/SDL2/include-macppc/SDL_video.h
--- a/android/app/src/main/cpp/code/SDL2/include-macppc/begin_code.h
+++ b/android/app/src/main/cpp/code/SDL2/include-macppc/begin_code.h
--- a/android/app/src/main/cpp/code/SDL2/include-macppc/close_code.h
+++ b/android/app/src/main/cpp/code/SDL2/include-macppc/close_code.h
--- a/android/app/src/main/cpp/code/SDL2/include/SDL.h
+++ b/android/app/src/main/cpp/code/SDL2/include/SDL.h
--- a/android/app/src/main/cpp/code/SDL2/include/SDL_assert.h
+++ b/android/app/src/main/cpp/code/SDL2/include/SDL_assert.h
--- a/android/app/src/main/cpp/code/SDL2/include/SDL_atomic.h
+++ b/android/app/src/main/cpp/code/SDL2/include/SDL_atomic.h
--- a/android/app/src/main/cpp/code/SDL2/include/SDL_audio.h
+++ b/android/app/src/main/cpp/code/SDL2/include/SDL_audio.h
--- a/android/app/src/main/cpp/code/SDL2/include/SDL_bits.h
+++ b/android/app/src/main/cpp/code/SDL2/include/SDL_bits.h
--- a/android/app/src/main/cpp/code/SDL2/include/SDL_blendmode.h
+++ b/android/app/src/main/cpp/code/SDL2/include/SDL_blendmode.h
--- a/android/app/src/main/cpp/code/SDL2/include/SDL_clipboard.h
+++ b/android/app/src/main/cpp/code/SDL2/include/SDL_clipboard.h
--- a/android/app/src/main/cpp/code/SDL2/include/SDL_config.h
+++ b/android/app/src/main/cpp/code/SDL2/include/SDL_config.h
--- a/android/app/src/main/cpp/code/SDL2/include/SDL_config.h.cmake
+++ b/android/app/src/main/cpp/code/SDL2/include/SDL_config.h.cmake
--- a/android/app/src/main/cpp/code/SDL2/include/SDL_config.h.in
+++ b/android/app/src/main/cpp/code/SDL2/include/SDL_config.h.in
--- a/android/app/src/main/cpp/code/SDL2/include/SDL_config_android.h
+++ b/android/app/src/main/cpp/code/SDL2/include/SDL_config_android.h
--- a/android/app/src/main/cpp/code/SDL2/include/SDL_config_iphoneos.h
+++ b/android/app/src/main/cpp/code/SDL2/include/SDL_config_iphoneos.h
--- a/android/app/src/main/cpp/code/SDL2/include/SDL_config_macosx.h
+++ b/android/app/src/main/cpp/code/SDL2/include/SDL_config_macosx.h
--- a/android/app/src/main/cpp/code/SDL2/include/SDL_config_minimal.h
+++ b/android/app/src/main/cpp/code/SDL2/include/SDL_config_minimal.h
--- a/android/app/src/main/cpp/code/SDL2/include/SDL_config_pandora.h
+++ b/android/app/src/main/cpp/code/SDL2/include/SDL_config_pandora.h
--- a/android/app/src/main/cpp/code/SDL2/include/SDL_config_psp.h
+++ b/android/app/src/main/cpp/code/SDL2/include/SDL_config_psp.h
--- a/Show more
+++ b/Show more