Merge pull request #1450 from aliaspider/master

(PSP) fix build.

Makefile.psp1

@@ -2,7 +2,7 @@ BUILD_PRX          = 1
 DEBUG              = 0
 HAVE_KERNEL_PRX    = 1
 HAVE_FILE_LOGGER   = 0
-HAVE_THREADS       = 1
+HAVE_THREADS       = 0
 BIG_STACK          = 0
 WHOLE_ARCHIVE_LINK = 0
 
@@ -11,7 +11,7 @@ TARGET = retroarchpsp
 ifeq ($(DEBUG), 1)
    OPTIMIZE_LV	:= -O0 -g
 else
-   OPTIMIZE_LV	:= -O2 -g
+   OPTIMIZE_LV	:= -O3 -g
 endif
 
 ifeq ($(WHOLE_ARCHIVE_LINK), 1)
@@ -19,11 +19,11 @@ ifeq ($(WHOLE_ARCHIVE_LINK), 1)
    WHOLE_END := -Wl,--no-whole-archive
 endif
 
-INCDIR = $(PSPPATH)/include libretro-common/include
+INCDIR = deps/rzlib deps/7zip libretro-common/include
 CFLAGS = $(OPTIMIZE_LV) -G0 -std=gnu99 -ffast-math
 ASFLAGS = $(CFLAGS)
 
-RARCH_DEFINES = -DPSP -D_MIPS_ARCH_ALLEGREX1 -DHAVE_LIBRETRO_MANAGEMENT -DHAVE_ZLIB -DWANT_MINIZ -DHAVE_GRIFFIN=1 -DRARCH_INTERNAL -DRARCH_CONSOLE -DHAVE_MENU -DHAVE_RGUI -DWANT_RPNG -DSINC_LOWEST_QUALITY -DHAVE_BUILTIN_AUTOCONFIG -DHAVE_FILTERS_BUILTIN
+RARCH_DEFINES = -DPSP -D_MIPS_ARCH_ALLEGREX -DHAVE_LIBRETRO_MANAGEMENT -DHAVE_ZLIB -DWANT_MINIZ -DHAVE_GRIFFIN=1 -DRARCH_INTERNAL -DRARCH_CONSOLE -DHAVE_MENU -DHAVE_RGUI -DWANT_RPNG -DSINC_LOWEST_QUALITY -DHAVE_BUILTIN_AUTOCONFIG -DHAVE_FILTERS_BUILTIN -DHAVE_7ZIP
 
 LIBDIR =
 LDFLAGS =

core_info.c

@@ -134,7 +134,7 @@ core_info_list_t *core_info_list_new(const char *modules_path)
             sizeof(info_path_base));
       path_remove_extension(info_path_base);
 
-#if defined(RARCH_MOBILE) || defined(RARCH_CONSOLE)
+#if defined(RARCH_MOBILE) || (defined(RARCH_CONSOLE) && !defined(PSP))
       char *substr = strrchr(info_path_base, '_');
       if (substr)
          *substr = '\0';

deps/rzlib/gzguts.h

@@ -166,7 +166,7 @@
 #define MODE_COPY 1      /* copy input directly */
 #define MODE_GZIP 2      /* decompress a gzip stream */
 
-#if defined(__APPLE__) || defined(PSP) || defined(__QNX__) && !defined(HAVE_BB10)
+#if defined(__APPLE__) || defined(__QNX__) && !defined(HAVE_BB10)
 struct gzFile_s
 {
     unsigned have;

dist-scripts/psp1-cores.sh

@@ -16,16 +16,27 @@ for f in *_psp1.a ; do
    name=`echo "$f" | sed 's/\(_libretro_psp1\|\).a$//'`
    whole_archive=
    big_stack=
+
    if [ $name = "nxengine" ] ; then
       echo "NXEngine found, applying whole archive linking..."
       whole_archive="WHOLE_ARCHIVE_LINK=1"
    fi
+
    if [ $name = "tyrquake" ] ; then
       echo "Tyrquake found, applying big stack..."
       big_stack="BIG_STACK=1"
    fi
+
+   if [ $big_stack="BIG_STACK=1" ] ; then
+      make -C ../ -f Makefile.psp1 clean || exit 1
+   fi
+
    cp -f "$f" ../libretro_psp1.a
    make -C ../ -f Makefile.psp1 $whole_archive $big_stack -j3 || exit 1
    mv -f ../EBOOT.PBP ../psp1/pkg/cores/${name}_libretro.PBP
    rm -f ../retroarchpsp.elf
+
+   if [ $big_stack="BIG_STACK=1" ] ; then
+      make -C ../ -f Makefile.psp1 clean || exit 1
+   fi
 done

frontend/drivers/platform_psp.c

@@ -54,8 +54,6 @@ static void frontend_psp_get_environment_settings(int *argc, char *argv[],
 {
    (void)args;
 #ifndef IS_SALAMANDER
-   g_extern.verbosity = true;
-
 #if defined(HAVE_LOGGER)
    logger_init();
 #elif defined(HAVE_FILE_LOGGER)

gfx/drivers/psp1_gfx.c

@@ -845,7 +845,9 @@ static const video_poke_interface_t psp_poke_interface = {
    NULL, /* get_video_output_size */
    NULL, /* get_video_output_prev */
    NULL, /* get_video_output_next */
+#ifdef HAVE_FBO
    NULL,
+#endif
    NULL,
    psp_set_aspect_ratio,
    psp_apply_state_changes,

performance.c

@@ -48,8 +48,9 @@
 #define CLOCK_MONOTONIC 2
 #endif
 
-#if defined(__mips__)
+#if defined(PSP)
 #include <sys/time.h>
+#include <psprtc.h>
 #endif
 
 #if defined(__PSL1GHT__)
@@ -175,6 +176,8 @@ retro_perf_tick_t rarch_get_perf_counter(void)
    asm volatile( "mrc p15, 0, %0, c9, c13, 0" : "=r"(time_ticks) );
 #elif defined(__CELLOS_LV2__) || defined(GEKKO) || defined(_XBOX360) || defined(__powerpc__) || defined(__ppc__) || defined(__POWERPC__)
    time_ticks = __mftb();
+#elif defined(PSP)
+   sceRtcGetCurrentTick(&time_ticks);
 #elif defined(__mips__)
    struct timeval tv;
    gettimeofday(&tv,NULL);
@@ -343,6 +346,8 @@ unsigned rarch_get_cpu_cores(void)
    return android_getCpuCount();
 #elif defined(GEKKO)
    return 1;
+#elif defined(PSP)
+   return 1;
 #elif defined(_SC_NPROCESSORS_ONLN)
    /* Linux, most UNIX-likes. */
    long ret = sysconf(_SC_NPROCESSORS_ONLN);