fix vita build (except for network)

pionere · Feb 7, 2024 · 1bff931 · 1bff931
1 parent 35dec69
commit 1bff931
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 13 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1007,19 +1007,14 @@ endif()
 if(VITA)
   target_link_libraries(${BIN_TARGET} PRIVATE
         ScePower_stub
-        SceNet_stub
-        SceNetCtl_stub
-        freetype
-        png
-        m
-        z
-        FLAC
-        vorbisfile
-        vorbis
-        ogg
-        mikmod
-        mpg123
+        SceAppUtil_stub
   )
+  if(NOT NONET)
+    target_link_libraries(${BIN_TARGET} PRIVATE
+          SceNet_stub
+          SceNetCtl_stub
+    )
+  endif()
   #target_compile_definitions(${BIN_TARGET} PRIVATE VITA)
 endif()
 

diff --git a/Source/main.cpp b/Source/main.cpp
@@ -10,6 +10,8 @@
 #endif
 #ifdef __vita__
 #include <psp2/power.h>
+#include "platform/vita/network.h"
+#include "platform/vita/random.hpp"
 #endif
 #ifdef RUN_TESTS
 #include <gtest/gtest.h>

diff --git a/Source/platform/vita/network.cpp b/Source/platform/vita/network.cpp
@@ -1,7 +1,9 @@
+#include "platform/vita/network.h"
+
+#ifndef NONET
 #include <cstdlib>
 #include <cstdio>
 #include <unistd.h>
-#include "platform/vita/network.h"
 #include <psp2/sysmodule.h>
 #include <psp2/net/net.h>
 #include <psp2/net/netctl.h>
@@ -30,3 +32,8 @@ void vita_enable_network()
 		return;
 	}
 }
+#else
+void vita_enable_network()
+{
+}
+#endif // !NONET
diff --git a/Source/platform/vita/random.cpp b/Source/platform/vita/random.cpp
@@ -1,3 +1,6 @@
+#include "random.hpp"
+
+#ifndef NONET
 #include <sys/types.h>
 #include <sodium.h>
 #include <psp2/kernel/rng.h>
@@ -32,3 +35,8 @@ void randombytes_vitarandom_init()
 {
 	randombytes_set_implementation(&randombytes_vitarandom_implementation);
 }
+#else
+void randombytes_vitarandom_init()
+{
+}
+#endif // !NONET