zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-25 03:00:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Makefile: remove ebacktrace1.dll as dependency to eduke32 and mapster32 and

Browse source 
add it to the 'all' target instead
source/midi.c: eliminate one 'variable set but not used' warning

git-svn-id: https://svn.eduke32.com/eduke32@2084 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2011-10-27 13:14:06 +00:00
parent d016dbd5e4
commit 53a670e1f0
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
polymer/eduke32/Makefile
View file

@ -219,9 +219,9 @@ OURCXXFLAGS+= $(BUILDCFLAGS)
ifeq ($(PLATFORM),WINDOWS) ifeq ($(PLATFORM),WINDOWS)
MISCLINKOPTS+= -Wl,--large-address-aware MISCLINKOPTS+= -Wl,--large-address-aware
endif endif
ifneq (0,$(KRANDDEBUG)) #ifneq (0,$(KRANDDEBUG))
MISCLINKOPTS+=-Wl,-Map=$@.memmap MISCLINKOPTS+=-Wl,-Map=$@.memmap
endif #endif
ifneq (0,$(PROFILER)) ifneq (0,$(PROFILER))
MISCLINKOPTS+=-pg MISCLINKOPTS+=-pg
endif endif
@ -233,7 +233,7 @@ endif
# TARGETS # TARGETS
all: notice eduke32$(EXESUFFIX) mapster32$(EXESUFFIX) all: notice eduke32$(EXESUFFIX) mapster32$(EXESUFFIX) $(EBACKTRACEDLL_TARGET)
all: all:
$(BUILD_FINISHED) $(BUILD_FINISHED)
@ -243,7 +243,7 @@ all:
notice: notice:
$(BUILD_STARTED) $(BUILD_STARTED)
eduke32$(EXESUFFIX): $(GAMEOBJS) $(EOBJ)/$(ENGINELIB) $(JAUDIOLIBDIR)/$(JAUDIOLIB) $(ENETDIR)/$(ENETLIB) $(EBACKTRACEDLL_TARGET) eduke32$(EXESUFFIX): $(GAMEOBJS) $(EOBJ)/$(ENGINELIB) $(JAUDIOLIBDIR)/$(JAUDIOLIB) $(ENETDIR)/$(ENETLIB)
$(LINK_STATUS) $(LINK_STATUS)
if $(CC) $(CFLAGS) $(OURCFLAGS) -o $@ $^ $(LIBS) $(STDCPPLIB) $(MISCLINKOPTS); then $(LINK_OK); else $(LINK_FAILED); fi if $(CC) $(CFLAGS) $(OURCFLAGS) -o $@ $^ $(LIBS) $(STDCPPLIB) $(MISCLINKOPTS); then $(LINK_OK); else $(LINK_FAILED); fi
ifeq (1,$(RELEASE)) ifeq (1,$(RELEASE))
@ -252,7 +252,7 @@ ifeq (1,$(RELEASE))
endif endif
endif endif
mapster32$(EXESUFFIX): $(EDITOROBJS) $(EOBJ)/$(EDITORLIB) $(EOBJ)/$(ENGINELIB) $(JAUDIOLIBDIR)/$(JAUDIOLIB) $(EBACKTRACEDLL_TARGET) mapster32$(EXESUFFIX): $(EDITOROBJS) $(EOBJ)/$(EDITORLIB) $(EOBJ)/$(ENGINELIB) $(JAUDIOLIBDIR)/$(JAUDIOLIB)
$(LINK_STATUS) $(LINK_STATUS)
if $(CC) $(CFLAGS) $(OURCFLAGS) -o $@ $^ $(LIBS) $(STDCPPLIB) $(MISCLINKOPTS); then $(LINK_OK); else $(LINK_FAILED); fi if $(CC) $(CFLAGS) $(OURCFLAGS) -o $@ $^ $(LIBS) $(STDCPPLIB) $(MISCLINKOPTS); then $(LINK_OK); else $(LINK_FAILED); fi
ifeq (1,$(RELEASE)) ifeq (1,$(RELEASE))

4
polymer/eduke32/source/midi.c
View file

@ -1716,7 +1716,7 @@ static void _MIDI_InitEMIDI
{ {
int32_t event; int32_t event;
int32_t command; int32_t command;
int32_t channel; // int32_t channel;
int32_t length; int32_t length;
int32_t IncludeFound; int32_t IncludeFound;
track *Track; track *Track;
@ -1807,7 +1807,7 @@ static void _MIDI_InitEMIDI
Track->pos--; Track->pos--;
} }
channel = GET_MIDI_CHANNEL(event); // channel = GET_MIDI_CHANNEL(event);
command = GET_MIDI_COMMAND(event); command = GET_MIDI_COMMAND(event);
length = _MIDI_CommandLengths[ command ]; length = _MIDI_CommandLengths[ command ];