80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Various makefile.mingw indentation I missed

Browse Source
This commit is contained in:
Jasmine Iwanek
2022-11-15 14:02:57 -05:00
committed by GitHub
parent ad8b390782
commit d386bb9344
1 changed files with 134 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

269
src/win/Makefile.mingw
View File

@@ -15,16 +15,16 @@
# Various compile-time options. # Various compile-time options.
ifndef STUFF ifndef STUFF
STUFF := STUFF :=
endif endif
# Add feature selections here. # Add feature selections here.
ifndef EXTRAS ifndef EXTRAS
EXTRAS := EXTRAS :=
endif endif
ifndef DEV_BUILD ifndef DEV_BUILD
DEV_BUILD := n DEV_BUILD := n
endif endif
ifeq ($(DEV_BUILD), y) ifeq ($(DEV_BUILD), y)
@@ -153,22 +153,22 @@ endif
# Defaults for several build options (possibly defined in a chained file.) # Defaults for several build options (possibly defined in a chained file.)
ifndef AUTODEP ifndef AUTODEP
AUTODEP := n AUTODEP := n
endif endif
ifndef OPTIM ifndef OPTIM
OPTIM := n OPTIM := n
endif endif
ifndef RELEASE ifndef RELEASE
RELEASE := n RELEASE := n
endif endif
ifndef X64 ifndef X64
X64 := n X64 := n
endif endif
ifndef ARM ifndef ARM
ARM := n ARM := n
endif endif
ifndef ARM64 ifndef ARM64
ARM64 := n ARM64 := n
endif endif
ifndef DINPUT ifndef DINPUT
DINPUT := n DINPUT := n
@@ -238,42 +238,42 @@ VPATH := $(EXPATH) . $(CODEGEN) minitrace cpu \
sound/resid-fp sound/ymfm \ sound/resid-fp sound/ymfm \
scsi video network network/slirp win scsi video network network/slirp win
ifeq ($(X64), y) ifeq ($(X64), y)
TOOL_PREFIX := x86_64-w64-mingw32- TOOL_PREFIX := x86_64-w64-mingw32-
else else
TOOL_PREFIX := i686-w64-mingw32- TOOL_PREFIX := i686-w64-mingw32-
endif endif
WINDRES := windres WINDRES := windres
STRIP := strip STRIP := strip
ifeq ($(ARM64), y) ifeq ($(ARM64), y)
WINDRES := aarch64-w64-mingw32-windres WINDRES := aarch64-w64-mingw32-windres
STRIP := aarch64-w64-mingw32-strip STRIP := aarch64-w64-mingw32-strip
endif endif
ifeq ($(ARM), y) ifeq ($(ARM), y)
WINDRES := armv7-w64-mingw32-windres WINDRES := armv7-w64-mingw32-windres
STRIP := armv7-w64-mingw32-strip STRIP := armv7-w64-mingw32-strip
endif endif
ifeq ($(CLANG), y) ifeq ($(CLANG), y)
CPP := clang++ CPP := clang++
CC := clang CC := clang
ifeq ($(ARM64), y) ifeq ($(ARM64), y)
CPP := aarch64-w64-mingw32-clang++ CPP := aarch64-w64-mingw32-clang++
CC := aarch64-w64-mingw32-clang CC := aarch64-w64-mingw32-clang
endif endif
ifeq ($(ARM), y) ifeq ($(ARM), y)
CPP := armv7-w64-mingw32-clang++ CPP := armv7-w64-mingw32-clang++
CC := armv7-w64-mingw32-clang CC := armv7-w64-mingw32-clang
endif endif
else else
CPP := ${TOOL_PREFIX}g++ CPP := ${TOOL_PREFIX}g++
CC := ${TOOL_PREFIX}gcc CC := ${TOOL_PREFIX}gcc
ifeq ($(ARM64), y) ifeq ($(ARM64), y)
CPP := aarch64-w64-mingw32-g++ CPP := aarch64-w64-mingw32-g++
CC := aarch64-w64-mingw32-gcc CC := aarch64-w64-mingw32-gcc
endif endif
ifeq ($(ARM), y) ifeq ($(ARM), y)
CPP := armv7-w64-mingw32-g++ CPP := armv7-w64-mingw32-g++
CC := armv7-w64-mingw32-gcc CC := armv7-w64-mingw32-gcc
endif endif
endif endif
DEPS = -MMD -MF $*.d -c $< DEPS = -MMD -MF $*.d -c $<
DEPFILE := win/.depends DEPFILE := win/.depends
@@ -283,10 +283,10 @@ OPTS := $(EXTRAS) $(STUFF)
OPTS += -Iinclude -Iinclude_make \ OPTS += -Iinclude -Iinclude_make \
-iquote $(CODEGEN) -iquote cpu -iquote $(CODEGEN) -iquote cpu
ifdef EXFLAGS ifdef EXFLAGS
OPTS += $(EXFLAGS) OPTS += $(EXFLAGS)
endif endif
ifdef EXINC ifdef EXINC
OPTS += -I$(EXINC) OPTS += -I$(EXINC)
endif endif
ifeq ($(OPTIM), y) ifeq ($(OPTIM), y)
DFLAGS := -march=native DFLAGS := -march=native
@@ -329,15 +329,15 @@ ifeq ($(ARM64), y)
endif endif
RFLAGS := --input-format=rc -O coff -Iinclude -Iinclude_make RFLAGS := --input-format=rc -O coff -Iinclude -Iinclude_make
ifeq ($(RELEASE), y) ifeq ($(RELEASE), y)
OPTS += -DRELEASE_BUILD OPTS += -DRELEASE_BUILD
RFLAGS += -DRELEASE_BUILD RFLAGS += -DRELEASE_BUILD
endif endif
# Optional modules. # Optional modules.
ifeq ($(DYNAREC), y) ifeq ($(DYNAREC), y)
OPTS += -DUSE_DYNAREC OPTS += -DUSE_DYNAREC
RFLAGS += -DUSE_DYNAREC RFLAGS += -DUSE_DYNAREC
ifeq ($(NEW_DYNAREC), y) ifeq ($(NEW_DYNAREC), y)
OPTS += -DUSE_NEW_DYNAREC OPTS += -DUSE_NEW_DYNAREC
@@ -384,129 +384,128 @@ else
endif endif
ifeq ($(FLUIDSYNTH), y) ifeq ($(FLUIDSYNTH), y)
OPTS += -DUSE_FLUIDSYNTH OPTS += -DUSE_FLUIDSYNTH
FSYNTHOBJ := midi_fluidsynth.o FSYNTHOBJ := midi_fluidsynth.o
endif endif
ifeq ($(MUNT), y) ifeq ($(MUNT), y)
OPTS += -DUSE_MUNT OPTS += -DUSE_MUNT
MUNTOBJ := midi_mt32.o \ MUNTOBJ := midi_mt32.o \
Analog.o BReverbModel.o Display.o File.o FileStream.o LA32Ramp.o \ Analog.o BReverbModel.o Display.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 \
Poly.o ROMInfo.o SampleRateConverter.o \ Poly.o ROMInfo.o SampleRateConverter.o \
FIRResampler.o IIR2xResampler.o LinearResampler.o ResamplerModel.o \ FIRResampler.o IIR2xResampler.o LinearResampler.o ResamplerModel.o \
SincResampler.o InternalResampler.o \ SincResampler.o InternalResampler.o \
Synth.o Tables.o TVA.o TVF.o TVP.o sha1.o c_interface.o Synth.o Tables.o TVA.o TVF.o TVP.o sha1.o c_interface.o
endif endif
ifeq ($(CPPTHREADS), y) ifeq ($(CPPTHREADS), y)
THREADOBJ := thread.o THREADOBJ := thread.o
else else
THREADOBJ := win_thread.o THREADOBJ := win_thread.o
endif endif
ifeq ($(VNC), y) ifeq ($(VNC), y)
OPTS += -DUSE_VNC OPTS += -DUSE_VNC
RFLAGS += -DUSE_VNC RFLAGS += -DUSE_VNC
ifneq ($(VNC_PATH), ) ifneq ($(VNC_PATH), )
OPTS += -I$(VNC_PATH)\INCLUDE OPTS += -I$(VNC_PATH)\INCLUDE
VNCLIB := -L$(VNC_PATH)\LIB VNCLIB := -L$(VNC_PATH)\LIB
endif endif
VNCLIB += -lvncserver VNCLIB += -lvncserver
VNCOBJ := vnc.o vnc_keymap.o VNCOBJ := vnc.o vnc_keymap.o
endif endif
ifeq ($(MINITRACE), y) ifeq ($(MINITRACE), y)
OPTS += -DMTR_ENABLED OPTS += -DMTR_ENABLED
RFLAGS += -DMTR_ENABLED RFLAGS += -DMTR_ENABLED
MINITRACEOBJ := minitrace.o MINITRACEOBJ := minitrace.o
endif endif
ifeq ($(FAUDIO), y) ifeq ($(FAUDIO), y)
OPTS += -DUSE_FAUDIO OPTS += -DUSE_FAUDIO
endif endif
# Options for the DEV branch. # Options for the DEV branch.
ifeq ($(DEV_BRANCH), y) ifeq ($(DEV_BRANCH), y)
OPTS += -DDEV_BRANCH OPTS += -DDEV_BRANCH
RFLAGS += -DDEV_BRANCH RFLAGS += -DDEV_BRANCH
DEVBROBJ := DEVBROBJ :=
ifeq ($(AMD_K5), y) ifeq ($(AMD_K5), y)
OPTS += -DUSE_AMD_K5 OPTS += -DUSE_AMD_K5
endif endif
ifeq ($(AN430TX), y) ifeq ($(AN430TX), y)
OPTS += -DUSE_AN430TX OPTS += -DUSE_AN430TX
endif endif
ifeq ($(CYRIX_6X86), y) ifeq ($(CYRIX_6X86), y)
OPTS += -DUSE_CYRIX_6X86 OPTS += -DUSE_CYRIX_6X86
endif endif
ifeq ($(DESKPRO386), y) ifeq ($(DESKPRO386), y)
OPTS += -DUSE_DESKPRO386 OPTS += -DUSE_DESKPRO386
endif endif
ifeq ($(GUSMAX), y) ifeq ($(GUSMAX), y)
OPTS += -DUSE_GUSMAX OPTS += -DUSE_GUSMAX
endif endif
ifeq ($(ISAMEM_RAMPAGE), y) ifeq ($(ISAMEM_RAMPAGE), y)
OPTS += -DUSE_ISAMEM_RAMPAGE OPTS += -DUSE_ISAMEM_RAMPAGE
endif endif
ifeq ($(ISAMEM_IAB), y) ifeq ($(ISAMEM_IAB), y)
OPTS += -DUSE_ISAMEM_IAB OPTS += -DUSE_ISAMEM_IAB
endif endif
ifeq ($(ISAMEM_BRAT), y) ifeq ($(ISAMEM_BRAT), y)
OPTS += -DUSE_ISAMEM_BRAT OPTS += -DUSE_ISAMEM_BRAT
endif endif
ifeq ($(LASERXT), y) ifeq ($(LASERXT), y)
OPTS += -DUSE_LASERXT OPTS += -DUSE_LASERXT
DEVBROBJ += m_xt_laserxt.o DEVBROBJ += m_xt_laserxt.o
endif endif
ifeq ($(MGA), y) ifeq ($(MGA), y)
OPTS += -DUSE_MGA OPTS += -DUSE_MGA
DEVBROBJ += vid_mga.o DEVBROBJ += vid_mga.o
endif endif
ifeq ($(OPEN_AT), y) ifeq ($(OPEN_AT), y)
OPTS += -DUSE_OPEN_AT OPTS += -DUSE_OPEN_AT
endif endif
ifeq ($(PAS16), y) ifeq ($(PAS16), y)
OPTS += -DUSE_PAS16 OPTS += -DUSE_PAS16
DEVBROBJ += snd_pas16.o DEVBROBJ += snd_pas16.o
endif endif
ifeq ($(SIO_DETECT), y) ifeq ($(SIO_DETECT), y)
OPTS += -DUSE_SIO_DETECT OPTS += -DUSE_SIO_DETECT
DEVBROBJ += sio_detect.o DEVBROBJ += sio_detect.o
endif endif
ifeq ($(VGAWONDER), y) ifeq ($(VGAWONDER), y)
OPTS += -DUSE_VGAWONDER OPTS += -DUSE_VGAWONDER
endif endif
ifeq ($(XL24), y) ifeq ($(XL24), y)
OPTS += -DUSE_XL24 OPTS += -DUSE_XL24
endif endif
ifeq ($(OLIVETTI), y) ifeq ($(OLIVETTI), y)
OPTS += -DUSE_OLIVETTI OPTS += -DUSE_OLIVETTI
DEVBROBJ += olivetti_eva.o DEVBROBJ += olivetti_eva.o
endif endif
ifeq ($(GDBSTUB), y)
OPTS += -DUSE_GDBSTUB
DEVBROBJ += gdbstub.o
endif
ifeq ($(GDBSTUB), y)
OPTS += -DUSE_GDBSTUB
DEVBROBJ += gdbstub.o
endif
endif endif
@@ -766,17 +765,17 @@ OBJ := $(MAINOBJ) $(CPUOBJ) $(CHIPSETOBJ) $(MCHOBJ) $(DEVOBJ) $(MEMOBJ) \
$(NETOBJ) $(PRINTOBJ) $(SCSIOBJ) $(SIOOBJ) $(SNDOBJ) $(VIDOBJ) $(VOODOOOBJ) \ $(NETOBJ) $(PRINTOBJ) $(SCSIOBJ) $(SIOOBJ) $(SNDOBJ) $(VIDOBJ) $(VOODOOOBJ) \
$(PLATOBJ) $(UIOBJ) $(FSYNTHOBJ) $(MUNTOBJ) $(DEVBROBJ) $(MINITRACEOBJ) $(THREADOBJ) $(PLATOBJ) $(UIOBJ) $(FSYNTHOBJ) $(MUNTOBJ) $(DEVBROBJ) $(MINITRACEOBJ) $(THREADOBJ)
ifdef EXOBJ ifdef EXOBJ
OBJ += $(EXOBJ) OBJ += $(EXOBJ)
endif endif
ifeq ($(OPENAL), y) ifeq ($(OPENAL), y)
LIBS := -mwindows -lopenal -lcomctl32 -lSDL2 -limagehlp -ldinput8 -ldxguid -ldxerr8 -luser32 -lgdi32 -lwinmm -limm32 -lole32 -loleaut32 -lshell32 -lversion -luuid -lws2_32 LIBS := -mwindows -lopenal -lcomctl32 -lSDL2 -limagehlp -ldinput8 -ldxguid -ldxerr8 -luser32 -lgdi32 -lwinmm -limm32 -lole32 -loleaut32 -lshell32 -lversion -luuid -lws2_32
else else
ifeq ($(FAUDIO), y) ifeq ($(FAUDIO), y)
LIBS := -mwindows -lfaudio -lcomctl32 -lSDL2 -limagehlp -ldinput8 -ldxguid -ldxerr8 -luser32 -lgdi32 -lwinmm -limm32 -lole32 -loleaut32 -lshell32 -lversion -luuid -lws2_32 LIBS := -mwindows -lfaudio -lcomctl32 -lSDL2 -limagehlp -ldinput8 -ldxguid -ldxerr8 -luser32 -lgdi32 -lwinmm -limm32 -lole32 -loleaut32 -lshell32 -lversion -luuid -lws2_32
else else
LIBS := -mwindows -lcomctl32 -lSDL2 -limagehlp -ldinput8 -ldxguid -ldxerr8 -luser32 -lgdi32 -lwinmm -limm32 -lole32 -loleaut32 -lshell32 -lversion -luuid -lws2_32 LIBS := -mwindows -lcomctl32 -lSDL2 -limagehlp -ldinput8 -ldxguid -ldxerr8 -luser32 -lgdi32 -lwinmm -limm32 -lole32 -loleaut32 -lshell32 -lversion -luuid -lws2_32
endif endif
endif endif
ifeq ($(RTMIDI), y) ifeq ($(RTMIDI), y)
@@ -786,16 +785,16 @@ ifeq ($(RTMIDI), y)
endif endif
ifeq ($(VNC), y) ifeq ($(VNC), y)
LIBS += $(VNCLIB) -lws2_32 LIBS += $(VNCLIB) -lws2_32
endif endif
LIBS += -lpng -lz -lwsock32 -liphlpapi -lpsapi -lhid -lsetupapi -luxtheme -static -lstdc++ LIBS += -lpng -lz -lwsock32 -liphlpapi -lpsapi -lhid -lsetupapi -luxtheme -static -lstdc++
ifneq ($(X64), y) ifneq ($(X64), y)
ifneq ($(ARM64), y) ifneq ($(ARM64), y)
LIBS += -Wl,--large-address-aware LIBS += -Wl,--large-address-aware
endif endif
endif endif
ifeq ($(ARM64), y) ifeq ($(ARM64), y)
LIBS += -lgcc LIBS += -lgcc
endif endif
ifeq ($(DINPUT), y) ifeq ($(DINPUT), y)
LIBS += -ldinput8 LIBS += -ldinput8