diff --git a/Makefile.common b/Makefile.common
index b9d4e88159..cb754c70a8 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -80,8 +80,8 @@ ifneq ($(findstring Linux,$(OS)),)
    LIBS += -lrt
    JOYCONFIG_LIBS += -lrt -lpthread
    OBJ += input/drivers/linuxraw_input.o \
-			 input/drivers_joypad/linuxraw_joypad.o \
-			 frontend/drivers/platform_linux.o
+          input/drivers_joypad/linuxraw_joypad.o \
+          frontend/drivers/platform_linux.o
 endif
 
 ifeq ($(findstring Haiku,$(OS)),)
@@ -104,110 +104,110 @@ endif
 # General object files
 
 OBJ += frontend/frontend.o \
-		frontend/frontend_driver.o \
-		frontend/drivers/platform_null.o \
-		ui/ui_companion_driver.o \
-		ui/drivers/ui_null.o \
-		libretro_version_1.o \
-		retroarch.o \
-		system.o \
-		retroarch_info.o \
-		command_event.o \
-		msg_hash.o \
-		intl/msg_hash_de.o \
-		intl/msg_hash_eo.o \
-		intl/msg_hash_es.o \
-		intl/msg_hash_fr.o \
-		intl/msg_hash_it.o \
-		intl/msg_hash_nl.o \
-		intl/msg_hash_pl.o \
-		intl/msg_hash_pt.o \
-		intl/msg_hash_us.o \
-		runloop.o \
-		runloop_data.o \
-		runloop_msg.o \
-		tasks/task_file_transfer.o \
-		content.o \
-		libretro-common/file/file_list.o \
-		libretro-common/file/dir_list.o \
-		libretro-common/file/retro_dirent.o \
-		libretro-common/file/retro_file.o \
-		libretro-common/file/retro_stat.o \
-		libretro-common/string/string_list.o \
-		libretro-common/string/stdstring.o \
-		libretro-common/memmap/memalign.o \
-		dir_list_special.o \
-		file_ops.o \
-		libretro-common/file/nbio/nbio_stdio.o \
-		libretro-common/file/file_path.o \
-		file_path_special.o \
-		libretro-common/hash/rhash.o \
-		audio/audio_driver.o \
-		input/input_driver.o \
-		input/input_hid_driver.o \
-		gfx/video_common.o \
-		gfx/video_driver.o \
-		gfx/video_pixel_converter.o \
-		gfx/video_viewport.o \
-		camera/camera_driver.o \
-		menu/menu_driver.o \
-		location/location_driver.o \
-		driver.o \
-		configuration.o \
-		libretro-common/dynamic/dylib.o \
-		dynamic.o \
-		cores/dynamic_dummy.o \
-		libretro-common/queues/message_queue.o \
-		rewind.o \
-		gfx/drivers_font_renderer/bitmapfont.o \
-		input/input_autodetect.o \
-		input/input_joypad_driver.o \
-		input/input_joypad.o \
-		input/input_common.o \
-		input/input_keymaps.o \
-		input/input_remapping.o \
-		input/input_sensor.o \
-		input/keyboard_line.o \
-		tasks/task_overlay.o \
-		input/input_overlay.o \
-		patch.o \
-		libretro-common/queues/fifo_buffer.o \
-		core_options.o \
-		libretro-common/compat/compat.o \
-		libretro-common/compat/compat_fnmatch.o \
-		cheats.o \
-		core_info.o \
-		libretro-common/file/config_file.o \
-		libretro-common/file/config_file_userdata.o \
-		screenshot.o \
-		libretro-common/gfx/scaler/scaler.o \
-		gfx/drivers_shader/shader_null.o \
-		gfx/video_shader_driver.o \
-		gfx/video_shader_parse.o \
-		libretro-common/gfx/scaler/pixconv.o \
-		libretro-common/gfx/scaler/scaler_int.o \
-		libretro-common/gfx/scaler/scaler_filter.o \
-		gfx/font_driver.o \
-		gfx/font_renderer_driver.o \
-		gfx/video_filter.o \
-		audio/audio_resampler_driver.o \
-		audio/audio_dsp_filter.o \
-		audio/drivers_resampler/sinc.o \
-		audio/drivers_resampler/nearest.o \
-		audio/drivers_resampler/cc_resampler.o \
-		location/drivers/nulllocation.o \
-		camera/drivers/nullcamera.o \
-		gfx/drivers/nullgfx.o \
-		audio/drivers/nullaudio.o \
-		input/drivers/nullinput.o \
-		input/drivers_hid/null_hid.o \
-		input/drivers_joypad/null_joypad.o \
-		input/drivers_joypad/hid_joypad.o \
-		playlist.o \
-		movie.o \
-		record/record_driver.o \
-		record/drivers/record_null.o \
-		performance.o
+       frontend/frontend_driver.o \
+       frontend/drivers/platform_null.o \
+       ui/ui_companion_driver.o \
+       ui/drivers/ui_null.o \
+       libretro_version_1.o \
+       retroarch.o \
+       system.o \
+       retroarch_info.o \
+       command_event.o \
+       msg_hash.o \
+       intl/msg_hash_de.o \
+       intl/msg_hash_eo.o \
+       intl/msg_hash_es.o \
+       intl/msg_hash_fr.o \
+       intl/msg_hash_it.o \
+       intl/msg_hash_nl.o \
+       intl/msg_hash_pl.o \
+       intl/msg_hash_pt.o \
+       intl/msg_hash_us.o \
+       runloop.o \
+       runloop_data.o \
+       runloop_msg.o \
+       tasks/task_file_transfer.o \
+       content.o \
+       libretro-common/file/file_list.o \
+       libretro-common/file/dir_list.o \
+       libretro-common/file/retro_dirent.o \
+       libretro-common/file/retro_file.o \
+       libretro-common/file/retro_stat.o \
+       libretro-common/string/string_list.o \
+       libretro-common/string/stdstring.o \
+       libretro-common/memmap/memalign.o \
+       dir_list_special.o \
+       file_ops.o \
+       libretro-common/file/nbio/nbio_stdio.o \
+       libretro-common/file/file_path.o \
+       file_path_special.o \
+       libretro-common/hash/rhash.o \
+       audio/audio_driver.o \
+       input/input_driver.o \
+       input/input_hid_driver.o \
+       gfx/video_common.o \
+       gfx/video_driver.o \
+       gfx/video_pixel_converter.o \
+       gfx/video_viewport.o \
+       camera/camera_driver.o \
+       menu/menu_driver.o \
+       location/location_driver.o \
+       driver.o \
+       configuration.o \
+       libretro-common/dynamic/dylib.o \
+       dynamic.o \
+       cores/dynamic_dummy.o \
+       libretro-common/queues/message_queue.o \
+       rewind.o \
+       gfx/drivers_font_renderer/bitmapfont.o \
+       input/input_autodetect.o \
+       input/input_joypad_driver.o \
+       input/input_joypad.o \
+       input/input_common.o \
+       input/input_keymaps.o \
+       input/input_remapping.o \
+       input/input_sensor.o \
+       input/keyboard_line.o \
+       tasks/task_overlay.o \
+       input/input_overlay.o \
+       patch.o \
+       libretro-common/queues/fifo_buffer.o \
+       core_options.o \
+       libretro-common/compat/compat.o \
+       libretro-common/compat/compat_fnmatch.o \
+       cheats.o \
+       core_info.o \
+       libretro-common/file/config_file.o \
+       libretro-common/file/config_file_userdata.o \
+       screenshot.o \
+       libretro-common/gfx/scaler/scaler.o \
+       gfx/drivers_shader/shader_null.o \
+       gfx/video_shader_driver.o \
+       gfx/video_shader_parse.o \
+       libretro-common/gfx/scaler/pixconv.o \
+       libretro-common/gfx/scaler/scaler_int.o \
+       libretro-common/gfx/scaler/scaler_filter.o \
+       gfx/font_driver.o \
+       gfx/font_renderer_driver.o \
+       gfx/video_filter.o \
+       audio/audio_resampler_driver.o \
+       audio/audio_dsp_filter.o \
+       audio/drivers_resampler/sinc.o \
+       audio/drivers_resampler/nearest.o \
+       audio/drivers_resampler/cc_resampler.o \
+       location/drivers/nulllocation.o \
+       camera/drivers/nullcamera.o \
+       gfx/drivers/nullgfx.o \
+       audio/drivers/nullaudio.o \
+       input/drivers/nullinput.o \
+       input/drivers_hid/null_hid.o \
+       input/drivers_joypad/null_joypad.o \
+       input/drivers_joypad/hid_joypad.o \
+       playlist.o \
+       movie.o \
+       record/record_driver.o \
+       record/drivers/record_null.o \
+       performance.o
 
 
 OBJ += gfx/image/image.o
@@ -229,13 +229,13 @@ endif
 
 ifeq ($(HAVE_LIBRETRODB), 1)
 OBJ += libretro-db/bintree.o \
-		 libretro-db/libretrodb.o \
-		 libretro-db/query.o \
-		 libretro-db/rmsgpack.o \
-		 libretro-db/rmsgpack_dom.o \
-		 database_info.o \
-		 tasks/task_database.o \
-		 tasks/task_database_cue.o
+       libretro-db/libretrodb.o \
+       libretro-db/query.o \
+       libretro-db/rmsgpack.o \
+       libretro-db/rmsgpack_dom.o \
+       database_info.o \
+       tasks/task_database.o \
+       tasks/task_database_cue.o
 endif
 
 # Miscellaneous
@@ -252,9 +252,9 @@ endif
 
 ifeq ($(HAVE_EMSCRIPTEN), 1)
 OBJ += frontend/drivers/platform_emscripten.o \
-		input/drivers/rwebinput_input.o \
-		audio/drivers/rwebaudio.o \
-		camera/drivers/rwebcam.o
+       input/drivers/rwebinput_input.o \
+       audio/drivers/rwebaudio.o \
+       camera/drivers/rwebcam.o
 endif
 
 # Audio
@@ -299,7 +299,7 @@ ifeq ($(HAVE_AL), 1)
 endif
 
 ifneq ($(findstring Darwin,$(OS)),)
-	OBJ += frontend/drivers/platform_darwin.o
+   OBJ += frontend/drivers/platform_darwin.o
 endif
 
 ifeq ($(HAVE_JACK),1)
@@ -340,7 +340,7 @@ endif
 
 ifeq ($(HAVE_NEON),1)
    OBJ += audio/drivers_resampler/sinc_neon.o \
-			 audio/drivers_resampler/cc_resampler_neon.o
+          audio/drivers_resampler/cc_resampler_neon.o
    # When compiled without this, tries to attempt to compile sinc lerp,
    # which will error out
 	#
@@ -369,7 +369,7 @@ ifeq ($(HAVE_RGUI)$(HAVE_GL_CONTEXT), 11)
       HAVE_XMB = 1
    endif
 else
-	HAVE_ZARCH = 0
+   HAVE_ZARCH = 0
    HAVE_GLUI  = 0
    HAVE_XMB   = 0
 endif
@@ -399,45 +399,45 @@ ifeq ($(HAVE_MENU_COMMON), 1)
       PSEUDO_NS :=
    endif
    OBJ += menu/menu.o \
-			 menu/menu_hash.o \
-			 menu/intl/menu_hash_de.o \
-			 menu/intl/menu_hash_es.o \
-			 menu/intl/menu_hash_eo.o \
-			 menu/intl/menu_hash_fr.o \
-			 menu/intl/menu_hash_it.o \
-			 menu/intl/menu_hash_nl.o \
-			 menu/intl/menu_hash_pl.o \
-			 menu/intl/menu_hash_pt.o \
-			 menu/intl/menu_hash_us$(PSEUDO_NS).o \
-			 menu/menu_input.o \
-			 menu/menu_entry.o \
-			 menu/menu_entries.o \
-			 menu/menu_navigation.o  \
-			 menu/menu_setting.o \
-			 menu/menu_shader.o \
-			 menu/menu_video.o \
-			 menu/menu_cbs.o \
-			 menu/cbs/menu_cbs_ok.o \
-			 menu/cbs/menu_cbs_cancel.o \
-			 menu/cbs/menu_cbs_select.o \
-			 menu/cbs/menu_cbs_start.o \
-			 menu/cbs/menu_cbs_info.o \
-			 menu/cbs/menu_cbs_refresh.o \
-			 menu/cbs/menu_cbs_left.o \
-			 menu/cbs/menu_cbs_right.o \
-			 menu/cbs/menu_cbs_deferred_push.o \
-			 menu/cbs/menu_cbs_scan.o \
-			 menu/cbs/menu_cbs_get_value.o \
-			 menu/cbs/menu_cbs_title.o \
-			 menu/cbs/menu_cbs_up.o \
-			 menu/cbs/menu_cbs_down.o \
-			 menu/cbs/menu_cbs_contentlist_switch.o \
-			 menu/menu_list.o \
-			 menu/menu_display.o \
-			 menu/menu_displaylist.o \
-			 menu/menu_animation.o \
-			 menu/drivers/menu_generic.o \
-			 menu/drivers/null.o
+          menu/menu_hash.o \
+          menu/intl/menu_hash_de.o \
+          menu/intl/menu_hash_es.o \
+          menu/intl/menu_hash_eo.o \
+          menu/intl/menu_hash_fr.o \
+          menu/intl/menu_hash_it.o \
+          menu/intl/menu_hash_nl.o \
+          menu/intl/menu_hash_pl.o \
+          menu/intl/menu_hash_pt.o \
+          menu/intl/menu_hash_us$(PSEUDO_NS).o \
+          menu/menu_input.o \
+          menu/menu_entry.o \
+          menu/menu_entries.o \
+          menu/menu_navigation.o  \
+          menu/menu_setting.o \
+          menu/menu_shader.o \
+          menu/menu_video.o \
+          menu/menu_cbs.o \
+          menu/cbs/menu_cbs_ok.o \
+          menu/cbs/menu_cbs_cancel.o \
+          menu/cbs/menu_cbs_select.o \
+          menu/cbs/menu_cbs_start.o \
+          menu/cbs/menu_cbs_info.o \
+          menu/cbs/menu_cbs_refresh.o \
+          menu/cbs/menu_cbs_left.o \
+          menu/cbs/menu_cbs_right.o \
+          menu/cbs/menu_cbs_deferred_push.o \
+          menu/cbs/menu_cbs_scan.o \
+          menu/cbs/menu_cbs_get_value.o \
+          menu/cbs/menu_cbs_title.o \
+          menu/cbs/menu_cbs_up.o \
+          menu/cbs/menu_cbs_down.o \
+          menu/cbs/menu_cbs_contentlist_switch.o \
+          menu/menu_list.o \
+          menu/menu_display.o \
+          menu/menu_displaylist.o \
+          menu/menu_animation.o \
+          menu/drivers/menu_generic.o \
+          menu/drivers/null.o
 endif
 
 ifeq ($(UTF8), 1)
@@ -481,7 +481,7 @@ ifeq ($(HAVE_DINPUT), 1)
    LIBS += -ldinput8 -ldxguid -lole32
    DEFINES += -DHAVE_DINPUT
    OBJ += input/drivers/dinput.o \
-			 input/drivers_joypad/dinput_joypad.o
+          input/drivers_joypad/dinput_joypad.o
    JOYCONFIG_LIBS += -ldinput8 -ldxguid -lole32
 endif
 
@@ -493,8 +493,9 @@ endif
 
 ifeq ($(HAVE_X11), 1)
    OBJ += input/drivers/x11_input.o \
-			 gfx/common/x11_common.o \
-			 input/drivers_keyboard/keyboard_event_x11.o
+          gfx/common/x11_common.o \
+          input/drivers_keyboard/keyboard_event_x11.o
+
    LIBS += $(X11_LIBS) $(XEXT_LIBS) $(XF86VM_LIBS) $(XINERAMA_LIBS)
    DEFINES += $(X11_CFLAGS) $(XEXT_CFLAGS) $(XF86VM_CFLAGS) $(XINERAMA_CFLAGS)
 endif
@@ -510,7 +511,7 @@ ifeq ($(HAVE_UDEV), 1)
    LIBS += $(UDEV_LIBS)
    JOYCONFIG_LIBS += $(UDEV_LIBS)
    OBJ += input/drivers/udev_input.o \
-			 input/drivers_joypad/udev_joypad.o
+          input/drivers_joypad/udev_joypad.o
 endif
 
 ifeq ($(HAVE_LIBUSB), 1)
@@ -537,9 +538,9 @@ endif
 ifeq ($(HAVE_HID), 1)
 	DEFINES += -DHAVE_HID
 	OBJ += input/connect/joypad_connection.o \
-			 input/connect/connect_ps3.o \
-			 input/connect/connect_ps4.o \
-			 input/connect/connect_wii.o
+               input/connect/connect_ps3.o \
+               input/connect/connect_ps4.o \
+               input/connect/connect_wii.o
 endif
 
 ifeq ($(HAVE_PARPORT), 1)
@@ -549,7 +550,9 @@ endif
 # Video
 
 OBJ += gfx/video_context_driver.o \
-       gfx/drivers_context/gfx_null_ctx.o
+       gfx/drivers_context/gfx_null_ctx.o \
+       gfx/video_state_tracker.o \
+       gfx/video_texture.o
 
 ifeq ($(HAVE_GL_CONTEXT), 1)
    DEFINES += -DHAVE_OPENGL -DHAVE_GLSL
@@ -557,8 +560,6 @@ ifeq ($(HAVE_GL_CONTEXT), 1)
           gfx/drivers/gl_common.o \
           gfx/drivers_font/gl_raster_font.o \
           libretro-common/gfx/math/matrix_4x4.o \
-          gfx/video_state_tracker.o \
-          gfx/video_texture.o \
           libretro-common/glsym/rglgen.o
 
    ifeq ($(HAVE_KMS), 1)
@@ -622,7 +623,8 @@ ifeq ($(HAVE_GL_CONTEXT), 1)
          OBJ += gfx/drivers_context/cgl_ctx.o
       else ifneq ($(findstring Win32,$(OS)),)
          GL_LIBS := -lopengl32 -lgdi32 -lcomdlg32 -lcomctl32
-         OBJ += gfx/drivers_context/wgl_ctx.o gfx/drivers_wm/win32_shader_dlg.o
+         OBJ += gfx/drivers_context/wgl_ctx.o \
+                gfx/drivers_wm/win32_shader_dlg.o
       endif
 		LIBS += $(GL_LIBS)
    endif
@@ -637,9 +639,9 @@ endif
 
 ifeq ($(HAVE_SDL), 1)
    OBJ += gfx/drivers/sdl_gfx.o \
-			 input/drivers/sdl_input.o \
-			 input/drivers_joypad/sdl_joypad.o \
-			 audio/drivers/sdl_audio.o
+          input/drivers/sdl_input.o \
+          input/drivers_joypad/sdl_joypad.o \
+          audio/drivers/sdl_audio.o
 
    ifeq ($(HAVE_GL_CONTEXT), 1)
      OBJ += gfx/drivers_context/sdl_gl_ctx.o
@@ -652,9 +654,9 @@ endif
 
 ifeq ($(HAVE_SDL2), 1)
    OBJ += gfx/drivers/sdl2_gfx.o \
-			 input/drivers/sdl_input.o \
-			 input/drivers_joypad/sdl_joypad.o \
-			 audio/drivers/sdl_audio.o
+          input/drivers/sdl_input.o \
+          input/drivers_joypad/sdl_joypad.o \
+          audio/drivers/sdl_audio.o
 
    ifeq ($(HAVE_GL_CONTEXT), 1)
      OBJ += gfx/drivers_context/sdl_gl_ctx.o
@@ -672,7 +674,7 @@ endif
 
 ifeq ($(HAVE_EXYNOS), 1)
    OBJ += gfx/drivers/exynos_gfx.o \
-			 memory/neon/memcpy-neon.o
+          memory/neon/memcpy-neon.o
    LIBS += $(DRM_LIBS) $(EXYNOS_LIBS)
    DEFINES += $(DRM_CFLAGS) $(EXYNOS_CFLAGS)
 endif
@@ -685,12 +687,12 @@ endif
 
 ifeq ($(HAVE_SUNXI), 1)
    OBJ += gfx/drivers/sunxi_gfx.o \
-			 gfx/pixman/pixman-arm-neon-asm.o
+          gfx/pixman/pixman-arm-neon-asm.o
 endif
 
 ifeq ($(HAVE_VG), 1)
    OBJ += gfx/drivers/vg.o \
-			 libretro-common/gfx/math/matrix_3x3.o
+          libretro-common/gfx/math/matrix_3x3.o
    DEFINES += $(VG_CFLAGS)
    LIBS += $(VG_LIBS)
 endif
@@ -709,17 +711,17 @@ endif
 
 ifeq ($(HAVE_D3D9), 1)
    OBJ += gfx/d3d/d3d.o \
-			 gfx/d3d/render_chain_null.o \
-			 gfx/d3d/render_chain_driver.o \
-			 gfx/d3d/d3d_wrapper.o \
-			 gfx/drivers_font/d3d_w32_font.o \
-			 gfx/drivers_context/d3d_ctx.o
+          gfx/d3d/render_chain_null.o \
+          gfx/d3d/render_chain_driver.o \
+          gfx/d3d/d3d_wrapper.o \
+          gfx/drivers_font/d3d_w32_font.o \
+          gfx/drivers_context/d3d_ctx.o
    DEFINES += -DHAVE_D3D -DHAVE_D3D9
    LIBS += -ld3d9 -ld3dx9 -ldxguid
 
    ifeq ($(HAVE_CG), 1)
       LIBS += -lcgD3D9
-		OBJ  += gfx/d3d/render_chain_cg.o
+      OBJ  += gfx/d3d/render_chain_cg.o
    endif
 endif
 
@@ -736,26 +738,26 @@ ifeq ($(HAVE_7ZIP),1)
    CFLAGS  += -I./deps/7zip
    HAVE_COMPRESSION = 1
    DEFINES += -DHAVE_7ZIP
-   7ZOBJ = 	deps/7zip/7zIn.o \
-		deps/7zip/7zAlloc.o \
-		deps/7zip/Bra86.o \
-		deps/7zip/7zFile.o \
-		deps/7zip/7zStream.o \
-		deps/7zip/7zBuf2.o \
-		deps/7zip/LzmaDec.o \
-		deps/7zip/7zCrcOpt.o \
-		deps/7zip/Bra.o \
-		deps/7zip/7zDec.o \
-		deps/7zip/Bcj2.o \
-		deps/7zip/7zCrc.o \
-		deps/7zip/Lzma2Dec.o \
-		deps/7zip/7zBuf.o
+   7ZOBJ = deps/7zip/7zIn.o \
+           deps/7zip/7zAlloc.o \
+           deps/7zip/Bra86.o \
+           deps/7zip/7zFile.o \
+           deps/7zip/7zStream.o \
+           deps/7zip/7zBuf2.o \
+           deps/7zip/LzmaDec.o \
+           deps/7zip/7zCrcOpt.o \
+           deps/7zip/Bra.o \
+           deps/7zip/7zDec.o \
+           deps/7zip/Bcj2.o \
+           deps/7zip/7zCrc.o \
+           deps/7zip/Lzma2Dec.o \
+   deps/7zip/7zBuf.o
    OBJ += $(7ZOBJ)
 endif
 
 
 ifeq ($(HAVE_ZLIB), 1)
-	OBJ += libretro-common/file/file_extract.o
+   OBJ += libretro-common/file/file_extract.o
    OBJ += $(ZLIB_OBJS)
    DEFINES += -DHAVE_ZLIB
 	HAVE_RPNG = 1
@@ -774,37 +776,37 @@ endif
 
 ifeq ($(HAVE_RPNG), 1)
    OBJ += libretro-common/formats/png/rpng.o \
-			 libretro-common/formats/png/rpng_encode.o
+          libretro-common/formats/png/rpng_encode.o
 endif
 OBJ += libretro-common/formats/bmp/rbmp_encode.o \
-		 libretro-common/formats/tga/rtga.o \
-		 libretro-common/formats/json/jsonsax.o
+       libretro-common/formats/tga/rtga.o \
+       libretro-common/formats/json/jsonsax.o
 
 ifdef HAVE_COMPRESSION
    DEFINES += -DHAVE_COMPRESSION
 endif
 
 ifeq ($(WANT_ZLIB),1)
-	OBJ += deps/zlib/adler32.o \
-			 deps/zlib/compress.o \
-			 deps/zlib/crc32.o \
-			 deps/zlib/deflate.o \
-			 deps/zlib/gzclose.o \
-			 deps/zlib/gzlib.o \
-			 deps/zlib/gzread.o \
-			 deps/zlib/gzwrite.o \
-			 deps/zlib/inffast.o \
-			 deps/zlib/inflate.o \
-			 deps/zlib/inftrees.o \
-			 deps/zlib/trees.o \
-			 deps/zlib/uncompr.o \
-			 deps/zlib/zutil.o \
-			 deps/zlib/ioapi.o \
-			 deps/zlib/unzip.o
+   OBJ += deps/zlib/adler32.o \
+          deps/zlib/compress.o \
+          deps/zlib/crc32.o \
+          deps/zlib/deflate.o \
+          deps/zlib/gzclose.o \
+          deps/zlib/gzlib.o \
+          deps/zlib/gzread.o \
+          deps/zlib/gzwrite.o \
+          deps/zlib/inffast.o \
+          deps/zlib/inflate.o \
+          deps/zlib/inftrees.o \
+          deps/zlib/trees.o \
+          deps/zlib/uncompr.o \
+          deps/zlib/zutil.o \
+          deps/zlib/ioapi.o \
+          deps/zlib/unzip.o
 else
 ifeq ($(HAVE_ZLIB),1)
 ZLIB_OBJS = deps/zlib/unzip.o \
-				deps/zlib/ioapi.o
+            deps/zlib/ioapi.o
 OBJ += $(ZLIB_OBJS)
 HAVE_ZLIB_DEFLATE = 1
 endif
@@ -854,8 +856,8 @@ endif
 ifneq ($(findstring Win32,$(OS)),)
    OBJ += media/rarch.o \
           input/drivers_keyboard/keyboard_event_win32.o \
-			 gfx/common/win32_common.o \
-			 frontend/drivers/platform_win32.o
+          gfx/common/win32_common.o \
+          frontend/drivers/platform_win32.o
 endif
 
 ifeq ($(HAVE_AVFOUNDATION), 1)
@@ -871,7 +873,7 @@ endif
 
 ifeq ($(HAVE_FFMPEG), 1)
    OBJ += record/drivers/record_ffmpeg.o \
-			 cores/ffmpeg_core.o
+          cores/ffmpeg_core.o
    LIBS += $(AVCODEC_LIBS) $(AVFORMAT_LIBS) $(AVUTIL_LIBS) $(SWSCALE_LIBS) $(SWRESAMPLE_LIBS) $(FFMPEG_LIBS)
    DEFINES += $(AVCODEC_CFLAGS) $(AVFORMAT_CFLAGS) $(AVUTIL_CFLAGS) $(SWSCALE_CFLAGS) $(SWRESAMPLE_CFLAGS)
 	DEFINES += -DHAVE_FFMPEG -Iffmpeg
@@ -884,10 +886,10 @@ endif
 ifeq ($(HAVE_COCOA),1)
 	DEFINES += -DHAVE_MAIN
 	OBJ += input/drivers/cocoa_input.o \
-			 input/drivers_keyboard/keyboard_event_apple.o \
-			 ui/drivers/ui_cocoa.o \
-			 ui/drivers/cocoa/cocoa_common.o \
-			 gfx/drivers_context/cocoa_gl_ctx.o
+               input/drivers_keyboard/keyboard_event_apple.o \
+               ui/drivers/ui_cocoa.o \
+               ui/drivers/cocoa/cocoa_common.o \
+               gfx/drivers_context/cocoa_gl_ctx.o
 endif