Merge pull request #17807 from pstef/fixes

Author: LibretroAdmin

Makefile

@@ -312,13 +312,10 @@ uninstall:
 	rm -rf $(DESTDIR)$(ASSETS_DIR)
 
 clean:
-ifneq ($(V),1)
-	@echo RM
-else
-	rm -rf $(OBJDIR_BASE)
-	rm -f $(TARGET)
-	rm -f *.d
-endif
+	@$(if $(Q), echo $@,)
+	$(Q)rm -rf $(OBJDIR_BASE)
+	$(Q)rm -f $(TARGET)
+	$(Q)rm -f *.d
 
 .PHONY: all install uninstall clean
 

Makefile.miyoo

@@ -223,13 +223,10 @@ $(OBJDIR)/%.o: %.S $(HEADERS)
 	$(Q)$(CC) $(CFLAGS) $(ASFLAGS) $(DEFINES) -c -o $@ $<
 
 clean:
-ifneq ($(V),1)
-	@echo RM
-else
-	rm -rf $(OBJDIR_BASE)
-	rm -f $(TARGET)
-	rm -f *.d
-endif
+	@$(if $(Q), echo $@,)
+	$(Q)rm -rf $(OBJDIR_BASE)
+	$(Q)rm -f $(TARGET)
+	$(Q)rm -f *.d
 
 .PHONY: all clean
 

Makefile.ngc

@@ -288,13 +288,10 @@ $(EXT_INTER_TARGET): $(OBJ)
 	$(Q)$(LD) -r -b binary $(OBJOUT)$@ $<
 
 clean:
-ifneq ($(V),1)
-	@echo RM
-else
-	rm -f $(EXT_TARGET)
-	rm -f $(EXT_INTER_TARGET)
-	rm -f $(OBJ)
-endif
+	@$(if $(Q), echo $@,)
+	$(Q)rm -f $(EXT_TARGET)
+	$(Q)rm -f $(EXT_INTER_TARGET)
+	$(Q)rm -f $(OBJ)
 
 .PHONY: clean
 

Makefile.retrofw

@@ -237,14 +237,11 @@ $(OBJDIR)/%.o: %.S $(HEADERS)
 	$(Q)$(CC) $(CFLAGS) $(ASFLAGS) $(DEFINES) -c -o $@ $<
 
 clean:
-ifneq ($(V),1)
-	@echo RM
-else
-	rm -rf $(OBJDIR_BASE)
-	rm -f $(TARGET)
-	rm -f *.d
-	rm -rf $(OPK_NAME)
-endif
+	@$(if $(Q), echo $@,)
+	$(Q)rm -rf $(OBJDIR_BASE)
+	$(Q)rm -f $(TARGET)
+	$(Q)rm -f *.d
+	$(Q)rm -rf $(OPK_NAME)
 
 opk: $(TARGET)
 	echo "$$DESKTOP_ENTRY" > default.retrofw.desktop

Makefile.rs90

@@ -239,12 +239,11 @@ $(OBJDIR)/%.o: %.S $(HEADERS)
 	$(Q)$(CC) $(CFLAGS) $(ASFLAGS) $(DEFINES) -c -o $@ $<
 
 clean:
-ifneq ($(V),1)
-	rm -rf $(OBJDIR_BASE)
-	rm -f $(TARGET)
-	rm -f *.d
-	rm -rf $(OPK_NAME)
-endif
+	@$(if $(Q), echo $@,)
+	$(Q)rm -rf $(OBJDIR_BASE)
+	$(Q)rm -f $(TARGET)
+	$(Q)rm -f *.d
+	$(Q)rm -rf $(OPK_NAME)
 
 opk: $(TARGET)
 	echo "$$DESKTOP_ENTRY" > default.rs90.desktop

Makefile.webos

@@ -257,16 +257,13 @@ $(OBJDIR)/%.o: %.S $(HEADERS)
 	$(Q)$(CC) $(CFLAGS) $(ASFLAGS) $(DEFINES) -c -o $@ $<
 
 clean:
-ifneq ($(V),1)
-	@echo RM
-else
-	rm -rf $(OBJDIR_BASE)
-	rm -f $(TARGET)
-	rm -f *.d
-	rm -rf SDL
-	rm -rf webos/*.ipk
-	rm -rf webos/dist
-endif
+	@$(if $(Q), echo $@,)
+	$(Q)rm -rf $(OBJDIR_BASE)
+	$(Q)rm -f $(TARGET)
+	$(Q)rm -f *.d
+	$(Q)rm -rf SDL
+	$(Q)rm -rf webos/*.ipk
+	$(Q)rm -rf webos/dist
 
 sdl2: $(TARGET)
 ifeq ($(ADD_SDL2_LIB), 1)

Makefile.wii

@@ -312,14 +312,11 @@ $(APP_BOOTER_DIR)/app_booter.bin:
 	$(MAKE) -C $(APP_BOOTER_DIR)
 
 clean:
-ifneq ($(V),1)
-	@echo RM
-else
-	rm -f $(EXT_TARGET)
-	rm -f $(EXT_INTER_TARGET)
-	rm -f $(OBJ)
-	$(MAKE) -C $(APP_BOOTER_DIR) clean
-endif
+	@$(if $(Q), echo $@,)
+	$(Q)rm -f $(EXT_TARGET)
+	$(Q)rm -f $(EXT_INTER_TARGET)
+	$(Q)rm -f $(OBJ)
+	$(Q)$(MAKE) -C $(APP_BOOTER_DIR) clean
 
 .PHONY: clean
 

camera/drivers/ffmpeg.c

@@ -275,7 +275,6 @@ static void ffmpeg_camera_poll_thread(void *data);
 
 static bool ffmpeg_camera_start(void *data)
 {
-   const settings_t *settings = config_get_ptr();
    ffmpeg_camera_t *ffmpeg = data;
    int result = 0;
    AVStream *stream = NULL;

menu/menu_setting.c

@@ -817,8 +817,8 @@ static size_t setting_get_string_representation_size_in_mb(
       rarch_setting_t *setting, char *s, size_t len)
 {
    if (setting)
-      return snprintf(s, len, "%ju", (uintmax_t)
-            ((*setting->value.target.sizet) / (1024 * 1024)));
+      return snprintf(s, len, "%" PRI_SIZET,
+            (*setting->value.target.sizet) / (1024 * 1024));
    return 0;
 }
 

ui/drivers/ui_qt.cpp

@@ -14,6 +14,7 @@
  * If not, see <http://www.gnu.org/licenses/>.
  */
 
+#define WIN32_LEAN_AND_MEAN
 #include <QApplication>
 #include <QAbstractEventDispatcher>
 #include <QtWidgets>