From 6a4c07c79ae715c5a06b5373c249a7d535dd90f0 Mon Sep 17 00:00:00 2001 From: Helloyunho Date: Wed, 2 Jul 2025 19:37:10 +0900 Subject: [PATCH] =?UTF-8?q?=F0=9F=A9=B9=20fix:=20doesnt=20compile?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CMakeLists.txt | 16 ++++++++++++++++ ISLE/isleapp.cpp | 2 +- ISLE/res/arrow.bmp | Bin 0 -> 4234 bytes ISLE/res/busy.bmp | Bin 0 -> 4234 bytes ISLE/res/no.bmp | Bin 0 -> 4234 bytes miniwin/src/ddraw/ddraw.cpp | 4 ++-- 6 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 ISLE/res/arrow.bmp create mode 100644 ISLE/res/busy.bmp create mode 100644 ISLE/res/no.bmp diff --git a/CMakeLists.txt b/CMakeLists.txt index 4ff42f97..a2d9494a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,6 +2,10 @@ cmake_minimum_required(VERSION 3.25...4.0 FATAL_ERROR) project(isle LANGUAGES CXX C VERSION 0.1) +if(WINDOWS_STORE) + add_compile_definitions(WINDOWS_STORE) +endif() + if(EMSCRIPTEN) add_compile_options(-pthread) add_link_options(-sALLOW_MEMORY_GROWTH=1 -sMAXIMUM_MEMORY=2gb -sUSE_PTHREADS=1 -sPROXY_TO_PTHREAD=1 -sPTHREAD_POOL_SIZE_STRICT=0 -sFORCE_FILESYSTEM=1 -sWASMFS=1 -sEXIT_RUNTIME=1) @@ -551,6 +555,18 @@ if(ISLE_BUILD_APP) ISLE/3ds/config.cpp ) endif() + if(WINDOWS_STORE) + set(ISLE_CURSORS + ISLE/res/arrow.bmp + ISLE/res/busy.bmp + ISLE/res/no.bmp + ) + set_source_files_properties(${ISLE_CURSORS} PROPERTIES + VS_DEPLOYMENT_CONTENT 1 + ) + + target_sources(isle PRIVATE ${ISLE_CURSORS}) + endif() endif() if (ISLE_BUILD_CONFIG) diff --git a/ISLE/isleapp.cpp b/ISLE/isleapp.cpp index 3a5693ab..6fcd0ce0 100644 --- a/ISLE/isleapp.cpp +++ b/ISLE/isleapp.cpp @@ -678,7 +678,7 @@ MxResult IsleApp::SetupWindow() SDL_SetNumberProperty(props, SDL_PROP_WINDOW_CREATE_HEIGHT_NUMBER, g_targetHeight); SDL_SetBooleanProperty(props, SDL_PROP_WINDOW_CREATE_FULLSCREEN_BOOLEAN, m_fullScreen); SDL_SetStringProperty(props, SDL_PROP_WINDOW_CREATE_TITLE_STRING, WINDOW_TITLE); -#if defined(MINIWIN) && !defined(__3DS__) +#if defined(MINIWIN) && !defined(__3DS__) && !defined(WINDOWS_STORE) SDL_SetBooleanProperty(props, SDL_PROP_WINDOW_CREATE_OPENGL_BOOLEAN, true); SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1); SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 24); diff --git a/ISLE/res/arrow.bmp b/ISLE/res/arrow.bmp new file mode 100644 index 0000000000000000000000000000000000000000..b0bd60129bc79c44e2b102fd835cffdc54180b5f GIT binary patch literal 4234 zcmZ?r?Gj)BgDxOh1H=kY%m`#L1KA8vc@Pr;{xdK@5J>31lY3Bc|DmrMfji_x^fNH9Aah39qaiRF0;3@?8UmvsFnB`%SmS|e zy#WFLVPJsV0JDA|!hoK3V~byU+mGx9dfE+2*kJpR(%69553&^I78o1kI645he~}qL zdtvDwnWlwvkgdhahPs6oc7x2sY9~yP#&+YipAL58w4Y9PW3``-c4OF2XS-4C9{{`I R_79NVVEYHqZjk*01^{t$DVhKP literal 0 HcmV?d00001 diff --git a/ISLE/res/busy.bmp b/ISLE/res/busy.bmp new file mode 100644 index 0000000000000000000000000000000000000000..34be553d11f3fd7a5b4e355cbb2d5baf2b1c9542 GIT binary patch literal 4234 zcmZ?r?Gj)BgDxOh1H=kY%m`#L1KA8vc@Pr;{xdK@5J>31lY3Bc|DmrMfji_x^fNH9Aah39LnQ=&u?~uPvM@FL_@5jAbuU%y zC)4ksFryZL2LaGPFdG*Qk_5?7%VMZGaQk8AW20e;Xl*|}yJ2#)^gpscVQgfY2L1EH$w`w4MqkQNA8i6TGD?1!~y$f1EjK`}rHTVgptTd7qa Tk>hWe9*R9bYQSg+&?*D~b)Mqx literal 0 HcmV?d00001 diff --git a/ISLE/res/no.bmp b/ISLE/res/no.bmp new file mode 100644 index 0000000000000000000000000000000000000000..93fae58ddb697b5067b119fb6b71659b9675ba63 GIT binary patch literal 4234 zcmeH{u}%Xq42Dw`A;DA$u~tl|GdHtzVPb%p`CfpPm8DDPdlTlq1P{T?e6_D}`=4>r z$+kvMZToQQckTi=bzN_u-az&Z^nu6*Wj2T{wb8%8-vRYZ z@_9M4El(@wwdbLU3d@^wI`Ax9OTr8<~#UB+Ne583nVS+q8Bo6m@vlK#jId6)JVpDEtb%V)|B^uslAc+1}nGf*4Tnaz+y4yBL3sTfoD#I#@) zTv|Mf$vKYHa|R8Kg66V^4)m3}ftsAM&Y(SI@3oV?LXGmy;-hD%hY&^b;-lvx@CvCn I@Q-d_4|GZ~pa1{> literal 0 HcmV?d00001 diff --git a/miniwin/src/ddraw/ddraw.cpp b/miniwin/src/ddraw/ddraw.cpp index 1ea2e0ae..f9dabada 100644 --- a/miniwin/src/ddraw/ddraw.cpp +++ b/miniwin/src/ddraw/ddraw.cpp @@ -7,7 +7,7 @@ #ifdef __3DS__ #include "d3drmrenderer_citro3d.h" #endif -#ifdef _WIN32 +#if defined(_WIN32) && !defined(WINDOWS_STORE) #include "d3drmrenderer_directx9.h" #endif #include "d3drmrenderer_sdl3gpu.h" @@ -357,7 +357,7 @@ HRESULT DirectDrawImpl::CreateDevice( DDRenderer = new Citro3DRenderer(DDSDesc.dwWidth, DDSDesc.dwHeight); } #endif -#ifdef _WIN32 +#if defined(_WIN32) && !defined(WINDOWS_STORE) else if (SDL_memcmp(&guid, &DirectX9_GUID, sizeof(GUID)) == 0) { DDRenderer = DirectX9Renderer::Create(DDSDesc.dwWidth, DDSDesc.dwHeight); }