Fix Win32 build.

This commit is contained in:
Themaister 2013-04-26 15:10:52 +02:00
parent 40d8a42886
commit 3417097484
2 changed files with 6 additions and 2 deletions

View File

@ -42,7 +42,7 @@ JOBJ := conf/config_file.o \
tools/retroarch-joyconfig.o \
compat/compat.o \
file_path.o \
input/input_common.o \
tools/input_common_joyconfig.o \
input/dinput.o
CC = gcc
@ -254,6 +254,10 @@ $(TARGET): $(OBJ)
@$(if $(Q), $(shell echo echo CC $<),)
$(Q)$(CC) $(CFLAGS) $(DEFINES) -c -o $@ $<
tools/input_common_joyconfig.o: input/input_common.c
@$(if $(Q), $(shell echo echo CC $<),)
$(Q)$(CC) $(CFLAGS) $(DEFINES) -DIS_JOYCONFIG -c -o $@ $<
%.o: %.cpp
@$(if $(Q), $(shell echo echo CXX $<),)
$(Q)$(CXX) $(CXXFLAGS) $(DEFINES) -c -o $@ $<

View File

@ -557,7 +557,7 @@ static bool dinput_joypad_query_pad(unsigned pad)
static const char *dinput_joypad_name(unsigned pad)
{
(unsigned)pad;
(void)pad;
// FIXME
return NULL;
}