Merge pull request #1012 from heuripedes/master

Fix missing rarch.o object on windows

Makefile

@@ -155,6 +155,11 @@ $(OBJDIR)/%.o: %.S config.h config.mk $(HEADERS)
 	@$(if $(Q), $(shell echo echo AS $<),)
 	$(Q)$(CC) $(CFLAGS) $(ASFLAGS) $(DEFINES) -c -o $@ $<
 
+$(OBJDIR)/%.o: %.rc $(HEADERS)
+	@mkdir -p $(dir $@)
+	@$(if $(Q), $(shell echo echo WINDRES $<),)
+	$(Q)$(WINDRES) -o $@ $<
+
 install: $(TARGET)
 	rm -f $(OBJDIR)/git_version.o
 	mkdir -p $(DESTDIR)$(PREFIX)/bin 2>/dev/null || /bin/true

Makefile.common

@@ -584,8 +584,8 @@ ifeq ($(HAVE_NETPLAY), 1)
 endif
 
 ifneq ($(findstring Win32,$(OS)),)
-OBJ +=	media/rarch.o \
-			gfx/context/win32_common.o
+   OBJ += media/rarch.o \
+          gfx/context/win32_common.o
 endif
 
 # Record

qb/qb.comp.sh

@@ -52,3 +52,12 @@ EOF
 	echo "$ECHOBUF ... $CXX"
 	rm -f "$TEMP_CXX" "$TEMP_EXE"
 fi
+
+if [ "$OS" = "Win32" ]; then
+	ECHOBUF="Checking for windres"
+	if [ -z "$WINDRES" ]; then
+		WINDRES=$(which ${CROSS_COMPILE}windres)
+		[ "$WINDRES" ] || { echo "$ECHOBUF ... Not found. Exiting."; exit 1; }
+	fi
+	echo "$ECHOBUF ... $WINDRES"
+fi

qb/qb.libs.sh

@@ -232,6 +232,7 @@ create_config_make()
 			echo "CXX = $CXX"
 			echo "CXXFLAGS = $CXXFLAGS"
 		fi
+		echo "WINDRES = $WINDRES"
 		echo "ASFLAGS = $ASFLAGS"
 		echo "LDFLAGS = $LDFLAGS"
 		echo "INCLUDE_DIRS = $INCLUDE_DIRS"