diff --git a/polymer/eduke32/Makefile b/polymer/eduke32/Makefile index b79ea9e50..0eb58fec2 100644 --- a/polymer/eduke32/Makefile +++ b/polymer/eduke32/Makefile @@ -219,9 +219,9 @@ OURCXXFLAGS+= $(BUILDCFLAGS) ifeq ($(PLATFORM),WINDOWS) MISCLINKOPTS+= -Wl,--large-address-aware endif -ifneq (0,$(KRANDDEBUG)) +#ifneq (0,$(KRANDDEBUG)) MISCLINKOPTS+=-Wl,-Map=$@.memmap -endif +#endif ifneq (0,$(PROFILER)) MISCLINKOPTS+=-pg endif @@ -233,7 +233,7 @@ endif # TARGETS -all: notice eduke32$(EXESUFFIX) mapster32$(EXESUFFIX) +all: notice eduke32$(EXESUFFIX) mapster32$(EXESUFFIX) $(EBACKTRACEDLL_TARGET) all: $(BUILD_FINISHED) @@ -243,7 +243,7 @@ all: notice: $(BUILD_STARTED) -eduke32$(EXESUFFIX): $(GAMEOBJS) $(EOBJ)/$(ENGINELIB) $(JAUDIOLIBDIR)/$(JAUDIOLIB) $(ENETDIR)/$(ENETLIB) $(EBACKTRACEDLL_TARGET) +eduke32$(EXESUFFIX): $(GAMEOBJS) $(EOBJ)/$(ENGINELIB) $(JAUDIOLIBDIR)/$(JAUDIOLIB) $(ENETDIR)/$(ENETLIB) $(LINK_STATUS) if $(CC) $(CFLAGS) $(OURCFLAGS) -o $@ $^ $(LIBS) $(STDCPPLIB) $(MISCLINKOPTS); then $(LINK_OK); else $(LINK_FAILED); fi ifeq (1,$(RELEASE)) @@ -252,7 +252,7 @@ ifeq (1,$(RELEASE)) endif endif -mapster32$(EXESUFFIX): $(EDITOROBJS) $(EOBJ)/$(EDITORLIB) $(EOBJ)/$(ENGINELIB) $(JAUDIOLIBDIR)/$(JAUDIOLIB) $(EBACKTRACEDLL_TARGET) +mapster32$(EXESUFFIX): $(EDITOROBJS) $(EOBJ)/$(EDITORLIB) $(EOBJ)/$(ENGINELIB) $(JAUDIOLIBDIR)/$(JAUDIOLIB) $(LINK_STATUS) if $(CC) $(CFLAGS) $(OURCFLAGS) -o $@ $^ $(LIBS) $(STDCPPLIB) $(MISCLINKOPTS); then $(LINK_OK); else $(LINK_FAILED); fi ifeq (1,$(RELEASE)) diff --git a/polymer/eduke32/source/midi.c b/polymer/eduke32/source/midi.c index f72643d55..d6944ffa0 100644 --- a/polymer/eduke32/source/midi.c +++ b/polymer/eduke32/source/midi.c @@ -1716,7 +1716,7 @@ static void _MIDI_InitEMIDI { int32_t event; int32_t command; - int32_t channel; +// int32_t channel; int32_t length; int32_t IncludeFound; track *Track; @@ -1807,7 +1807,7 @@ static void _MIDI_InitEMIDI Track->pos--; } - channel = GET_MIDI_CHANNEL(event); +// channel = GET_MIDI_CHANNEL(event); command = GET_MIDI_COMMAND(event); length = _MIDI_CommandLengths[ command ];