Vita progress

cmake/modules/CompileLibZip.cmake

@@ -0,0 +1,17 @@
+include(FetchContent)
+
+set(ENABLE_ZSTD OFF CACHE BOOL "" FORCE)
+set(BUILD_TOOLS OFF CACHE BOOL "" FORCE)
+set(BUILD_REGRESS OFF CACHE BOOL "" FORCE)
+set(BUILD_EXAMPLES OFF CACHE BOOL "" FORCE)
+set(BUILD_DOC OFF CACHE BOOL "" FORCE)
+set(BUILD_SHARED_LIBS OFF CACHE BOOL "" FORCE)
+set(LIBZIP_DO_INSTALL OFF CACHE BOOL "" FORCE)
+
+FetchContent_Declare(
+  libzip
+  GIT_REPOSITORY https://github.com/nih-at/libzip.git
+  GIT_TAG v1.11.4
+)
+
+FetchContent_MakeAvailable(libzip)

cmake/modules/CompileLua.cmake

@@ -0,0 +1,20 @@
+# Compile lua
+include(FetchContent)
+FetchContent_Declare(
+  liblua
+  URL https://www.lua.org/ftp/lua-5.5.0.tar.gz
+)
+FetchContent_MakeAvailable(liblua)
+set(LUA_SRC_DIR "${liblua_SOURCE_DIR}/src")
+set(LUA_C_FILES 
+  lapi.c lauxlib.c lbaselib.c lcode.c lcorolib.c lctype.c ldblib.c ldebug.c
+  ldo.c ldump.c lfunc.c lgc.c linit.c liolib.c llex.c lmathlib.c lmem.c
+  loadlib.c lobject.c lopcodes.c loslib.c lparser.c lstate.c lstring.c
+  lstrlib.c ltable.c ltablib.c ltm.c lundump.c lutf8lib.c lvm.c lzio.c
+)
+list(TRANSFORM LUA_C_FILES PREPEND "${LUA_SRC_DIR}/")
+add_library(liblua STATIC ${LUA_C_FILES})
+target_include_directories(liblua PUBLIC "${LUA_SRC_DIR}")
+target_compile_definitions(liblua PRIVATE LUA_USE_C89)
+add_library(lua::lua ALIAS liblua)
+set(Lua_FOUND TRUE CACHE BOOL "Lua found" FORCE)

cmake/modules/Findlibzip.cmake

@@ -1,17 +1,43 @@
+
+# Allow user to manually specify libzip paths
+# LIBZIP_ROOT: root directory for libzip (optional)
+# LIBZIP_INCLUDE_DIR: path to zip.h (optional)
+# LIBZIP_LIBRARY: path to libzip library (optional)
+
 find_package(ZLIB REQUIRED)
 
-find_path(LIBZIP_INCLUDE_DIR NAMES zip.h)
+if(NOT LIBZIP_INCLUDE_DIR AND LIBZIP_ROOT)
+    find_path(LIBZIP_INCLUDE_DIR NAMES zip.h HINTS "${LIBZIP_ROOT}/include")
+endif()
+if(NOT LIBZIP_INCLUDE_DIR)
+    find_path(LIBZIP_INCLUDE_DIR NAMES zip.h)
+endif()
 mark_as_advanced(LIBZIP_INCLUDE_DIR)
 
-find_library(LIBZIP_LIBRARY NAMES zip)
+if(NOT LIBZIP_LIBRARY AND LIBZIP_ROOT)
+    find_library(LIBZIP_LIBRARY NAMES zip HINTS "${LIBZIP_ROOT}/lib")
+endif()
+if(NOT LIBZIP_LIBRARY)
+    find_library(LIBZIP_LIBRARY NAMES zip)
+endif()
 mark_as_advanced(LIBZIP_LIBRARY)
 
-get_filename_component(_libzip_libdir ${LIBZIP_LIBRARY} DIRECTORY)
-find_file(_libzip_pkgcfg libzip.pc
-    HINTS ${_libzip_libdir} ${LIBZIP_INCLUDE_DIR}/..
-    PATH_SUFFIXES pkgconfig lib/pkgconfig libdata/pkgconfig
-    NO_DEFAULT_PATH
-)
+if(LIBZIP_LIBRARY)
+    get_filename_component(_libzip_libdir ${LIBZIP_LIBRARY} DIRECTORY)
+endif()
+if(NOT _libzip_pkgcfg AND LIBZIP_ROOT)
+    find_file(_libzip_pkgcfg libzip.pc
+        HINTS "${LIBZIP_ROOT}/lib/pkgconfig" "${LIBZIP_ROOT}/libdata/pkgconfig"
+        NO_DEFAULT_PATH
+    )
+endif()
+if(NOT _libzip_pkgcfg AND LIBZIP_LIBRARY)
+    find_file(_libzip_pkgcfg libzip.pc
+        HINTS ${_libzip_libdir} ${LIBZIP_INCLUDE_DIR}/..
+        PATH_SUFFIXES pkgconfig lib/pkgconfig libdata/pkgconfig
+        NO_DEFAULT_PATH
+    )
+endif()
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(

cmake/targets/dolphin.cmake

@@ -21,26 +21,7 @@ set(CGLM_SHARED OFF CACHE BOOL "Build cglm shared" FORCE)
 set(CGLM_STATIC ON  CACHE BOOL "Build cglm static" FORCE)
 find_package(cglm REQUIRED)
 
-# Compile lua
-include(FetchContent)
-FetchContent_Declare(
-  liblua
-  URL https://www.lua.org/ftp/lua-5.5.0.tar.gz
-)
-FetchContent_MakeAvailable(liblua)
-set(LUA_SRC_DIR "${liblua_SOURCE_DIR}/src")
-set(LUA_C_FILES 
-  lapi.c lauxlib.c lbaselib.c lcode.c lcorolib.c lctype.c ldblib.c ldebug.c
-  ldo.c ldump.c lfunc.c lgc.c linit.c liolib.c llex.c lmathlib.c lmem.c
-  loadlib.c lobject.c lopcodes.c loslib.c lparser.c lstate.c lstring.c
-  lstrlib.c ltable.c ltablib.c ltm.c lundump.c lutf8lib.c lvm.c lzio.c
-)
-list(TRANSFORM LUA_C_FILES PREPEND "${LUA_SRC_DIR}/")
-add_library(liblua STATIC ${LUA_C_FILES})
-target_include_directories(liblua PUBLIC "${LUA_SRC_DIR}")
-target_compile_definitions(liblua PRIVATE LUA_USE_C89)
-add_library(lua::lua ALIAS liblua)
-set(Lua_FOUND TRUE CACHE BOOL "Lua found" FORCE)
+include(cmake/modules/CompileLua.cmake)
 
 # Link libraries
 target_link_libraries(${DUSK_LIBRARY_TARGET_NAME} PRIVATE

cmake/targets/vita.cmake

@@ -0,0 +1,62 @@
+include("${VITASDK}/share/vita.cmake" REQUIRED)
+
+
+# Manually define libzip for Vita
+set(LIBZIP_LIBRARY "${VITASDK}/lib/libzip.a" CACHE FILEPATH "libzip library for Vita")
+set(LIBZIP_INCLUDE_DIR "${VITASDK}/include" CACHE PATH "libzip include dir for Vita")
+
+set(VITA_APP_NAME "Red Rectangle")
+set(VITA_TITLEID  "VSDK00017")
+set(VITA_VERSION  "01.00")
+
+
+
+target_link_libraries(${DUSK_LIBRARY_TARGET_NAME} PUBLIC
+  mathneon
+  vitashark
+  kubridge_stub
+  SceAppMgr_stub
+  SceAudio_stub
+  SceCtrl_stub
+  SceCommonDialog_stub
+  SceDisplay_stub
+  SceKernelDmacMgr_stub
+  SceGxm_stub
+  SceShaccCg_stub
+  SceSysmodule_stub
+  ScePower_stub
+  SceTouch_stub
+  SceVshBridge_stub
+  SceIofilemgr_stub
+  SceShaccCgExt
+  SDL2-static
+  libtaihen_stub.a
+  lua::lua
+  zip
+  pthread
+  m
+)
+
+target_include_directories(${DUSK_LIBRARY_TARGET_NAME} PRIVATE
+  ${SDL2_INCLUDE_DIRS}
+)
+
+target_compile_definitions(${DUSK_LIBRARY_TARGET_NAME} PUBLIC
+  DUSK_SDL2
+  DUSK_OPENGL
+  DUSK_VITA
+  DUSK_INPUT_GAMEPAD
+  DUSK_PLATFORM_ENDIAN_LITTLE
+  DUSK_DISPLAY_WIDTH=960
+  DUSK_DISPLAY_HEIGHT=544
+)
+
+vita_create_self(${DUSK_BINARY_TARGET_NAME}.self ${DUSK_BINARY_TARGET_NAME})
+vita_create_vpk(${DUSK_BINARY_TARGET_NAME}.vpk ${VITA_TITLEID} ${DUSK_BINARY_TARGET_NAME}.self
+  VERSION ${VITA_VERSION}
+  NAME ${VITA_APP_NAME}
+  # FILE sce_sys/icon0.png sce_sys/icon0.png
+  # FILE sce_sys/livearea/contents/bg.png sce_sys/livearea/contents/bg.png
+  # FILE sce_sys/livearea/contents/startup.png sce_sys/livearea/contents/startup.png
+  # FILE sce_sys/livearea/contents/template.xml sce_sys/livearea/contents/template.xml
+)