ec- · ec- · Oct 17, 2023 · Sep 28, 2023 · Sep 28, 2023 · Sep 28, 2023
diff --git a/Makefile b/Makefile
@@ -207,7 +207,7 @@ R1DIR=$(MOUNT_DIR)/renderer
 R2DIR=$(MOUNT_DIR)/renderer2
 RVDIR=$(MOUNT_DIR)/renderervk
 SDLDIR=$(MOUNT_DIR)/sdl
-SDLHDIR=$(MOUNT_DIR)/SDL2
+SDLHDIR=$(MOUNT_DIR)/libsdl/include/SDL2
 
 CMDIR=$(MOUNT_DIR)/qcommon
 UDIR=$(MOUNT_DIR)/unix
@@ -426,7 +426,7 @@ ifdef MINGW
   CLIENT_LDFLAGS=$(LDFLAGS)
 
   ifeq ($(USE_SDL),1)
-    BASE_CFLAGS += -DUSE_LOCAL_HEADERS=1 -I$(MOUNT_DIR)/libsdl/windows/include/SDL2
+    BASE_CFLAGS += -DUSE_LOCAL_HEADERS=1 -I$(SDLHDIR)
     #CLIENT_CFLAGS += -DUSE_LOCAL_HEADERS=1
     ifeq ($(ARCH),x86)
       CLIENT_LDFLAGS += -L$(MOUNT_DIR)/libsdl/windows/mingw/lib32
@@ -477,6 +477,8 @@ ifeq ($(COMPILE_PLATFORM),darwin)
   SHLIBCFLAGS = -fPIC -fvisibility=hidden
   SHLIBLDFLAGS = -dynamiclib $(LDFLAGS)
 
+  ARCHEXT = .$(ARCH)
+
   LDFLAGS =
 
   ifeq ($(ARCH),x86_64)
@@ -490,7 +492,7 @@ ifeq ($(COMPILE_PLATFORM),darwin)
 
   ifeq ($(USE_LOCAL_HEADERS),1)
     MACLIBSDIR=$(MOUNT_DIR)/libsdl/macosx
-    BASE_CFLAGS += -I$(SDLHDIR)/include
+    BASE_CFLAGS += -I$(SDLHDIR)
     CLIENT_LDFLAGS += $(MACLIBSDIR)/libSDL2-2.0.0.dylib
     CLIENT_EXTRA_FILES += $(MACLIBSDIR)/libSDL2-2.0.0.dylib
   else
@@ -597,7 +599,7 @@ endif # *NIX platforms
 endif # !MINGW
 
 
-TARGET_CLIENT = $(CNAME)$(FULLBINEXT)
+TARGET_CLIENT = $(CNAME)$(ARCHEXT)$(BINEXT)
 
 TARGET_REND1 = $(RENDERER_PREFIX)_opengl_$(SHLIBNAME)
 TARGET_REND2 = $(RENDERER_PREFIX)_opengl2_$(SHLIBNAME)
@@ -674,10 +676,6 @@ $(echo_cmd) "WINDRES $<"
 $(Q)$(WINDRES) -i $< -o $@
 endef
 
-ifndef FULLBINEXT
-  FULLBINEXT=.$(ARCH)$(BINEXT)
-endif
-
 ifndef SHLIBNAME
   SHLIBNAME=$(ARCH).$(SHLIBEXT)
 endif

diff --git a/code/SDL2/include/SDL.h → code/libsdl/include/SDL2/SDL.h b/code/SDL2/include/SDL.h → code/libsdl/include/SDL2/SDL.h
diff --git a/code/SDL2/include/SDL_assert.h → code/libsdl/include/SDL2/SDL_assert.h b/code/SDL2/include/SDL_assert.h → code/libsdl/include/SDL2/SDL_assert.h
diff --git a/code/SDL2/include/SDL_atomic.h → code/libsdl/include/SDL2/SDL_atomic.h b/code/SDL2/include/SDL_atomic.h → code/libsdl/include/SDL2/SDL_atomic.h
diff --git a/code/SDL2/include/SDL_audio.h → code/libsdl/include/SDL2/SDL_audio.h b/code/SDL2/include/SDL_audio.h → code/libsdl/include/SDL2/SDL_audio.h
diff --git a/code/SDL2/include/SDL_bits.h → code/libsdl/include/SDL2/SDL_bits.h b/code/SDL2/include/SDL_bits.h → code/libsdl/include/SDL2/SDL_bits.h
diff --git a/code/SDL2/include/SDL_blendmode.h → code/libsdl/include/SDL2/SDL_blendmode.h b/code/SDL2/include/SDL_blendmode.h → code/libsdl/include/SDL2/SDL_blendmode.h
diff --git a/code/SDL2/include/SDL_clipboard.h → code/libsdl/include/SDL2/SDL_clipboard.h b/code/SDL2/include/SDL_clipboard.h → code/libsdl/include/SDL2/SDL_clipboard.h
diff --git a/code/SDL2/include/SDL_config.h → code/libsdl/include/SDL2/SDL_config.h b/code/SDL2/include/SDL_config.h → code/libsdl/include/SDL2/SDL_config.h
diff --git a/code/SDL2/include/SDL_cpuinfo.h → code/libsdl/include/SDL2/SDL_cpuinfo.h b/code/SDL2/include/SDL_cpuinfo.h → code/libsdl/include/SDL2/SDL_cpuinfo.h
diff --git a/code/SDL2/include/SDL_egl.h → code/libsdl/include/SDL2/SDL_egl.h b/code/SDL2/include/SDL_egl.h → code/libsdl/include/SDL2/SDL_egl.h
diff --git a/code/SDL2/include/SDL_endian.h → code/libsdl/include/SDL2/SDL_endian.h b/code/SDL2/include/SDL_endian.h → code/libsdl/include/SDL2/SDL_endian.h
diff --git a/code/SDL2/include/SDL_error.h → code/libsdl/include/SDL2/SDL_error.h b/code/SDL2/include/SDL_error.h → code/libsdl/include/SDL2/SDL_error.h
diff --git a/code/SDL2/include/SDL_events.h → code/libsdl/include/SDL2/SDL_events.h b/code/SDL2/include/SDL_events.h → code/libsdl/include/SDL2/SDL_events.h
diff --git a/code/SDL2/include/SDL_filesystem.h → code/libsdl/include/SDL2/SDL_filesystem.h b/code/SDL2/include/SDL_filesystem.h → code/libsdl/include/SDL2/SDL_filesystem.h
diff --git a/code/SDL2/include/SDL_gamecontroller.h → .../libsdl/include/SDL2/SDL_gamecontroller.h b/code/SDL2/include/SDL_gamecontroller.h → .../libsdl/include/SDL2/SDL_gamecontroller.h
diff --git a/code/SDL2/include/SDL_gesture.h → code/libsdl/include/SDL2/SDL_gesture.h b/code/SDL2/include/SDL_gesture.h → code/libsdl/include/SDL2/SDL_gesture.h
diff --git a/code/SDL2/include/SDL_haptic.h → code/libsdl/include/SDL2/SDL_haptic.h b/code/SDL2/include/SDL_haptic.h → code/libsdl/include/SDL2/SDL_haptic.h
diff --git a/code/SDL2/include/SDL_hints.h → code/libsdl/include/SDL2/SDL_hints.h b/code/SDL2/include/SDL_hints.h → code/libsdl/include/SDL2/SDL_hints.h
diff --git a/code/SDL2/include/SDL_joystick.h → code/libsdl/include/SDL2/SDL_joystick.h b/code/SDL2/include/SDL_joystick.h → code/libsdl/include/SDL2/SDL_joystick.h
diff --git a/code/SDL2/include/SDL_keyboard.h → code/libsdl/include/SDL2/SDL_keyboard.h b/code/SDL2/include/SDL_keyboard.h → code/libsdl/include/SDL2/SDL_keyboard.h
diff --git a/code/SDL2/include/SDL_keycode.h → code/libsdl/include/SDL2/SDL_keycode.h b/code/SDL2/include/SDL_keycode.h → code/libsdl/include/SDL2/SDL_keycode.h
diff --git a/code/SDL2/include/SDL_loadso.h → code/libsdl/include/SDL2/SDL_loadso.h b/code/SDL2/include/SDL_loadso.h → code/libsdl/include/SDL2/SDL_loadso.h
diff --git a/code/SDL2/include/SDL_log.h → code/libsdl/include/SDL2/SDL_log.h b/code/SDL2/include/SDL_log.h → code/libsdl/include/SDL2/SDL_log.h
diff --git a/code/SDL2/include/SDL_main.h → code/libsdl/include/SDL2/SDL_main.h b/code/SDL2/include/SDL_main.h → code/libsdl/include/SDL2/SDL_main.h
diff --git a/code/SDL2/include/SDL_messagebox.h → code/libsdl/include/SDL2/SDL_messagebox.h b/code/SDL2/include/SDL_messagebox.h → code/libsdl/include/SDL2/SDL_messagebox.h
diff --git a/code/SDL2/include/SDL_mouse.h → code/libsdl/include/SDL2/SDL_mouse.h b/code/SDL2/include/SDL_mouse.h → code/libsdl/include/SDL2/SDL_mouse.h
diff --git a/code/SDL2/include/SDL_mutex.h → code/libsdl/include/SDL2/SDL_mutex.h b/code/SDL2/include/SDL_mutex.h → code/libsdl/include/SDL2/SDL_mutex.h
diff --git a/code/SDL2/include/SDL_name.h → code/libsdl/include/SDL2/SDL_name.h b/code/SDL2/include/SDL_name.h → code/libsdl/include/SDL2/SDL_name.h
diff --git a/code/SDL2/include/SDL_opengl.h → code/libsdl/include/SDL2/SDL_opengl.h b/code/SDL2/include/SDL_opengl.h → code/libsdl/include/SDL2/SDL_opengl.h
diff --git a/code/SDL2/include/SDL_opengl_glext.h → code/libsdl/include/SDL2/SDL_opengl_glext.h b/code/SDL2/include/SDL_opengl_glext.h → code/libsdl/include/SDL2/SDL_opengl_glext.h
diff --git a/code/SDL2/include/SDL_opengles.h → code/libsdl/include/SDL2/SDL_opengles.h b/code/SDL2/include/SDL_opengles.h → code/libsdl/include/SDL2/SDL_opengles.h
diff --git a/code/SDL2/include/SDL_opengles2.h → code/libsdl/include/SDL2/SDL_opengles2.h b/code/SDL2/include/SDL_opengles2.h → code/libsdl/include/SDL2/SDL_opengles2.h
diff --git a/code/SDL2/include/SDL_opengles2_gl2.h → code/libsdl/include/SDL2/SDL_opengles2_gl2.h b/code/SDL2/include/SDL_opengles2_gl2.h → code/libsdl/include/SDL2/SDL_opengles2_gl2.h
diff --git a/code/SDL2/include/SDL_opengles2_gl2ext.h → ...ibsdl/include/SDL2/SDL_opengles2_gl2ext.h b/code/SDL2/include/SDL_opengles2_gl2ext.h → ...ibsdl/include/SDL2/SDL_opengles2_gl2ext.h
diff --git a/.../SDL2/include/SDL_opengles2_gl2platform.h → .../include/SDL2/SDL_opengles2_gl2platform.h b/.../SDL2/include/SDL_opengles2_gl2platform.h → .../include/SDL2/SDL_opengles2_gl2platform.h
diff --git a/.../SDL2/include/SDL_opengles2_khrplatform.h → .../include/SDL2/SDL_opengles2_khrplatform.h b/.../SDL2/include/SDL_opengles2_khrplatform.h → .../include/SDL2/SDL_opengles2_khrplatform.h
diff --git a/code/SDL2/include/SDL_pixels.h → code/libsdl/include/SDL2/SDL_pixels.h b/code/SDL2/include/SDL_pixels.h → code/libsdl/include/SDL2/SDL_pixels.h
diff --git a/code/SDL2/include/SDL_platform.h → code/libsdl/include/SDL2/SDL_platform.h b/code/SDL2/include/SDL_platform.h → code/libsdl/include/SDL2/SDL_platform.h
diff --git a/code/SDL2/include/SDL_power.h → code/libsdl/include/SDL2/SDL_power.h b/code/SDL2/include/SDL_power.h → code/libsdl/include/SDL2/SDL_power.h
diff --git a/code/SDL2/include/SDL_quit.h → code/libsdl/include/SDL2/SDL_quit.h b/code/SDL2/include/SDL_quit.h → code/libsdl/include/SDL2/SDL_quit.h
diff --git a/code/SDL2/include/SDL_rect.h → code/libsdl/include/SDL2/SDL_rect.h b/code/SDL2/include/SDL_rect.h → code/libsdl/include/SDL2/SDL_rect.h
diff --git a/code/SDL2/include/SDL_render.h → code/libsdl/include/SDL2/SDL_render.h b/code/SDL2/include/SDL_render.h → code/libsdl/include/SDL2/SDL_render.h
diff --git a/code/SDL2/include/SDL_revision.h → code/libsdl/include/SDL2/SDL_revision.h b/code/SDL2/include/SDL_revision.h → code/libsdl/include/SDL2/SDL_revision.h
diff --git a/code/SDL2/include/SDL_rwops.h → code/libsdl/include/SDL2/SDL_rwops.h b/code/SDL2/include/SDL_rwops.h → code/libsdl/include/SDL2/SDL_rwops.h
diff --git a/code/SDL2/include/SDL_scancode.h → code/libsdl/include/SDL2/SDL_scancode.h b/code/SDL2/include/SDL_scancode.h → code/libsdl/include/SDL2/SDL_scancode.h
diff --git a/code/SDL2/include/SDL_sensor.h → code/libsdl/include/SDL2/SDL_sensor.h b/code/SDL2/include/SDL_sensor.h → code/libsdl/include/SDL2/SDL_sensor.h
diff --git a/code/SDL2/include/SDL_shape.h → code/libsdl/include/SDL2/SDL_shape.h b/code/SDL2/include/SDL_shape.h → code/libsdl/include/SDL2/SDL_shape.h
diff --git a/code/SDL2/include/SDL_stdinc.h → code/libsdl/include/SDL2/SDL_stdinc.h b/code/SDL2/include/SDL_stdinc.h → code/libsdl/include/SDL2/SDL_stdinc.h
diff --git a/code/SDL2/include/SDL_surface.h → code/libsdl/include/SDL2/SDL_surface.h b/code/SDL2/include/SDL_surface.h → code/libsdl/include/SDL2/SDL_surface.h
diff --git a/code/SDL2/include/SDL_system.h → code/libsdl/include/SDL2/SDL_system.h b/code/SDL2/include/SDL_system.h → code/libsdl/include/SDL2/SDL_system.h
diff --git a/code/SDL2/include/SDL_syswm.h → code/libsdl/include/SDL2/SDL_syswm.h b/code/SDL2/include/SDL_syswm.h → code/libsdl/include/SDL2/SDL_syswm.h
diff --git a/code/SDL2/include/SDL_test.h → code/libsdl/include/SDL2/SDL_test.h b/code/SDL2/include/SDL_test.h → code/libsdl/include/SDL2/SDL_test.h
diff --git a/code/SDL2/include/SDL_test_assert.h → code/libsdl/include/SDL2/SDL_test_assert.h b/code/SDL2/include/SDL_test_assert.h → code/libsdl/include/SDL2/SDL_test_assert.h
diff --git a/code/SDL2/include/SDL_test_common.h → code/libsdl/include/SDL2/SDL_test_common.h b/code/SDL2/include/SDL_test_common.h → code/libsdl/include/SDL2/SDL_test_common.h
diff --git a/code/SDL2/include/SDL_test_compare.h → code/libsdl/include/SDL2/SDL_test_compare.h b/code/SDL2/include/SDL_test_compare.h → code/libsdl/include/SDL2/SDL_test_compare.h
diff --git a/code/SDL2/include/SDL_test_crc32.h → code/libsdl/include/SDL2/SDL_test_crc32.h b/code/SDL2/include/SDL_test_crc32.h → code/libsdl/include/SDL2/SDL_test_crc32.h
diff --git a/code/SDL2/include/SDL_test_font.h → code/libsdl/include/SDL2/SDL_test_font.h b/code/SDL2/include/SDL_test_font.h → code/libsdl/include/SDL2/SDL_test_font.h
diff --git a/code/SDL2/include/SDL_test_fuzzer.h → code/libsdl/include/SDL2/SDL_test_fuzzer.h b/code/SDL2/include/SDL_test_fuzzer.h → code/libsdl/include/SDL2/SDL_test_fuzzer.h
diff --git a/code/SDL2/include/SDL_test_harness.h → code/libsdl/include/SDL2/SDL_test_harness.h b/code/SDL2/include/SDL_test_harness.h → code/libsdl/include/SDL2/SDL_test_harness.h
diff --git a/code/SDL2/include/SDL_test_images.h → code/libsdl/include/SDL2/SDL_test_images.h b/code/SDL2/include/SDL_test_images.h → code/libsdl/include/SDL2/SDL_test_images.h
diff --git a/code/SDL2/include/SDL_test_log.h → code/libsdl/include/SDL2/SDL_test_log.h b/code/SDL2/include/SDL_test_log.h → code/libsdl/include/SDL2/SDL_test_log.h
diff --git a/code/SDL2/include/SDL_test_md5.h → code/libsdl/include/SDL2/SDL_test_md5.h b/code/SDL2/include/SDL_test_md5.h → code/libsdl/include/SDL2/SDL_test_md5.h
diff --git a/code/SDL2/include/SDL_test_memory.h → code/libsdl/include/SDL2/SDL_test_memory.h b/code/SDL2/include/SDL_test_memory.h → code/libsdl/include/SDL2/SDL_test_memory.h
diff --git a/code/SDL2/include/SDL_test_random.h → code/libsdl/include/SDL2/SDL_test_random.h b/code/SDL2/include/SDL_test_random.h → code/libsdl/include/SDL2/SDL_test_random.h
diff --git a/code/SDL2/include/SDL_thread.h → code/libsdl/include/SDL2/SDL_thread.h b/code/SDL2/include/SDL_thread.h → code/libsdl/include/SDL2/SDL_thread.h
diff --git a/code/SDL2/include/SDL_timer.h → code/libsdl/include/SDL2/SDL_timer.h b/code/SDL2/include/SDL_timer.h → code/libsdl/include/SDL2/SDL_timer.h
diff --git a/code/SDL2/include/SDL_touch.h → code/libsdl/include/SDL2/SDL_touch.h b/code/SDL2/include/SDL_touch.h → code/libsdl/include/SDL2/SDL_touch.h
diff --git a/code/SDL2/include/SDL_types.h → code/libsdl/include/SDL2/SDL_types.h b/code/SDL2/include/SDL_types.h → code/libsdl/include/SDL2/SDL_types.h
diff --git a/code/SDL2/include/SDL_version.h → code/libsdl/include/SDL2/SDL_version.h b/code/SDL2/include/SDL_version.h → code/libsdl/include/SDL2/SDL_version.h
diff --git a/code/SDL2/include/SDL_video.h → code/libsdl/include/SDL2/SDL_video.h b/code/SDL2/include/SDL_video.h → code/libsdl/include/SDL2/SDL_video.h
diff --git a/code/SDL2/include/SDL_vulkan.h → code/libsdl/include/SDL2/SDL_vulkan.h b/code/SDL2/include/SDL_vulkan.h → code/libsdl/include/SDL2/SDL_vulkan.h
diff --git a/code/SDL2/include/begin_code.h → code/libsdl/include/SDL2/begin_code.h b/code/SDL2/include/begin_code.h → code/libsdl/include/SDL2/begin_code.h
diff --git a/code/SDL2/include/close_code.h → code/libsdl/include/SDL2/close_code.h b/code/SDL2/include/close_code.h → code/libsdl/include/SDL2/close_code.h
diff --git a/code/libsdl/windows/include/SDL2/SDL.h b/code/libsdl/windows/include/SDL2/SDL.h