From cc9d21055952731aa22bed51ebdd22bffc9c0be1 Mon Sep 17 00:00:00 2001
From: waltje <decwiz@yahoo.com>
Date: Sun, 2 Sep 2018 18:55:02 -0400
Subject: [PATCH] Whoops, forgot to update Makefiles for non-PNG systems.

---
 src/png.c                    |  2 +-
 src/win/mingw/Makefile.MinGW | 18 ++++++++++--------
 src/win/msvc/Makefile.VC     | 17 +++++++++--------
 3 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/src/png.c b/src/png.c
index f0a38b7..dc8d531 100644
--- a/src/png.c
+++ b/src/png.c
@@ -377,7 +377,7 @@ error:
      * image to the normal top-down mode.
      */
     for (y = 0; y < h; y++) {
-	for (x = 0; x < x; x++) {
+	for (x = 0; x < w; x++) {
 		/* Get pointer to pixel in bitmap data. */
                 b = &pix[((y * w) + x) * 4];
 
diff --git a/src/win/mingw/Makefile.MinGW b/src/win/mingw/Makefile.MinGW
index f9d6a92..ebddf36 100644
--- a/src/win/mingw/Makefile.MinGW
+++ b/src/win/mingw/Makefile.MinGW
@@ -8,7 +8,7 @@
 #
 #		Makefile for Windows systems using the MinGW32 environment.
 #
-# Version:	@(#)Makefile.mingw	1.0.57	2018/09/01
+# Version:	@(#)Makefile.mingw	1.0.58	2018/09/02
 #
 # Author:	Fred N. van Kempen, <decwiz@yahoo.com>
 #
@@ -364,6 +364,7 @@ endif
 
 
 # Optional modules.
+MISCOBJ		:=
 ifeq ($(DYNAREC), y)
  OPTS		+= -DUSE_DYNAREC
  RFLAGS		+= -DUSE_DYNAREC
@@ -381,12 +382,12 @@ endif
 
 ifeq ($(FLUIDSYNTH), y)
  OPTS		+= -DUSE_FLUIDSYNTH
- FSYNTHOBJ	:= midi_fluidsynth.o
+ MISCOBJ	+= midi_fluidsynth.o
 endif
 
 ifeq ($(MUNT), y)
  OPTS		+= -DUSE_MUNT
- MUNTOBJ	:= midi_mt32.o \
+ MISCOBJ	+= midi_mt32.o \
 		    Analog.o BReverbModel.o File.o FileStream.o LA32Ramp.o \
 		    LA32FloatWaveGenerator.o LA32WaveGenerator.o \
 		    MidiStreamParser.o Part.o Partial.o PartialManager.o \
@@ -449,7 +450,7 @@ ifneq ($(VNC), n)
  ifeq ($(VNC), y)
   LIBS		+= -lvncserver
  endif
- VNCOBJ		:= vnc.o vnc_keymap.o
+ MISCOBJ	+= vnc.o vnc_keymap.o
 endif
 
 # N=no, Y=yes,linked, D=yes,dynamic, S=yes,static
@@ -467,7 +468,7 @@ ifneq ($(RDP), n)
  ifeq ($(RDP), y)
   LIBS		+= -lrdp
  endif
- RDPOBJ		:= rdp.o
+ MISCOBJ	+= rdp.o
 endif
 
 # N=no, Y=yes,linked, D=yes,dynamic, S=yes,static
@@ -489,6 +490,7 @@ ifneq ($(PNG), n)
  ifeq ($(PNG), y)
   LIBS		+= -lpng -lz
  endif
+ MISCOBJ	+= png.o
 endif
 
 # N=no, Y=yes,linked, D=yes,dynamic, S=yes,static
@@ -571,8 +573,8 @@ CXXFLAGS	:= $(WX_FLAGS) $(OPTS) $(DFLAGS) $(COPTIM) $(AOPTIM) \
 #		Create the (final) list of objects to build.		#
 #########################################################################
 
-MAINOBJ		:= pc.o config.o misc.o random.o timer.o io.o mem.o png.o \
-		   rom.o rom_load.o device.o nvr.o $(VNCOBJ) $(RDPOBJ)
+MAINOBJ		:= pc.o config.o misc.o random.o timer.o io.o mem.o \
+		   rom.o rom_load.o device.o nvr.o
 
 UIOBJ		+= ui_main.o ui_new_image.o ui_stbar.o ui_vidapi.o
 
@@ -724,7 +726,7 @@ endif
 OBJ		:= $(MAINOBJ) $(CPUOBJ) $(MCHOBJ) $(SYSOBJ) $(DEVOBJ) \
 		   $(INTELOBJ) $(FDDOBJ) $(CDROMOBJ) $(ZIPOBJ) $(HDDOBJ) \
 		   $(USBOBJ) $(NETOBJ) $(SCSIOBJ) $(SNDOBJ) $(VIDOBJ) \
-		   $(UIOBJ) $(PLATOBJ) $(FSYNTHOBJ) $(MUNTOBJ) $(DEVBROBJ)
+		   $(UIOBJ) $(PLATOBJ) $(MISCOBJ) $(DEVBROBJ)
 ifdef EXOBJ
 OBJ		+= $(EXOBJ)
 endif
diff --git a/src/win/msvc/Makefile.VC b/src/win/msvc/Makefile.VC
index e320e70..bab1e7c 100644
--- a/src/win/msvc/Makefile.VC
+++ b/src/win/msvc/Makefile.VC
@@ -8,7 +8,7 @@
 #
 #		Makefile for Windows using Visual Studio 2015.
 #
-# Version:	@(#)Makefile.VC	1.0.43	2018/09/01
+# Version:	@(#)Makefile.VC	1.0.44	2018/09/02
 #
 # Author:	Fred N. van Kempen, <decwiz@yahoo.com>
 #
@@ -337,6 +337,7 @@ endif
 
 
 # Optional modules.
+MISCOBJ		:=
 ifeq ($(DYNAREC), y)
  OPTS		+= -DUSE_DYNAREC
  RFLAGS		+= -DUSE_DYNAREC
@@ -354,12 +355,12 @@ endif
 
 ifeq ($(FLUIDSYNTH), y)
  OPTS		+= -DUSE_FLUIDSYNTH
- FSYNTHOBJ	:= midi_fluidsynth.obj
+ MISCOBJ	+= midi_fluidsynth.obj
 endif
 
 ifeq ($(MUNT), y)
  OPTS		+= -DUSE_MUNT
- MUNTOBJ	:= midi_mt32.obj \
+ MISCOBJ	+= midi_mt32.obj \
 		    Analog.obj BReverbModel.obj File.obj FileStream.obj \
 		    LA32Ramp.obj LA32FloatWaveGenerator.obj \
 		    LA32WaveGenerator.obj MidiStreamParser.obj Part.obj \
@@ -423,7 +424,7 @@ ifneq ($(VNC), n)
  ifeq ($(VNC), y)
   LIBS		+= libvncserver.lib
  endif
- VNCOBJ		:= vnc.obj vnc_keymap.obj
+ MISCOBJ	+= vnc.obj vnc_keymap.obj
 endif
 
 # N=no, Y=yes,linked, D=yes,dynamic, S=yes,static
@@ -441,7 +442,7 @@ ifneq ($(RDP), n)
  ifeq ($(RDP), y)
   LIBS		+= rdpsrvr.lib
  endif
- RDPOBJ		:= rdp.obj
+ MISCOBJ	+= rdp.obj
 endif
 
 # N=no, Y=yes,linked, D=yes,dynamic, S=yes,static
@@ -463,6 +464,7 @@ ifneq ($(PNG), n)
  ifeq ($(PNG), y)
   LIBS		+= libpng16_dll.lib #zlib.lib
  endif
+ MISCOBJ	+= png.obj
 endif
 
 # N=no, Y=yes,linked, D=yes,dynamic, S=yes,static
@@ -541,8 +543,7 @@ CXXFLAGS	:= $(WX_FLAGS) $(OPTS) $(CXXOPTS) $(COPTS) $(DOPTS) $(AOPTIM) $(AFLAGS)
 RESDLL		:= VARCem-$(LANG)
 
 MAINOBJ		:= pc.obj config.obj misc.obj random.obj timer.obj io.obj \
-		   mem.obj rom.obj rom_load.obj device.obj nvr.obj png.obj \
-		   $(VNCOBJ) $(RDPOBJ)
+		   mem.obj rom.obj rom_load.obj device.obj nvr.obj
 
 UIOBJ		+= ui_main.obj ui_new_image.obj ui_stbar.obj ui_vidapi.obj
 
@@ -695,7 +696,7 @@ endif
 OBJ		:= $(MAINOBJ) $(CPUOBJ) $(MCHOBJ) $(SYSOBJ) $(DEVOBJ) \
 		   $(INTELOBJ) $(FDDOBJ) $(CDROMOBJ) $(ZIPOBJ) $(HDDOBJ) \
 		   $(USBOBJ) $(NETOBJ) $(SCSIOBJ) $(SNDOBJ) $(VIDOBJ) \
-		   $(UIOBJ) $(PLATOBJ) $(FSYNTHOBJ) $(MUNTOBJ) $(DEVBROBJ)
+		   $(UIOBJ) $(PLATOBJ) $(MISCOBJ) $(DEVBROBJ)
 ifdef EXOBJ
 OBJ		+= $(EXOBJ)
 endif