Compilation fixes for SCE platforms

.gitignore

@@ -100,6 +100,7 @@ _ReSharper.*
 !external/*/*/*/*/*/*/*
 # Our private repositories
 lol-switch
+lol-playstation
 # Our binaries
 demos/lol.js/lol.js
 doc/legacy/benchsuite

build/msbuild/kinc.vars.props

@@ -56,12 +56,36 @@
     <ShaderCompiler>$(KINC_SDK_PATH)\..\Backends\PlayStation4\krafix\krafix-ps4.exe</ShaderCompiler>
     <ShaderPlatform>ps4</ShaderPlatform>
     <ShaderProfile>ps4</ShaderProfile>
+    <KincIncludes>
+      $(KincIncludes);
+      $(KINC_SDK_PATH)\Backends\Graphics4\G4onG5\Sources;
+      $(KINC_SDK_PATH)\..\Backends\PlayStation4\Sources;
+    </KincIncludes>
+    <KincDefines>
+      $(KincDefines);
+      KORE_G4ONG5;KORE_PLAYSTATION_4;KORE_PS4;KORE_SONY;KORE_CONSOLE;
+    </KincDefines>
+    <KincDeps>
+      -lSceAgc;-lSceAgcCore;-lSceAgcGpuAddress;-lSceAgcDriver_stub_weak;-lSceAgc_stub_weak;-lSceNpGameIntent_stub_weak;-lSceSaveDataDialog_stub_weak;-lSceCommonDialog_stub_weak;-lSceNpUniversalDataSystem_stub_weak;-lSceSysmodule_stub_weak;-lSceSystemService_stub_weak;-lSceSaveData_stub_weak;-lSceAudioOut_stub_weak;-lSceVideoOut_stub_weak;-lScePad_stub_weak;-lSceUserService_stub_weak
+    </KincDeps>
   </PropertyGroup>
 
   <PropertyGroup Label="UserMacros" Condition="'$(Platform)'=='Prospero'">
     <ShaderCompiler>$(KINC_SDK_PATH)\..\Backends\PlayStation5\krafix\krafix-ps5.exe</ShaderCompiler>
     <ShaderPlatform>ps5</ShaderPlatform>
     <ShaderProfile>ps5</ShaderProfile>
+    <KincIncludes>
+      $(KincIncludes);
+      $(KINC_SDK_PATH)\Backends\Graphics4\G4onG5\Sources;
+      $(KINC_SDK_PATH)\..\Backends\PlayStation5\Sources;
+    </KincIncludes>
+    <KincDefines>
+      $(KincDefines);
+      KORE_G4ONG5;KORE_PLAYSTATION_5;KORE_PS5;KORE_SONY;KORE_CONSOLE;
+    </KincDefines>
+    <KincDeps>
+      -lSceAgc;-lSceAgcCore;-lSceAgcGpuAddress;-lSceAgcDriver_stub_weak;-lSceAgc_stub_weak;-lSceNpGameIntent_stub_weak;-lSceSaveDataDialog_stub_weak;-lSceCommonDialog_stub_weak;-lSceNpUniversalDataSystem_stub_weak;-lSceSysmodule_stub_weak;-lSceSystemService_stub_weak;-lSceSaveData_stub_weak;-lSceAudioOut_stub_weak;-lSceVideoOut_stub_weak;-lScePad_stub_weak;-lSceUserService_stub_weak
+    </KincDeps>
   </PropertyGroup>
 
   <ItemGroup Label="UserMacros">

lol

@@ -1 +1 @@
-Subproject commit c83acab18a0eab376ba96e9ef8afbbab37c4c254
+Subproject commit e26f6cb2ee95b2d24e201f852303d2cdedbf12a3

lolengine.props

@@ -100,6 +100,10 @@
       <ClCompile Include="$(KINC_SDK_PATH)/Backends/Graphics4/G4onG5/Sources/kinc/backend/**/*.cpp;
                           $(KINC_SDK_PATH)/../Backends/Switch/Sources/kinc/backend/**/*.cpp"
                  Condition="'$(Platform)'=='NX64'" />
+      <ClCompile Include="$(KINC_SDK_PATH)/Backends/Graphics4/G4onG5/Sources/kinc/backend/**/*.cpp;
+                          $(KINC_SDK_PATH)/../Backends/PlayStation5/Sources/kinc/backend/**/*.cpp;
+                          $(KINC_SDK_PATH)/../Backends/PlayStation5/Sources/tlsf/**/*.cpp"
+                 Condition="'$(Platform)'=='Prospero'" />
 
       <!-- The C files are first added to a temporary list so that we can modify AdditionalOptions
          - when compiling them. This is because of an annoying NDK limitation. -->
@@ -114,6 +118,14 @@
       <KincCFiles Include="$(KINC_SDK_PATH)/Backends/Graphics4/G4onG5/Sources/kinc/backend/**/*.c;
                            $(KINC_SDK_PATH)/../Backends/Switch/Sources/kinc/backend/**/*.c"
                   Condition="'$(Platform)'=='NX64'" />
+      <KincCFiles Include="$(KINC_SDK_PATH)/Backends/Graphics4/G4onG5/Sources/kinc/backend/**/*.c;
+                           $(KINC_SDK_PATH)/../Backends/PlayStation4/Sources/kinc/backend/**/*.c;
+                           $(KINC_SDK_PATH)/../Backends/PlayStation4/Sources/tlsf/**/*.c"
+                  Condition="'$(Platform)'=='ORBIS'" />
+      <KincCFiles Include="$(KINC_SDK_PATH)/Backends/Graphics4/G4onG5/Sources/kinc/backend/**/*.c;
+                           $(KINC_SDK_PATH)/../Backends/PlayStation5/Sources/kinc/backend/**/*.c;
+                           $(KINC_SDK_PATH)/../Backends/PlayStation5/Sources/tlsf/**/*.c"
+                  Condition="'$(Platform)'=='Prospero'" />
       <ClCompile Include="@(KincCFiles)">
         <AdditionalOptions>%(ClCompile.AdditionalOptions) %(ClCompile.AdditionalOptionsForC)</AdditionalOptions>
       </ClCompile>

src/include/lol/engine/private/audio/audio.h

@@ -28,7 +28,7 @@ namespace lol::audio
 void init();
 void shutdown();
 
-template<typename S, typename T = S::sample_type>
+template<typename S, typename T = typename S::sample_type>
 inline int start_stream(std::shared_ptr<S> s0)
 {
     std::shared_ptr<stream<float>> s = make_adapter<float>(s0, 2, 48000);

src/net/http.cpp

@@ -26,7 +26,7 @@
 #   define FAR
 #endif
 
-#if __NX__
+#if __NX__ || __SCE__
     // not implemented
 #elif __EMSCRIPTEN__
 #   include <emscripten/fetch.h>
@@ -51,7 +51,7 @@ namespace http
 class client_impl
 {
 public:
-#if __NX__
+#if __NX__ || __SCE__
     void get(std::string const &url)
     {
         msg::error("downloading %s failed: not implemented\n", url.c_str());