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 00000000..b0bd6012 Binary files /dev/null and b/ISLE/res/arrow.bmp differ diff --git a/ISLE/res/busy.bmp b/ISLE/res/busy.bmp new file mode 100644 index 00000000..34be553d Binary files /dev/null and b/ISLE/res/busy.bmp differ diff --git a/ISLE/res/no.bmp b/ISLE/res/no.bmp new file mode 100644 index 00000000..93fae58d Binary files /dev/null and b/ISLE/res/no.bmp differ 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); }