Merge pull request #3250 from sergiobenrocha2/master

Fix some pendantic lintian warnings
This commit is contained in:
Twinaphex 2016-07-21 04:46:35 +02:00 committed by GitHub
commit a2d277dcd2
11 changed files with 13 additions and 13 deletions

View File

@ -136,12 +136,12 @@ retroarch: $(RARCH_OBJ)
$(OBJDIR)/%.o: %.c config.h config.mk
@mkdir -p $(dir $@)
@$(if $(Q), $(shell echo echo CC $<),)
$(Q)$(CC) $(CFLAGS) $(DEFINES) -MMD -c -o $@ $<
$(Q)$(CC) $(CPPFLAGS) $(CFLAGS) $(DEFINES) -MMD -c -o $@ $<
$(OBJDIR)/%.o: %.cpp config.h config.mk
@mkdir -p $(dir $@)
@$(if $(Q), $(shell echo echo CXX $<),)
$(Q)$(CXX) $(CXXFLAGS) $(DEFINES) -MMD -c -o $@ $<
$(Q)$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(DEFINES) -MMD -c -o $@ $<
$(OBJDIR)/%.o: %.m
@mkdir -p $(dir $@)

View File

@ -18,7 +18,7 @@ So we will use
First we will clone and build the kernel:
git clone https://github.com/mireq/linux-sunxi.git -b sunxi-3.4 --depth 1
Now we edit drivers/video/sunxi/disp/dev_fb.c, and uncoment the line 1074:
Now we edit drivers/video/sunxi/disp/dev_fb.c, and uncomment the line 1074:
// Fb_wait_for_vsync(info);
It is assumed you have a cross-compiler installed, so we configure and build the kernel and modules:

View File

@ -57,7 +57,7 @@ endif
CC := $(compiler) -Wall
CXX := $(subst CC,++,$(compiler)) -std=gnu++0x -Wall
flags := $(CFLAGS) -fPIC $(extra_flags) -I../../libretro-common/include
flags := $(CPPFLAGS) $(CFLAGS) -fPIC $(extra_flags) -I../../libretro-common/include
asflags := $(ASFLAGS) -fPIC $(extra_flags)
objects :=

View File

@ -224,7 +224,7 @@ static ssize_t alsa_write(void *data, const void *buf_, size_t size_)
return written;
else if (frames < 0)
{
RARCH_ERR("[ALSA]: Unknown error occured (%s).\n",
RARCH_ERR("[ALSA]: Unknown error occurred (%s).\n",
snd_strerror(frames));
return -1;
}

View File

@ -92,7 +92,7 @@ static void alsa_worker_thread(void *data)
}
else if (frames < 0)
{
RARCH_ERR("[ALSA]: Unknown error occured (%s).\n",
RARCH_ERR("[ALSA]: Unknown error occurred (%s).\n",
snd_strerror(frames));
break;
}

View File

@ -377,7 +377,7 @@ static void *dsound_init(const char *device, unsigned rate, unsigned latency)
return ds;
error:
RARCH_ERR("[DirectSound] Error occured in init.\n");
RARCH_ERR("[DirectSound] Error occurred in init.\n");
dsound_free(ds);
return NULL;
}

View File

@ -70,13 +70,13 @@ This option is only available if RetroArch is compiled with dynamic libretro loa
.TP
\fB--save PATH, -s PATH\fR
Overrides the path used for save ram (*.srm).
Without this flag, the save ram path will be inferred from the rom path name, and put in the same directory as the rom file with the extention replaced with '.srm'.
Without this flag, the save ram path will be inferred from the rom path name, and put in the same directory as the rom file with the extension replaced with '.srm'.
If PATH is a directory, RetroArch will treat this as the save file directory, where the save file name will be inferred from the rom name.
.TP
\fB--savestate PATH, -S PATH\fR
Overrides the path used for save states.
Without this flag, the save state path will be inferred from the rom path name, and put in the same directory as the rom file with the extention replace with '.state'.
Without this flag, the save state path will be inferred from the rom path name, and put in the same directory as the rom file with the extension replace with '.state'.
If PATH is a directory, RetroArch will treat this as the save state directory, where the state file name will be inferred from the rom name.
Do note that save states are bound to the libretro implementation being used. Using a different libretro could invalidate the save state file.

View File

@ -57,7 +57,7 @@ endif
CC := $(compiler)
CXX := $(subst CC,++,$(compiler))
flags := $(CFLAGS) -fPIC $(extra_flags) -I../../libretro-common/include
flags := $(CPPFLAGS) $(CFLAGS) -fPIC $(extra_flags) -I../../libretro-common/include
asflags := $(ASFLAGS) -fPIC $(extra_flags)
objects :=
flags += -std=c99

View File

@ -422,7 +422,7 @@ const char *msg_hash_to_str_pl(enum msg_hash_enums msg)
case MENU_ENUM_LABEL_VALUE_UI_MENUBAR_ENABLE:
return "Pasek menu";
case MENU_ENUM_LABEL_VALUE_ARCHIVE_MODE:
return "Archive File Assocation Action";
return "Archive File Association Action";
case MENU_ENUM_LABEL_VALUE_NETWORK_CMD_ENABLE:
return "Komendy sieciowe";
case MENU_ENUM_LABEL_VALUE_NETWORK_CMD_PORT:

View File

@ -2947,7 +2947,7 @@ const char *msg_hash_to_str_us(enum msg_hash_enums msg)
case MENU_ENUM_LABEL_VALUE_UI_MENUBAR_ENABLE:
return "Menubar";
case MENU_ENUM_LABEL_VALUE_ARCHIVE_MODE:
return "Archive File Assocation Action";
return "Archive File Association Action";
case MENU_ENUM_LABEL_VALUE_NETWORK_CMD_ENABLE:
return "Network Commands";
case MENU_ENUM_LABEL_VALUE_NETWORK_CMD_PORT:

View File

@ -953,7 +953,7 @@ static void netplay_flip_users(netplay_t *netplay)
netplay, NETPLAY_CMD_FLIP_PLAYERS,
&flip_frame_net, sizeof flip_frame_net,
CMD_OPT_HOST_ONLY | CMD_OPT_REQUIRE_SYNC,
"flip users", "Succesfully flipped users.\n");
"flip users", "Successfully flipped users.\n");
if(command)
{