claunia/VARCem
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Whoops, forgot to update Makefiles for non-PNG systems.

Browse Source
This commit is contained in:
waltje
2018-09-02 18:55:02 -04:00
parent 0b515cf2d9
commit cc9d210559
3 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/png.c
View File

@@ -377,7 +377,7 @@ error:
* image to the normal top-down mode. * image to the normal top-down mode.
*/ */
for (y = 0; y < h; y++) { 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. */ /* Get pointer to pixel in bitmap data. */
b = &pix[((y * w) + x) * 4]; b = &pix[((y * w) + x) * 4];

18
src/win/mingw/Makefile.MinGW
View File

@@ -8,7 +8,7 @@
# #
# Makefile for Windows systems using the MinGW32 environment. # 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> # Author: Fred N. van Kempen, <decwiz@yahoo.com>
# #
@@ -364,6 +364,7 @@ endif
# Optional modules. # Optional modules.
MISCOBJ :=
ifeq ($(DYNAREC), y) ifeq ($(DYNAREC), y)
OPTS += -DUSE_DYNAREC OPTS += -DUSE_DYNAREC
RFLAGS += -DUSE_DYNAREC RFLAGS += -DUSE_DYNAREC
@@ -381,12 +382,12 @@ endif
ifeq ($(FLUIDSYNTH), y) ifeq ($(FLUIDSYNTH), y)
OPTS += -DUSE_FLUIDSYNTH OPTS += -DUSE_FLUIDSYNTH
FSYNTHOBJ := midi_fluidsynth.o MISCOBJ += midi_fluidsynth.o
endif endif
ifeq ($(MUNT), y) ifeq ($(MUNT), y)
OPTS += -DUSE_MUNT OPTS += -DUSE_MUNT
MUNTOBJ := midi_mt32.o \ MISCOBJ += midi_mt32.o \
Analog.o BReverbModel.o File.o FileStream.o LA32Ramp.o \ Analog.o BReverbModel.o File.o FileStream.o LA32Ramp.o \
LA32FloatWaveGenerator.o LA32WaveGenerator.o \ LA32FloatWaveGenerator.o LA32WaveGenerator.o \
MidiStreamParser.o Part.o Partial.o PartialManager.o \ MidiStreamParser.o Part.o Partial.o PartialManager.o \
@@ -449,7 +450,7 @@ ifneq ($(VNC), n)
ifeq ($(VNC), y) ifeq ($(VNC), y)
LIBS += -lvncserver LIBS += -lvncserver
endif endif
VNCOBJ := vnc.o vnc_keymap.o MISCOBJ += vnc.o vnc_keymap.o
endif endif
# N=no, Y=yes,linked, D=yes,dynamic, S=yes,static # N=no, Y=yes,linked, D=yes,dynamic, S=yes,static
@@ -467,7 +468,7 @@ ifneq ($(RDP), n)
ifeq ($(RDP), y) ifeq ($(RDP), y)
LIBS += -lrdp LIBS += -lrdp
endif endif
RDPOBJ := rdp.o MISCOBJ += rdp.o
endif endif
# N=no, Y=yes,linked, D=yes,dynamic, S=yes,static # N=no, Y=yes,linked, D=yes,dynamic, S=yes,static
@@ -489,6 +490,7 @@ ifneq ($(PNG), n)
ifeq ($(PNG), y) ifeq ($(PNG), y)
LIBS += -lpng -lz LIBS += -lpng -lz
endif endif
MISCOBJ += png.o
endif endif
# N=no, Y=yes,linked, D=yes,dynamic, S=yes,static # 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. # # 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 \ MAINOBJ := pc.o config.o misc.o random.o timer.o io.o mem.o \
rom.o rom_load.o device.o nvr.o $(VNCOBJ) $(RDPOBJ) rom.o rom_load.o device.o nvr.o
UIOBJ += ui_main.o ui_new_image.o ui_stbar.o ui_vidapi.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) \ OBJ := $(MAINOBJ) $(CPUOBJ) $(MCHOBJ) $(SYSOBJ) $(DEVOBJ) \
$(INTELOBJ) $(FDDOBJ) $(CDROMOBJ) $(ZIPOBJ) $(HDDOBJ) \ $(INTELOBJ) $(FDDOBJ) $(CDROMOBJ) $(ZIPOBJ) $(HDDOBJ) \
$(USBOBJ) $(NETOBJ) $(SCSIOBJ) $(SNDOBJ) $(VIDOBJ) \ $(USBOBJ) $(NETOBJ) $(SCSIOBJ) $(SNDOBJ) $(VIDOBJ) \
$(UIOBJ) $(PLATOBJ) $(FSYNTHOBJ) $(MUNTOBJ) $(DEVBROBJ) $(UIOBJ) $(PLATOBJ) $(MISCOBJ) $(DEVBROBJ)
ifdef EXOBJ ifdef EXOBJ
OBJ += $(EXOBJ) OBJ += $(EXOBJ)
endif endif

17
src/win/msvc/Makefile.VC
View File

@@ -8,7 +8,7 @@
# #
# Makefile for Windows using Visual Studio 2015. # 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> # Author: Fred N. van Kempen, <decwiz@yahoo.com>
# #
@@ -337,6 +337,7 @@ endif
# Optional modules. # Optional modules.
MISCOBJ :=
ifeq ($(DYNAREC), y) ifeq ($(DYNAREC), y)
OPTS += -DUSE_DYNAREC OPTS += -DUSE_DYNAREC
RFLAGS += -DUSE_DYNAREC RFLAGS += -DUSE_DYNAREC
@@ -354,12 +355,12 @@ endif
ifeq ($(FLUIDSYNTH), y) ifeq ($(FLUIDSYNTH), y)
OPTS += -DUSE_FLUIDSYNTH OPTS += -DUSE_FLUIDSYNTH
FSYNTHOBJ := midi_fluidsynth.obj MISCOBJ += midi_fluidsynth.obj
endif endif
ifeq ($(MUNT), y) ifeq ($(MUNT), y)
OPTS += -DUSE_MUNT OPTS += -DUSE_MUNT
MUNTOBJ := midi_mt32.obj \ MISCOBJ += midi_mt32.obj \
Analog.obj BReverbModel.obj File.obj FileStream.obj \ Analog.obj BReverbModel.obj File.obj FileStream.obj \
LA32Ramp.obj LA32FloatWaveGenerator.obj \ LA32Ramp.obj LA32FloatWaveGenerator.obj \
LA32WaveGenerator.obj MidiStreamParser.obj Part.obj \ LA32WaveGenerator.obj MidiStreamParser.obj Part.obj \
@@ -423,7 +424,7 @@ ifneq ($(VNC), n)
ifeq ($(VNC), y) ifeq ($(VNC), y)
LIBS += libvncserver.lib LIBS += libvncserver.lib
endif endif
VNCOBJ := vnc.obj vnc_keymap.obj MISCOBJ += vnc.obj vnc_keymap.obj
endif endif
# N=no, Y=yes,linked, D=yes,dynamic, S=yes,static # N=no, Y=yes,linked, D=yes,dynamic, S=yes,static
@@ -441,7 +442,7 @@ ifneq ($(RDP), n)
ifeq ($(RDP), y) ifeq ($(RDP), y)
LIBS += rdpsrvr.lib LIBS += rdpsrvr.lib
endif endif
RDPOBJ := rdp.obj MISCOBJ += rdp.obj
endif endif
# N=no, Y=yes,linked, D=yes,dynamic, S=yes,static # N=no, Y=yes,linked, D=yes,dynamic, S=yes,static
@@ -463,6 +464,7 @@ ifneq ($(PNG), n)
ifeq ($(PNG), y) ifeq ($(PNG), y)
LIBS += libpng16_dll.lib #zlib.lib LIBS += libpng16_dll.lib #zlib.lib
endif endif
MISCOBJ += png.obj
endif endif
# N=no, Y=yes,linked, D=yes,dynamic, S=yes,static # 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) RESDLL := VARCem-$(LANG)
MAINOBJ := pc.obj config.obj misc.obj random.obj timer.obj io.obj \ 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 \ mem.obj rom.obj rom_load.obj device.obj nvr.obj
$(VNCOBJ) $(RDPOBJ)
UIOBJ += ui_main.obj ui_new_image.obj ui_stbar.obj ui_vidapi.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) \ OBJ := $(MAINOBJ) $(CPUOBJ) $(MCHOBJ) $(SYSOBJ) $(DEVOBJ) \
$(INTELOBJ) $(FDDOBJ) $(CDROMOBJ) $(ZIPOBJ) $(HDDOBJ) \ $(INTELOBJ) $(FDDOBJ) $(CDROMOBJ) $(ZIPOBJ) $(HDDOBJ) \
$(USBOBJ) $(NETOBJ) $(SCSIOBJ) $(SNDOBJ) $(VIDOBJ) \ $(USBOBJ) $(NETOBJ) $(SCSIOBJ) $(SNDOBJ) $(VIDOBJ) \
$(UIOBJ) $(PLATOBJ) $(FSYNTHOBJ) $(MUNTOBJ) $(DEVBROBJ) $(UIOBJ) $(PLATOBJ) $(MISCOBJ) $(DEVBROBJ)
ifdef EXOBJ ifdef EXOBJ
OBJ += $(EXOBJ) OBJ += $(EXOBJ)
endif endif