From b12d246b3fe4e851b84fea07c4bab968e22f4e57 Mon Sep 17 00:00:00 2001
From: olebeck <31539311+olebeck@users.noreply.github.com>
Date: Wed, 2 Jul 2025 03:28:46 +0200
Subject: [PATCH] add vita to dist folder

---
 .github/workflows/ci.yml                    |  7 +++++++
 CMakeLists.txt                              | 12 +++++++-----
 ISLE/isleapp.cpp                            |  7 +++++++
 ISLE/vita/config.cpp                        | 17 +++++++++++++++++
 ISLE/vita/config.h                          |  8 ++++++++
 miniwin/src/d3drm/backends/gxm/renderer.cpp |  1 -
 6 files changed, 46 insertions(+), 6 deletions(-)
 create mode 100644 ISLE/vita/config.cpp
 create mode 100644 ISLE/vita/config.h

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 79fba619..d249e34a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -151,6 +151,13 @@ jobs:
           cd build
           mkdir dist
           mv *.3dsx dist/
+      
+      - name: Package (Vita)
+        if: ${{ matrix.vita }}
+        run: |
+          cd build
+          mkdir dist
+          mv *.vpk dist/
 
       - name: Upload Build Artifacts
         uses: actions/upload-artifact@v4
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d4e9158b..00819ca6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -548,6 +548,11 @@ if (ISLE_BUILD_APP)
       ISLE/3ds/config.cpp
     )
   endif()
+  if(VITA)
+    target_sources(isle PRIVATE
+      ISLE/vita/config.cpp
+    )
+  endif()
 endif()
 
 if (ISLE_BUILD_CONFIG)
@@ -672,11 +677,6 @@ if(EMSCRIPTEN)
     DESTINATION "${CMAKE_INSTALL_BINDIR}"
   )
 endif()
-if(VITA)
-  install(FILES "$<TARGET_FILE_DIR:isle>/isle.vpk" "$<TARGET_FILE_DIR:isle>/isle.self"
-    DESTINATION "${CMAKE_INSTALL_BINDIR}"
-  )
-endif()
 
 add_subdirectory(packaging)
 
@@ -705,6 +705,8 @@ if(VITA)
   
   vita_create_self(isle.self isle UNSAFE)
 
+  #add_subdirectory(CONFIG_vita)
+
   if(VITA_USE_OPENGLES2)
     set(VPK_FILE_ARGS)
     get_target_property(gles_modules GLESv2 MODULES)
diff --git a/ISLE/isleapp.cpp b/ISLE/isleapp.cpp
index 0161480c..6ad5ec03 100644
--- a/ISLE/isleapp.cpp
+++ b/ISLE/isleapp.cpp
@@ -55,6 +55,10 @@
 #include "3ds/config.h"
 #endif
 
+#ifdef __vita__
+#include "vita/config.h"
+#endif
+
 DECOMP_SIZE_ASSERT(IsleApp, 0x8c)
 
 // GLOBAL: ISLE 0x410030
@@ -835,6 +839,9 @@ bool IsleApp::LoadConfig()
 
 #ifdef __3DS__
 		N3DS_SetupDefaultConfigOverrides(dict);
+#endif
+#ifdef __vita__
+		VITA_SetupDefaultConfigOverrides(dict);
 #endif
 		iniparser_dump_ini(dict, iniFP);
 		SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION, "New config written at '%s'", iniConfig);
diff --git a/ISLE/vita/config.cpp b/ISLE/vita/config.cpp
new file mode 100644
index 00000000..c84f0559
--- /dev/null
+++ b/ISLE/vita/config.cpp
@@ -0,0 +1,17 @@
+#include "config.h"
+
+#include <SDL3/SDL_log.h>
+#include <iniparser.h>
+
+void VITA_SetupDefaultConfigOverrides(dictionary* p_dictionary)
+{
+	SDL_Log("Overriding default config for VITA");
+
+	iniparser_set(p_dictionary, "isle:diskpath", "app0:");
+	iniparser_set(p_dictionary, "isle:cdpath", "app0:cd/");
+	iniparser_set(p_dictionary, "isle:UseJoystick", "true");
+	iniparser_set(p_dictionary, "isle:Draw Cursor", "true");
+
+	// Use e_noAnimation/cut transition
+	//iniparser_set(p_dictionary, "isle:Transition Type", "1");
+}
diff --git a/ISLE/vita/config.h b/ISLE/vita/config.h
new file mode 100644
index 00000000..9c725c6f
--- /dev/null
+++ b/ISLE/vita/config.h
@@ -0,0 +1,8 @@
+#ifndef VITA_CONFIG_H
+#define VITA_CONFIG_H
+
+#include "dictionary.h"
+
+void VITA_SetupDefaultConfigOverrides(dictionary* p_dictionary);
+
+#endif // VITA_CONFIG_H
diff --git a/miniwin/src/d3drm/backends/gxm/renderer.cpp b/miniwin/src/d3drm/backends/gxm/renderer.cpp
index bc1000f4..3a43494f 100644
--- a/miniwin/src/d3drm/backends/gxm/renderer.cpp
+++ b/miniwin/src/d3drm/backends/gxm/renderer.cpp
@@ -1330,7 +1330,6 @@ void GXMRenderer::Resize(int width, int height, const ViewportTransform& viewpor
 	m_width = width;
 	m_height = height;
 	m_viewportTransform = viewportTransform;
-	SDL_Log("GXMRenderer::Resize TODO");
 }
 
 void GXMRenderer::Clear(float r, float g, float b)