diff --git a/Makefile.griffin b/Makefile.griffin index f3a3756198..47bfd3a2f0 100644 --- a/Makefile.griffin +++ b/Makefile.griffin @@ -150,6 +150,9 @@ else ifeq ($(platform), vita) -lSceSysmodule_stub -lSceCtrl_stub -lSceAudio_stub \ -lSceRtc_stub -lz -lm -lc + PLATOBJS += audio/audio_utils_neon.o audio/drivers_resampler/sinc_neon.o \ + audio/drivers_resampler/cc_resampler_neon.o + HAVE_LIBRETRO_MANAGEMENT := 1 HAVE_RPNG := 1 HAVE_ZLIB := 1 @@ -163,7 +166,7 @@ OBJ = griffin/griffin.o $(PLATOBJS) INCLUDE += -I./libretro-common/include ifeq ($(HAVE_LOGGER), 1) -CFLAGS += -DHAVE_LOGGER +CFLAGS += -DHAVE_LOGGER CFLAGS += -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT) INCLUDE += -Ilogger/netlogger endif @@ -281,6 +284,9 @@ $(EXT_INTER_TARGET): $(OBJ) %.o: %.c $(CC) $(CFLAGS) -c -o $@ $< +%.o: %.S + $(CC) $(CFLAGS) -c -o $@ $< + %.bmpobj: %.bmp $(LD) -r -b binary -o $@ $< diff --git a/libretro-common/file/file_path.c b/libretro-common/file/file_path.c index 7fd3760f7c..c49fa315c1 100644 --- a/libretro-common/file/file_path.c +++ b/libretro-common/file/file_path.c @@ -77,7 +77,7 @@ * path_get_extension: * @path : path * - * Gets extension of file. Only '.'s + * Gets extension of file. Only '.'s * after the last slash are considered. * * Returns: extension part from the path. @@ -207,7 +207,7 @@ bool path_file_exists(const char *path) * fill_pathname: * @out_path : output path * @in_path : input path - * @replace : what to replace + * @replace : what to replace * @size : buffer size of output path * * FIXME: Verify @@ -219,10 +219,10 @@ bool path_file_exists(const char *path) * Only '.'s after the last slash are considered as extensions. * If no '.' is present, in_path and replace will simply be concatenated. * 'size' is buffer size of 'out_path'. - * E.g.: in_path = "/foo/bar/baz/boo.c", replace = ".asm" => - * out_path = "/foo/bar/baz/boo.asm" + * E.g.: in_path = "/foo/bar/baz/boo.c", replace = ".asm" => + * out_path = "/foo/bar/baz/boo.asm" * E.g.: in_path = "/foo/bar/baz/boo.c", replace = "" => - * out_path = "/foo/bar/baz/boo" + * out_path = "/foo/bar/baz/boo" */ void fill_pathname(char *out_path, const char *in_path, const char *replace, size_t size) @@ -243,7 +243,7 @@ void fill_pathname(char *out_path, const char *in_path, * fill_pathname_noext: * @out_path : output path * @in_path : input path - * @replace : what to replace + * @replace : what to replace * @size : buffer size of output path * * Appends a filename extension 'replace' to 'in_path', and outputs @@ -273,7 +273,7 @@ static char *find_last_slash(const char *str) return (char*)slash; } -/** +/** * fill_pathname_slash: * @path : path * @size : size of path @@ -327,7 +327,7 @@ void fill_pathname_dir(char *in_dir, const char *in_basename, /** * fill_pathname_base: - * @out : output path + * @out : output path * @in_path : input path * @size : size of output path * @@ -365,7 +365,7 @@ void fill_pathname_base(char *out, const char *in_path, size_t size) /** * fill_pathname_basedir: - * @out_dir : output directory + * @out_dir : output directory * @in_path : input path * @size : size of output directory * @@ -382,7 +382,7 @@ void fill_pathname_basedir(char *out_dir, /** * fill_pathname_parent_dir: - * @out_dir : output directory + * @out_dir : output directory * @in_dir : input directory * @size : size of output directory * @@ -402,10 +402,10 @@ void fill_pathname_parent_dir(char *out_dir, * @ext : extension of output filename * @size : buffer size of output filename * - * Creates a 'dated' filename prefixed by 'RetroArch', and + * Creates a 'dated' filename prefixed by 'RetroArch', and * concatenates extension (@ext) to it. * - * E.g.: + * E.g.: * out_filename = "RetroArch-{month}{day}-{Hours}{Minutes}.{@ext}" **/ void fill_dated_filename(char *out_filename, @@ -421,7 +421,7 @@ void fill_dated_filename(char *out_filename, /** * path_basedir: - * @path : path + * @path : path * * Extracts base directory by mutating path. * Keeps trailing '/'. @@ -559,6 +559,8 @@ static bool path_mkdir_norecurse(const char *dir) ret = _mkdir(dir); #elif defined(IOS) ret = mkdir(dir, 0755); +#elif defined(VITA) + ret = sceIoMkdir(dir, 0755); #else ret = mkdir(dir, 0750); #endif @@ -646,12 +648,12 @@ void fill_pathname_resolve_relative(char *out_path, /** * fill_pathname_join: * @out_path : output path - * @dir : directory + * @dir : directory * @path : path * @size : size of output path * * Joins a directory (@dir) and path (@path) together. - * Makes sure not to get two consecutive slashes + * Makes sure not to get two consecutive slashes * between directory and path. **/ void fill_pathname_join(char *out_path, @@ -668,12 +670,12 @@ void fill_pathname_join(char *out_path, /** * fill_pathname_join_delim: * @out_path : output path - * @dir : directory + * @dir : directory * @path : path - * @delim : delimiter + * @delim : delimiter * @size : size of output path * - * Joins a directory (@dir) and path (@path) together + * Joins a directory (@dir) and path (@path) together * using the given delimiter (@delim). **/ void fill_pathname_join_delim(char *out_path, const char *dir, @@ -719,7 +721,7 @@ void fill_short_pathname_representation(char* out_rep, */ if(last_hash != NULL) { - /* We check whether something is actually + /* We check whether something is actually * after the hash to avoid going over the buffer. */ rarch_assert(strlen(last_hash) > 1); diff --git a/performance.c b/performance.c index 33240b65e2..688a67bf9f 100644 --- a/performance.c +++ b/performance.c @@ -369,6 +369,8 @@ unsigned rarch_get_cpu_cores(void) return 1; #elif defined(PSP) return 1; +#elif defined(VITA) + return 4; #elif defined(_3DS) return 1; #elif defined(_SC_NPROCESSORS_ONLN)