From b9ad1743de9263a376b998e942a6a5953acc51ea Mon Sep 17 00:00:00 2001 From: olebeck <31539311+olebeck@users.noreply.github.com> Date: Fri, 26 Sep 2025 23:51:19 +0200 Subject: [PATCH] move asm language --- CMakeLists.txt | 9 +++------ miniwin/src/d3drm/backends/gxm/shaders/CMakeLists.txt | 2 ++ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 420d3e22..0bf0042f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.25...4.0 FATAL_ERROR) -project(isle LANGUAGES CXX C ASM VERSION 0.1) +project(isle LANGUAGES CXX C VERSION 0.1) if (IOS) set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_ALLOWED NO) @@ -903,11 +903,9 @@ if(VITA) set(VPK_FILE_ARGS "") file(GLOB_RECURSE SCE_SYS_FILES packaging/vita/sce_sys/*) - foreach(FILE ${SCE_SYS_FILES} ${SCE_MODULE_FILES}) + foreach(FILE ${SCE_SYS_FILES}) file(RELATIVE_PATH REL_FILE ${CMAKE_CURRENT_SOURCE_DIR}/packaging/vita/ ${FILE}) - list(APPEND VPK_FILE_ARGS "FILE") - list(APPEND VPK_FILE_ARGS ${FILE}) - list(APPEND VPK_FILE_ARGS ${REL_FILE}) + list(APPEND VPK_FILE_ARGS FILE ${FILE} ${REL_FILE}) endforeach() vita_create_vpk(isle.vpk ${VITA_TITLEID} isle.self @@ -918,7 +916,6 @@ if(VITA) ${VPK_FILE_ARGS} ) add_dependencies(isle.vpk-vpk config_plugin.rco_target) - endif() if(MSVC OR IOS) diff --git a/miniwin/src/d3drm/backends/gxm/shaders/CMakeLists.txt b/miniwin/src/d3drm/backends/gxm/shaders/CMakeLists.txt index 45d75b72..1b0f40f6 100644 --- a/miniwin/src/d3drm/backends/gxm/shaders/CMakeLists.txt +++ b/miniwin/src/d3drm/backends/gxm/shaders/CMakeLists.txt @@ -1,5 +1,7 @@ cmake_minimum_required(VERSION 3.25...4.0 FATAL_ERROR) +enable_language(ASM) + find_program(PSP2CGC NAMES ${CMAKE_CURRENT_SOURCE_DIR}/psp2cgc.exe psp2cgc.exe psp2cgc) find_program(PSP2SHADERPERF NAMES ${CMAKE_CURRENT_SOURCE_DIR}/psp2shaderperf.exe psp2shaderperf.exe psp2shaderperf)