PSV build preparation

CMakeLists.txt

@@ -56,7 +56,7 @@ else ()
     set(USE_MBEDTLS_CRYPTO ON)
 endif ()
 
-if (PLATFORM_IOS OR PLATFORM_TVOS OR PLATFORM_ANDROID)
+if (PLATFORM_IOS OR PLATFORM_TVOS OR PLATFORM_ANDROID OR PLATFORM_PSV)
     set(MULTICAST_DISABLED ON)
 endif ()
 
@@ -139,16 +139,16 @@ elseif (PLATFORM_PSV)
         vita_create_vpk(${PROJECT_NAME}.vpk ${PSN_TITLE_ID} ${PROJECT_NAME}.self
             VERSION ${PSN_VERSION}
             NAME ${PROJECT_NAME}
-            FILE ${CMAKE_SOURCE_DIR}/psv/sce_sys sce_sys
-            FILE ${CMAKE_SOURCE_DIR}/psv/module/ module
+            FILE ${CMAKE_SOURCE_DIR}/app/platforms/psv/sce_sys sce_sys
+            FILE ${CMAKE_SOURCE_DIR}/app/platforms/psv/module/ module
         )
     else()
         vita_create_vpk(${PROJECT_NAME}.vpk ${PSN_TITLE_ID} ${PROJECT_NAME}.self
             VERSION ${PSN_VERSION}
             NAME ${PROJECT_NAME}
             FILE ${CMAKE_SOURCE_DIR}/resources resources
-            FILE ${CMAKE_SOURCE_DIR}/psv/sce_sys sce_sys
-            FILE ${CMAKE_SOURCE_DIR}/psv/module/ module
+            FILE ${CMAKE_SOURCE_DIR}/app/platforms/psv/sce_sys sce_sys
+            FILE ${CMAKE_SOURCE_DIR}/app/platforms/psv/module/ module
         )
     endif()
 elseif (PLATFORM_SWITCH)

app/platforms/ios/Images.xcassets/AppIcon.appiconset/Contents.json

@@ -1,34 +1,24 @@
 {
   "images" : [
     {
-      "filename" : "moonlight.png",
+      "filename" : "moonlight 1.png",
       "idiom" : "universal",
       "platform" : "ios",
       "size" : "1024x1024"
     },
     {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "filename" : "moonlight 1.png",
+      "filename" : "moonlight 2.png",
       "idiom" : "universal",
       "platform" : "ios",
-      "size" : "1024x1024"
+      "size" : "1024x1024",
+      "unassigned" : true
     },
     {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "tinted"
-        }
-      ],
-      "filename" : "moonlight 2.png",
+      "filename" : "moonlight.png",
       "idiom" : "universal",
       "platform" : "ios",
-      "size" : "1024x1024"
+      "size" : "1024x1024",
+      "unassigned" : true
     }
   ],
   "info" : {

app/platforms/ios/Images.xcassets/AppIconTvOs.brandassets/App Icon - App Store.imagestack/Back.imagestacklayer/Content.imageset/Contents.json

@@ -1,6 +1,7 @@
 {
   "images" : [
     {
+      "filename" : "Frame [email protected]",
       "idiom" : "tv"
     }
   ],

app/platforms/ios/Images.xcassets/AppIconTvOs.brandassets/App Icon - App Store.imagestack/Front.imagestacklayer/Content.imageset/Contents.json

@@ -1,6 +1,7 @@
 {
   "images" : [
     {
+      "filename" : "Frame [email protected]",
       "idiom" : "tv"
     }
   ],

app/platforms/ios/Images.xcassets/AppIconTvOs.brandassets/App Icon - App Store.imagestack/Middle.imagestacklayer/Content.imageset/Contents.json

@@ -1,6 +1,7 @@
 {
   "images" : [
     {
+      "filename" : "Frame [email protected]",
       "idiom" : "tv"
     }
   ],

app/platforms/ios/Images.xcassets/AppIconTvOs.brandassets/Top Shelf Image Wide.imageset/Contents.json

@@ -1,10 +1,12 @@
 {
   "images" : [
     {
+      "filename" : "[email protected]",
       "idiom" : "tv",
       "scale" : "1x"
     },
     {
+      "filename" : "[email protected]",
       "idiom" : "tv",
       "scale" : "2x"
     }

app/platforms/ios/Images.xcassets/AppIconTvOs.brandassets/Top Shelf Image.imageset/Contents.json

@@ -1,10 +1,12 @@
 {
   "images" : [
     {
+      "filename" : "[email protected]",
       "idiom" : "tv",
       "scale" : "1x"
     },
     {
+      "filename" : "[email protected]",
       "idiom" : "tv",
       "scale" : "2x"
     }

app/platforms/psv/sce_sys/livearea/contents/template.xml

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<livearea style="a4" format-ver="01.00" content-rev="1">
+    <livearea-background>
+        <image>bg.png</image>
+    </livearea-background>
+
+    <gate>
+        <startup-image>startup.png</startup-image>
+    </gate>
+
+    <frame id="frame3">
+        <liveitem>
+            <text origin="background" align="center" line-align="center" text-valign="bottom">
+                <str size="50" bold="on" shadow="on">MOONLIGHT</str>
+            </text>
+        </liveitem>
+    </frame>
+
+    <frame id="frame4">
+        <liveitem>
+            <text origin="background" line-break="on" pre-br="on" align="center" line-align="center" text-valign="top">
+                <str size="22" bold="off" shadow="on" color="#dddddd">AN OPEN SOURCE
+NVIDIA GAMESTREAM CLIENT</str>
+            </text>
+        </liveitem>
+    </frame>
+
+    <frame id="frame5">
+        <liveitem>
+            <text origin="background" align="right" line-align="right" text-valign="bottom" margin-bottom="0" margin-right="20">
+                <str size="18" bold="off" shadow="on" color="#999999">v0.9.3</str>
+            </text>
+        </liveitem>
+    </frame>
+
+
+</livearea>

app/platforms/psv/sce_sys/livearea/contents/template.xml.format

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<livearea style="a4" format-ver="01.00" content-rev="1">
+    <livearea-background>
+        <image>bg.png</image>
+    </livearea-background>
+
+    <gate>
+        <startup-image>startup.png</startup-image>
+    </gate>
+
+    <frame id="frame3">
+        <liveitem>
+            <text origin="background" align="center" line-align="center" text-valign="bottom">
+                <str size="50" bold="on" shadow="on">MOONLIGHT</str>
+            </text>
+        </liveitem>
+    </frame>
+
+    <frame id="frame4">
+        <liveitem>
+            <text origin="background" line-break="on" pre-br="on" align="center" line-align="center" text-valign="top">
+                <str size="22" bold="off" shadow="on" color="#dddddd">AN OPEN SOURCE
+NVIDIA GAMESTREAM CLIENT</str>
+            </text>
+        </liveitem>
+    </frame>
+
+    <frame id="frame5">
+        <liveitem>
+            <text origin="background" align="right" line-align="right" text-valign="bottom" margin-bottom="0" margin-right="20">
+                <str size="18" bold="off" shadow="on" color="#999999">v{version}</str>
+            </text>
+        </liveitem>
+    </frame>
+
+
+</livearea>

app/src/streaming/GameStreamClient.cpp

@@ -11,9 +11,12 @@
 #include <cstring>
 
 #include <arpa/inet.h>
+#include <sys/socket.h>
+
+#ifndef PLATFORM_PSV
 #include <net/if.h>
 #include <sys/ioctl.h>
-#include <sys/socket.h>
+#endif
 
 #if defined(__SWITCH__)
 #include <switch.h>

extern/cmake/toolchain.cmake

@@ -72,8 +72,8 @@ elseif(PLATFORM_PSV)
     set(VITASDK $ENV{VITASDK} CACHE BOOL "VITASDK")
     include("${VITASDK}/share/vita.cmake" REQUIRED)
     add_definitions(-D__psp2__ -D__PSV__)
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-error=pedantic -Wno-psabi")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error=pedantic -Wno-psabi")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-error=pedantic -Wno-psabi -g")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error=pedantic -Wno-psabi -g")
 elseif (PLATFORM_SWITCH)
     add_definitions(-DPLATFORM_SWITCH)
     message(STATUS "building for SWITCH")