isledecomp/isle-portable
1
0
Fork 0
mirror of https://github.com/isledecomp/isle-portable.git synced 2026-02-02 12:01:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

hopefully fix windows build

Browse Source
This commit is contained in:
olebeck 2025-07-07 17:36:08 +02:00
parent e135bf5595
commit feafa3c75e
6 changed files with 80 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
CMakePresets.json
View File

@ -26,12 +26,21 @@
"CMAKE_BUILD_TYPE": "Debug" "CMAKE_BUILD_TYPE": "Debug"
} }
}, },
{
"name": "mingw64",
"inherits": ["release"],
"toolchainFile": "CMake/cmake-toolchain-mingw64-x86_64.cmake"
},
{
"name": "mingw64-debug",
"inherits": ["mingw64", "debug"]
},
{ {
"name": "vita", "name": "vita",
"inherits": ["release"], "inherits": ["release"],
"cacheVariables": { "toolchainFile": "$env{VITASDK}/share/vita.toolchain.cmake"
"CMAKE_TOOLCHAIN_FILE": "$env{VITASDK}/share/vita.toolchain.cmake"
}
}, },
{ {
"name": "vita-debug", "name": "vita-debug",

4
CONFIG/qt/CMakeLists.txt
View File

@ -37,7 +37,7 @@ if(WIN32)
install(CODE "message(STATUS \"Running windeployqt with minimal dependencies\") install(CODE "message(STATUS \"Running windeployqt with minimal dependencies\")
execute_process(COMMAND \"${WINDEPLOYQT_EXECUTABLE}\" execute_process(COMMAND \"${WINDEPLOYQT_EXECUTABLE}\"
\"$<TARGET_FILE:isle-config>\" \"$<TARGET_FILE:isle-config>\"
--dir QTLibs --dir ${CMAKE_CURRENT_BINARY_DIR}/QTLibs
--no-compiler-runtime --no-compiler-runtime
--no-opengl-sw --no-opengl-sw
--no-system-d3d-compiler --no-system-d3d-compiler
@ -45,7 +45,7 @@ if(WIN32)
--no-quick-import --no-quick-import
)" )"
) )
install(DIRECTORY "Build/QTLibs/" DESTINATION "${CMAKE_INSTALL_BINDIR}") install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/QTLibs/" DESTINATION "${CMAKE_INSTALL_BINDIR}")
else() else()
message(STATUS "windeployqt not found: Qt binaries will not be installed") message(STATUS "windeployqt not found: Qt binaries will not be installed")
endif() endif()

27
CONFIG/vita/src/app.cpp
View File

@ -1,17 +1,17 @@
#include <paf.h>
#include <psp2/kernel/clib.h>
#include <psp2/kernel/modulemgr.h> #include <psp2/kernel/modulemgr.h>
#include <psp2/kernel/processmgr.h> #include <psp2/kernel/processmgr.h>
#include <psp2/kernel/clib.h>
#include <psp2/sysmodule.h> #include <psp2/sysmodule.h>
#include <paf.h>
char sceUserMainThreadName[] = "paf_sample"; char sceUserMainThreadName[] = "paf_sample";
int sceUserMainThreadPriority = 0x10000100; int sceUserMainThreadPriority = 0x10000100;
int sceUserMainThreadCpuAffinityMask = 0x70000; int sceUserMainThreadCpuAffinityMask = 0x70000;
SceSize sceUserMainThreadStackSize = 0x4000; SceSize sceUserMainThreadStackSize = 0x4000;
void operator delete(void *ptr, unsigned int n) { void operator delete(void* ptr, unsigned int n)
{
return sce_paf_free(ptr); return sce_paf_free(ptr);
} }
@ -26,7 +26,8 @@ typedef struct _ScePafInit { // size is 0x18
int heap_opt_param2; int heap_opt_param2;
} ScePafInit; } ScePafInit;
extern "C" int module_start(SceSize args, void *argp) { extern "C" int module_start(SceSize args, void* argp)
{
int load_res; int load_res;
ScePafInit init_param; ScePafInit init_param;
SceSysmoduleOpt sysmodule_opt; SceSysmoduleOpt sysmodule_opt;
@ -42,9 +43,18 @@ extern "C" int module_start(SceSize args, void *argp) {
sysmodule_opt.flags = 0; sysmodule_opt.flags = 0;
sysmodule_opt.result = &load_res; sysmodule_opt.result = &load_res;
int res = sceSysmoduleLoadModuleInternalWithArg(SCE_SYSMODULE_INTERNAL_PAF, sizeof(init_param), &init_param, &sysmodule_opt); int res = sceSysmoduleLoadModuleInternalWithArg(
SCE_SYSMODULE_INTERNAL_PAF,
sizeof(init_param),
&init_param,
&sysmodule_opt
);
if ((res | load_res) != 0) { if ((res | load_res) != 0) {
sceClibPrintf("[PAF PRX Loader] Failed to load the PAF prx. (return value 0x%x, result code 0x%x )\n", res, load_res); sceClibPrintf(
"[PAF PRX Loader] Failed to load the PAF prx. (return value 0x%x, result code 0x%x )\n",
res,
load_res
);
} }
paf_main(); paf_main();
@ -52,6 +62,7 @@ extern "C" int module_start(SceSize args, void *argp) {
return SCE_KERNEL_START_SUCCESS; return SCE_KERNEL_START_SUCCESS;
} }
extern "C" void _start() { extern "C" void _start()
{
module_start(0, nullptr); module_start(0, nullptr);
} }

11
CONFIG/vita/src/main.cpp
View File

@ -1,13 +1,11 @@
#include <psp2/kernel/clib.h>
#include <paf.h> #include <paf.h>
#include <psp2/kernel/clib.h>
paf::Framework* g_fw; paf::Framework* g_fw;
paf::ui::Scene* g_rootPage; paf::ui::Scene* g_rootPage;
void loadPluginCB(paf::Plugin* plugin)
void loadPluginCB(paf::Plugin *plugin){ {
paf::Plugin::PageOpenParam pageOpenParam; paf::Plugin::PageOpenParam pageOpenParam;
pageOpenParam.option = paf::Plugin::PageOption_None; pageOpenParam.option = paf::Plugin::PageOption_None;
@ -18,7 +16,8 @@ void loadPluginCB(paf::Plugin *plugin){
pText->SetString(L"Test Text"); pText->SetString(L"Test Text");
} }
int paf_main(void){ int paf_main(void)
{
paf::Framework::InitParam fwParam; paf::Framework::InitParam fwParam;
fwParam.mode = paf::Framework::Mode_Normal; fwParam.mode = paf::Framework::Mode_Normal;

4
miniwin/src/internal/d3drmdevice_impl.h
View File

@ -40,8 +40,8 @@ struct Direct3DRMDevice2Impl : public Direct3DRMObjectBaseImpl<IDirect3DRMDevice
private: private:
void Resize(); void Resize();
int32_t m_windowWidth; int m_windowWidth;
int32_t m_windowHeight; int m_windowHeight;
uint32_t m_virtualWidth; uint32_t m_virtualWidth;
uint32_t m_virtualHeight; uint32_t m_virtualHeight;
ViewportTransform m_viewportTransform; ViewportTransform m_viewportTransform;