Reorder files in Makefile.common

Makefile.common

@@ -110,6 +110,58 @@ ifneq ($(GIT_VERSION),)
 endif
 
 # General object files
+OBJ += libretro-common/algorithms/mismatch.o \
+       libretro-common/queues/task_queue.o \
+       libretro-common/queues/fifo_queue.o \
+       libretro-common/encodings/encoding_utf.o \
+       libretro-common/lists/file_list.o \
+       libretro-common/lists/dir_list.o \
+       libretro-common/file/retro_dirent.o \
+       libretro-common/streams/file_stream.o \
+		 libretro-common/streams/interface_stream.o \
+		 libretro-common/streams/memory_stream.o \
+       libretro-common/file/retro_stat.o \
+       libretro-common/lists/string_list.o \
+       libretro-common/string/stdstring.o \
+       libretro-common/memmap/memalign.o \
+       libretro-common/file/nbio/nbio_stdio.o \
+       libretro-common/file/file_path.o \
+       libretro-common/hash/rhash.o \
+       libretro-common/dynamic/dylib.o \
+       libretro-common/queues/message_queue.o \
+       libretro-common/compat/compat_fnmatch.o \
+       libretro-common/compat/compat_posix_string.o \
+       libretro-common/file/config_file.o \
+       libretro-common/gfx/scaler/scaler.o \
+       libretro-common/gfx/scaler/pixconv.o \
+       libretro-common/gfx/scaler/scaler_int.o \
+       libretro-common/gfx/scaler/scaler_filter.o \
+       libretro-common/features/features_cpu.o \
+		 libretro-common/formats/image_texture.o \
+		 libretro-common/conversion/s16_to_float.o \
+		 libretro-common/conversion/float_to_s16.o \
+       libretro-common/gfx/math/matrix_4x4.o \
+       libretro-common/gfx/math/matrix_3x3.o \
+       libretro-common/formats/json/jsonsax.o \
+		 libretro-common/formats/image_transfer.o
+
+ifneq ($(HAVE_GETOPT_LONG), 1)
+OBJ += libretro-common/compat/compat_getopt.o
+endif
+
+ifneq ($(HAVE_STRCASESTR), 1)
+OBJ += libretro-common/compat/compat_strcasestr.o
+endif
+
+ifneq ($(HAVE_STRL), 1)
+OBJ += libretro-common/compat/compat_strl.o
+endif
+
+ifeq ($(HAVE_NEON),1)
+   OBJ += libretro-common/conversion/s16_to_float_neon.o \
+			 libretro-common/conversion/float_to_s16_neon.o
+endif
+
 
 OBJ += frontend/frontend.o \
        frontend/frontend_driver.o \
@@ -124,30 +176,14 @@ OBJ += frontend/frontend.o \
        msg_hash.o \
        intl/msg_hash_us.o \
        runloop.o \
-		 libretro-common/algorithms/mismatch.o \
-       libretro-common/queues/task_queue.o \
        tasks/tasks_internal.o \
        tasks/task_content.o \
 		 tasks/task_save_ram.o \
 		 tasks/task_save_state.o \
        tasks/task_file_transfer.o \
        tasks/task_image.o \
-       libretro-common/encodings/encoding_utf.o \
-       libretro-common/lists/file_list.o \
-       libretro-common/lists/dir_list.o \
-       libretro-common/file/retro_dirent.o \
-       libretro-common/streams/file_stream.o \
-		 libretro-common/streams/interface_stream.o \
-		 libretro-common/streams/memory_stream.o \
-       libretro-common/file/retro_stat.o \
-       libretro-common/lists/string_list.o \
-       libretro-common/string/stdstring.o \
-       libretro-common/memmap/memalign.o \
        list_special.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 \
        gfx/video_coord_array.o \
@@ -156,10 +192,8 @@ OBJ += frontend/frontend.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 \
        managers/state_manager.o \
        gfx/drivers_font_renderer/bitmapfont.o \
        input/input_autodetect.o \
@@ -170,22 +204,14 @@ OBJ += frontend/frontend.o \
        tasks/task_overlay.o \
        input/input_overlay.o \
        patch.o \
-       libretro-common/queues/fifo_queue.o \
        managers/core_option_manager.o \
-       libretro-common/compat/compat_fnmatch.o \
-       libretro-common/compat/compat_posix_string.o \
        managers/cheat_manager.o \
        core_info.o \
-       libretro-common/file/config_file.o \
        config_file_userdata.o \
        tasks/task_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/video_filter.o \
        audio/audio_resampler_driver.o \
@@ -205,7 +231,6 @@ OBJ += frontend/frontend.o \
        movie.o \
        record/record_driver.o \
        record/drivers/record_null.o \
-       libretro-common/features/features_cpu.o \
        performance_counters.o \
        verbosity.o
 
@@ -232,19 +257,6 @@ OBJ +=	 menu/intl/menu_hash_de.o \
 endif
 endif
 
-ifneq ($(HAVE_GETOPT_LONG), 1)
-OBJ += libretro-common/compat/compat_getopt.o
-endif
-
-ifneq ($(HAVE_STRCASESTR), 1)
-OBJ += libretro-common/compat/compat_strcasestr.o
-endif
-
-ifneq ($(HAVE_STRL), 1)
-OBJ += libretro-common/compat/compat_strl.o
-endif
-
-OBJ += libretro-common/formats/image_texture.o
 
 ifeq ($(HAVE_IMAGEVIEWER), 1)
 DEFINES += -DHAVE_IMAGEVIEWER
@@ -392,12 +404,6 @@ ifeq ($(HAVE_NEON),1)
    DEFINES += -DSINC_LOWER_QUALITY
 endif
 
-OBJ += libretro-common/conversion/s16_to_float.o \
-		 libretro-common/conversion/float_to_s16.o
-ifeq ($(HAVE_NEON),1)
-   OBJ += libretro-common/conversion/s16_to_float_neon.o \
-			 libretro-common/conversion/float_to_s16_neon.o
-endif
 
 ifneq ($(findstring Win32,$(OS)),)
 HAVE_VULKAN=1
@@ -655,9 +661,7 @@ endif
 
 OBJ += gfx/video_context_driver.o \
        gfx/drivers_context/gfx_null_ctx.o \
-       gfx/video_state_tracker.o \
+       gfx/video_state_tracker.o
-       libretro-common/gfx/math/matrix_4x4.o \
-       libretro-common/gfx/math/matrix_3x3.o
 
 ifeq ($(HAVE_KMS), 1)
 	HAVE_AND_WILL_USE_DRM = 1
@@ -953,13 +957,10 @@ endif
 
 ifeq ($(HAVE_RBMP), 1)
 	DEFINES += -DHAVE_RBMP
-	OBJ += libretro-common/formats/bmp/rbmp.o
+	OBJ += libretro-common/formats/bmp/rbmp.o \
+			 libretro-common/formats/bmp/rbmp_encode.o
 endif
 
-OBJ += libretro-common/formats/bmp/rbmp_encode.o \
-       libretro-common/formats/json/jsonsax.o \
-		 libretro-common/formats/image_transfer.o
-
 ifdef HAVE_COMPRESSION
    DEFINES += -DHAVE_COMPRESSION
 endif
@@ -1035,7 +1036,8 @@ ifeq ($(HAVE_NETWORKING), 1)
    ifeq ($(HAVE_CHEEVOS), 1)
       ifeq ($(HAVE_THREADS), 1)
          DEFINES += -DHAVE_CHEEVOS
-         OBJ += cheevos.o libretro-common/utils/md5.o
+         OBJ += cheevos.o \
+					 libretro-common/utils/md5.o
       endif
    endif
 

tasks/task_screenshot.c

@@ -33,7 +33,9 @@
 #include <string/stdstring.h>
 #include <gfx/scaler/scaler.h>
 
+#ifdef HAVE_RBMP
 #include <formats/rbmp.h>
+#endif
 
 #if defined(HAVE_ZLIB_DEFLATE) && defined(HAVE_RPNG)
 #include <formats/rpng.h>
@@ -112,7 +114,7 @@ static bool screenshot_dump(
          width * 3
          );
    free(out_buffer);
-#else
+#elif defined(HAVE_RBMP)
    enum rbmp_source_type bmp_type = RBMP_SOURCE_TYPE_DONT_CARE;
 
    if (bgr24)