diff --git a/config.def.h b/config.def.h index b12a717149..7ab919da62 100644 --- a/config.def.h +++ b/config.def.h @@ -804,7 +804,23 @@ static char buildbot_server_url[] = "http://bot.libretro.com/nightly/apple/osx/x static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/apple/osx/ppc/latest/"; #endif #elif defined(_WIN32) && !defined(_XBOX) -#if _MSC_VER == 1600 +#if _MSC_VER >= 1910 +#ifndef __WINRT__ +#if defined(__x86_64__) || defined(_M_X64) +static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/windows-msvc2017-desktop/x86_64/latest/"; +#elif defined(__i386__) || defined(__i486__) || defined(__i686__) || defined(_M_IX86) || defined(_M_IA64) +static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/windows-msvc2017-desktop/x86/latest/"; +#endif +#else +#if defined(__x86_64__) || defined(_M_X64) +static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/windows-msvc2017-uwp/x86_64/latest/"; +#elif defined(__i386__) || defined(__i486__) || defined(__i686__) || defined(_M_IX86) || defined(_M_IA64) +static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/windows-msvc2017-uwp/x86/latest/"; +#elif defined(__arm__) || defined(_M_ARM) +static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/windows-msvc2017-uwp/arm/latest/"; +#endif +#endif +#elif _MSC_VER == 1600 #if defined(__x86_64__) || defined(_M_X64) static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/windows-msvc2010/x86_64/latest/"; #elif defined(__i386__) || defined(__i486__) || defined(__i686__) || defined(_M_IX86) || defined(_M_IA64) diff --git a/core_info.c b/core_info.c index d7ea70ed91..c356eb7a47 100644 --- a/core_info.c +++ b/core_info.c @@ -32,6 +32,10 @@ #include "core_info.h" #include "file_path_special.h" +#ifdef __WINRT__ +#include "uwp/uwp_func.h" +#endif + static const char *core_info_tmp_path = NULL; static const struct string_list *core_info_tmp_list = NULL; static core_info_t *core_info_current = NULL; @@ -232,11 +236,31 @@ static core_info_list_t *core_info_list_new(const char *path, core_info_t *core_info = NULL; core_info_list_t *core_info_list = NULL; const char *path_basedir = libretro_info_dir; - struct string_list *contents = dir_list_new( - path, exts, - false, - show_hidden_files, - false, false); + struct string_list *contents = string_list_new(); + bool ok; + + ok = dir_list_append(contents, path, exts, + false, show_hidden_files, false, false); + +#ifdef __WINRT__ + /* UWP: browse the optional packages for additional cores */ + struct string_list *core_packages = string_list_new(); + uwp_fill_installed_core_packages(core_packages); + for (i = 0; i < core_packages->size; i++) + { + dir_list_append(contents, core_packages->elems[i].data, exts, + false, show_hidden_files, false, false); + } + string_list_free(core_packages); +#else + /* Keep the old 'directory not found' behavior */ + if (!ok) + { + string_list_free(contents); + contents = NULL; + } +#endif + if (!contents) return NULL; @@ -430,12 +454,12 @@ static core_info_list_t *core_info_list_new(const char *path, core_info_list_resolve_all_firmware(core_info_list); } - dir_list_free(contents); + string_list_free(contents); return core_info_list; error: if (contents) - dir_list_free(contents); + string_list_free(contents); core_info_list_free(core_info_list); return NULL; } diff --git a/libretro-common/features/features_cpu.c b/libretro-common/features/features_cpu.c index 6c056f08d8..046e880adf 100644 --- a/libretro-common/features/features_cpu.c +++ b/libretro-common/features/features_cpu.c @@ -174,9 +174,9 @@ retro_perf_tick_t cpu_features_get_perf_counter(void) time_ticks = (retro_perf_tick_t)tv.tv_sec * 1000000000 + (retro_perf_tick_t)tv.tv_nsec; -#elif defined(__GNUC__) && defined(__i386__) || defined(__i486__) || defined(__i686__) +#elif defined(__GNUC__) && defined(__i386__) || defined(__i486__) || defined(__i686__) || defined(_M_X64) || defined(_M_AMD64) __asm__ volatile ("rdtsc" : "=A" (time_ticks)); -#elif defined(__GNUC__) && defined(__x86_64__) +#elif defined(__GNUC__) && defined(__x86_64__) || defined(_M_IX86) unsigned a, d; __asm__ volatile ("rdtsc" : "=a" (a), "=d" (d)); time_ticks = (retro_perf_tick_t)a | ((retro_perf_tick_t)d << 32); diff --git a/libretro-common/include/lists/dir_list.h b/libretro-common/include/lists/dir_list.h index 4babb02d39..d1d61d9be5 100644 --- a/libretro-common/include/lists/dir_list.h +++ b/libretro-common/include/lists/dir_list.h @@ -29,6 +29,23 @@ RETRO_BEGIN_DECLS +/** + * dir_list_append: + * @list : existing list to append to. + * @dir : directory path. + * @ext : allowed extensions of file directory entries to include. + * @include_dirs : include directories as part of the finished directory listing? + * @include_hidden : include hidden files and directories as part of the finished directory listing? + * @include_compressed : Only include files which match ext. Do not try to match compressed files, etc. + * @recursive : list directory contents recursively + * + * Create a directory listing, appending to an existing list + * + * Returns: true success, false in case of error. + **/ +bool dir_list_append(struct string_list *list, const char *dir, const char *ext, + bool include_dirs, bool include_hidden, bool include_compressed, bool recursive); + /** * dir_list_new: * @dir : directory path. diff --git a/libretro-common/include/retro_environment.h b/libretro-common/include/retro_environment.h index e220c1529b..4a68046b51 100644 --- a/libretro-common/include/retro_environment.h +++ b/libretro-common/include/retro_environment.h @@ -101,6 +101,14 @@ printf("This is C++, version %d.\n", __cplusplus); #define __WINRT__ 1 #endif +/* MSVC obviously has to have some non-standard constants... */ +#if _M_IX86_FP == 1 +#define __SSE__ 1 +#elif _M_IX86_FP == 2 || (defined(_M_AMD64) || defined(_M_X64)) +#define __SSE__ 1 +#define __SSE2__ 1 +#endif + #endif #endif diff --git a/libretro-common/lists/dir_list.c b/libretro-common/lists/dir_list.c index fc360f748b..10d73a50d5 100644 --- a/libretro-common/lists/dir_list.c +++ b/libretro-common/lists/dir_list.c @@ -230,6 +230,42 @@ error: return -1; } +/** + * dir_list_append: + * @list : existing list to append to. + * @dir : directory path. + * @ext : allowed extensions of file directory entries to include. + * @include_dirs : include directories as part of the finished directory listing? + * @include_hidden : include hidden files and directories as part of the finished directory listing? + * @include_compressed : Only include files which match ext. Do not try to match compressed files, etc. + * @recursive : list directory contents recursively + * + * Create a directory listing, appending to an existing list + * + * Returns: true success, false in case of error. + **/ +bool dir_list_append(struct string_list *list, + const char *dir, + const char *ext, bool include_dirs, + bool include_hidden, bool include_compressed, + bool recursive) +{ + struct string_list *ext_list = NULL; + + if (ext) + ext_list = string_split(ext, "|"); + + if(dir_list_read(dir, list, ext_list, include_dirs, + include_hidden, include_compressed, recursive) == -1) + { + string_list_free(ext_list); + return false; + } + + string_list_free(ext_list); + return true; +} + /** * dir_list_new: * @dir : directory path. @@ -249,24 +285,18 @@ struct string_list *dir_list_new(const char *dir, bool include_hidden, bool include_compressed, bool recursive) { - struct string_list *ext_list = NULL; struct string_list *list = NULL; if (!(list = string_list_new())) return NULL; - if (ext) - ext_list = string_split(ext, "|"); - - if(dir_list_read(dir, list, ext_list, include_dirs, - include_hidden, include_compressed, recursive) == -1) + if (!dir_list_append(list, dir, ext, include_dirs, + include_hidden, include_compressed, recursive)) { string_list_free(list); - string_list_free(ext_list); return NULL; } - string_list_free(ext_list); return list; } diff --git a/libretro-common/memmap/memalign.c b/libretro-common/memmap/memalign.c index 449d8471b8..6171e21783 100644 --- a/libretro-common/memmap/memalign.c +++ b/libretro-common/memmap/memalign.c @@ -54,9 +54,9 @@ void memalign_free(void *ptr) void *memalign_alloc_aligned(size_t size) { -#if defined(__x86_64__) || defined(__LP64) || defined(__IA64__) || defined(_M_X64) || defined(_WIN64) +#if defined(__x86_64__) || defined(__LP64) || defined(__IA64__) || defined(_M_X64) || defined(_M_X64) || defined(_WIN64) return memalign_alloc(64, size); -#elif defined(__i386__) || defined(__i486__) || defined(__i686__) || defined(GEKKO) +#elif defined(__i386__) || defined(__i486__) || defined(__i686__) || defined(GEKKO) || defined(_M_IX86) return memalign_alloc(32, size); #else return memalign_alloc(32, size); diff --git a/managers/state_manager.c b/managers/state_manager.c index 26425e3ded..9b8f5515d0 100644 --- a/managers/state_manager.c +++ b/managers/state_manager.c @@ -50,7 +50,7 @@ #define UINT32_MAX 0xffffffffu #endif -#if defined(__x86_64__) || defined(__i386__) || defined(__i486__) || defined(__i686__) +#if defined(__x86_64__) || defined(__i386__) || defined(__i486__) || defined(__i686__) || defined(_M_IX86) || defined(_M_AMD64) || defined(_M_X64) #define CPU_X86 #endif diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index cc742f2ce6..19d752cdd4 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -3609,6 +3609,7 @@ static unsigned menu_displaylist_parse_cores( unsigned items_found = 0; settings_t *settings = config_get_ptr(); const char *path = info->path; + bool ok; if (string_is_empty(path)) { @@ -3619,9 +3620,29 @@ static unsigned menu_displaylist_parse_cores( return items_found; } - str_list = dir_list_new(path, info->exts, + str_list = string_list_new(); + ok = dir_list_append(str_list, path, info->exts, true, settings->bools.show_hidden_files, true, false); +#ifdef __WINRT__ + /* UWP: browse the optional packages for additional cores */ + struct string_list *core_packages = string_list_new(); + uwp_fill_installed_core_packages(core_packages); + for (i = 0; i < core_packages->size; i++) + { + dir_list_append(str_list, core_packages->elems[i].data, info->exts, + true, settings->bools.show_hidden_files, true, false); + } + string_list_free(core_packages); +#else + /* Keep the old 'directory not found' behavior */ + if (!ok) + { + string_list_free(str_list); + str_list = NULL; + } +#endif + { char *out_dir = (char*)malloc(PATH_MAX_LENGTH * sizeof(char)); diff --git a/pkg/msvc-uwp/.gitignore b/pkg/msvc-uwp/.gitignore new file mode 100644 index 0000000000..c7d7d6c4da --- /dev/null +++ b/pkg/msvc-uwp/.gitignore @@ -0,0 +1,3 @@ +AppPackages/ +*/BundleArtifacts/ +.vs/ diff --git a/pkg/msvc/msvc-2017-UWP/Assets/LargeTile.scale-100.png b/pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/Assets/LargeTile.scale-100.png similarity index 100% rename from pkg/msvc/msvc-2017-UWP/Assets/LargeTile.scale-100.png rename to pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/Assets/LargeTile.scale-100.png diff --git a/pkg/msvc/msvc-2017-UWP/Assets/LargeTile.scale-200.png b/pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/Assets/LargeTile.scale-200.png similarity index 100% rename from pkg/msvc/msvc-2017-UWP/Assets/LargeTile.scale-200.png rename to pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/Assets/LargeTile.scale-200.png diff --git a/pkg/msvc/msvc-2017-UWP/Assets/LargeTile.scale-400.png b/pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/Assets/LargeTile.scale-400.png similarity index 100% rename from pkg/msvc/msvc-2017-UWP/Assets/LargeTile.scale-400.png rename to pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/Assets/LargeTile.scale-400.png diff --git a/pkg/msvc/msvc-2017-UWP/Assets/SmallTile.scale-100.png b/pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/Assets/SmallTile.scale-100.png similarity index 100% rename from pkg/msvc/msvc-2017-UWP/Assets/SmallTile.scale-100.png rename to pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/Assets/SmallTile.scale-100.png diff --git a/pkg/msvc/msvc-2017-UWP/Assets/SmallTile.scale-200.png b/pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/Assets/SmallTile.scale-200.png similarity index 100% rename from pkg/msvc/msvc-2017-UWP/Assets/SmallTile.scale-200.png rename to pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/Assets/SmallTile.scale-200.png diff --git a/pkg/msvc/msvc-2017-UWP/Assets/SmallTile.scale-400.png b/pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/Assets/SmallTile.scale-400.png similarity index 100% rename from pkg/msvc/msvc-2017-UWP/Assets/SmallTile.scale-400.png rename to pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/Assets/SmallTile.scale-400.png diff --git a/pkg/msvc/msvc-2017-UWP/Assets/Square150x150Logo.scale-100.png b/pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/Assets/Square150x150Logo.scale-100.png similarity index 100% rename from pkg/msvc/msvc-2017-UWP/Assets/Square150x150Logo.scale-100.png rename to pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/Assets/Square150x150Logo.scale-100.png diff --git a/pkg/msvc/msvc-2017-UWP/Assets/Square150x150Logo.scale-200.png b/pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/Assets/Square150x150Logo.scale-200.png similarity index 100% rename from pkg/msvc/msvc-2017-UWP/Assets/Square150x150Logo.scale-200.png rename to pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/Assets/Square150x150Logo.scale-200.png diff --git a/pkg/msvc/msvc-2017-UWP/Assets/Square150x150Logo.scale-400.png b/pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/Assets/Square150x150Logo.scale-400.png similarity index 100% rename from pkg/msvc/msvc-2017-UWP/Assets/Square150x150Logo.scale-400.png rename to pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/Assets/Square150x150Logo.scale-400.png diff --git a/pkg/msvc/msvc-2017-UWP/Assets/Square44x44Logo.altform-unplated_targetsize-16.png b/pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/Assets/Square44x44Logo.altform-unplated_targetsize-16.png similarity index 100% rename from pkg/msvc/msvc-2017-UWP/Assets/Square44x44Logo.altform-unplated_targetsize-16.png rename to pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/Assets/Square44x44Logo.altform-unplated_targetsize-16.png diff --git a/pkg/msvc/msvc-2017-UWP/Assets/Square44x44Logo.altform-unplated_targetsize-256.png b/pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/Assets/Square44x44Logo.altform-unplated_targetsize-256.png similarity index 100% rename from pkg/msvc/msvc-2017-UWP/Assets/Square44x44Logo.altform-unplated_targetsize-256.png rename to pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/Assets/Square44x44Logo.altform-unplated_targetsize-256.png diff --git a/pkg/msvc/msvc-2017-UWP/Assets/Square44x44Logo.altform-unplated_targetsize-48.png b/pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/Assets/Square44x44Logo.altform-unplated_targetsize-48.png similarity index 100% rename from pkg/msvc/msvc-2017-UWP/Assets/Square44x44Logo.altform-unplated_targetsize-48.png rename to pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/Assets/Square44x44Logo.altform-unplated_targetsize-48.png diff --git a/pkg/msvc/msvc-2017-UWP/Assets/Square44x44Logo.scale-100.png b/pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/Assets/Square44x44Logo.scale-100.png similarity index 100% rename from pkg/msvc/msvc-2017-UWP/Assets/Square44x44Logo.scale-100.png rename to pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/Assets/Square44x44Logo.scale-100.png diff --git a/pkg/msvc/msvc-2017-UWP/Assets/Square44x44Logo.scale-200.png b/pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/Assets/Square44x44Logo.scale-200.png similarity index 100% rename from pkg/msvc/msvc-2017-UWP/Assets/Square44x44Logo.scale-200.png rename to pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/Assets/Square44x44Logo.scale-200.png diff --git a/pkg/msvc/msvc-2017-UWP/Assets/Square44x44Logo.scale-400.png b/pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/Assets/Square44x44Logo.scale-400.png similarity index 100% rename from pkg/msvc/msvc-2017-UWP/Assets/Square44x44Logo.scale-400.png rename to pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/Assets/Square44x44Logo.scale-400.png diff --git a/pkg/msvc/msvc-2017-UWP/Assets/Square44x44Logo.targetsize-16.png b/pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/Assets/Square44x44Logo.targetsize-16.png similarity index 100% rename from pkg/msvc/msvc-2017-UWP/Assets/Square44x44Logo.targetsize-16.png rename to pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/Assets/Square44x44Logo.targetsize-16.png diff --git a/pkg/msvc/msvc-2017-UWP/Assets/Square44x44Logo.targetsize-256.png b/pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/Assets/Square44x44Logo.targetsize-256.png similarity index 100% rename from pkg/msvc/msvc-2017-UWP/Assets/Square44x44Logo.targetsize-256.png rename to pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/Assets/Square44x44Logo.targetsize-256.png diff --git a/pkg/msvc/msvc-2017-UWP/Assets/Square44x44Logo.targetsize-48.png b/pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/Assets/Square44x44Logo.targetsize-48.png similarity index 100% rename from pkg/msvc/msvc-2017-UWP/Assets/Square44x44Logo.targetsize-48.png rename to pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/Assets/Square44x44Logo.targetsize-48.png diff --git a/pkg/msvc/msvc-2017-UWP/Assets/StoreLogo.scale-100.png b/pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/Assets/StoreLogo.scale-100.png similarity index 100% rename from pkg/msvc/msvc-2017-UWP/Assets/StoreLogo.scale-100.png rename to pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/Assets/StoreLogo.scale-100.png diff --git a/pkg/msvc/msvc-2017-UWP/Assets/StoreLogo.scale-200.png b/pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/Assets/StoreLogo.scale-200.png similarity index 100% rename from pkg/msvc/msvc-2017-UWP/Assets/StoreLogo.scale-200.png rename to pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/Assets/StoreLogo.scale-200.png diff --git a/pkg/msvc/msvc-2017-UWP/Assets/StoreLogo.scale-400.png b/pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/Assets/StoreLogo.scale-400.png similarity index 100% rename from pkg/msvc/msvc-2017-UWP/Assets/StoreLogo.scale-400.png rename to pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/Assets/StoreLogo.scale-400.png diff --git a/pkg/msvc/msvc-2017-UWP/Assets/Wide310x150Logo.scale-100.png b/pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/Assets/Wide310x150Logo.scale-100.png similarity index 100% rename from pkg/msvc/msvc-2017-UWP/Assets/Wide310x150Logo.scale-100.png rename to pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/Assets/Wide310x150Logo.scale-100.png diff --git a/pkg/msvc/msvc-2017-UWP/Assets/Wide310x150Logo.scale-200.png b/pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/Assets/Wide310x150Logo.scale-200.png similarity index 100% rename from pkg/msvc/msvc-2017-UWP/Assets/Wide310x150Logo.scale-200.png rename to pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/Assets/Wide310x150Logo.scale-200.png diff --git a/pkg/msvc/msvc-2017-UWP/Assets/Wide310x150Logo.scale-400.png b/pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/Assets/Wide310x150Logo.scale-400.png similarity index 100% rename from pkg/msvc/msvc-2017-UWP/Assets/Wide310x150Logo.scale-400.png rename to pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/Assets/Wide310x150Logo.scale-400.png diff --git a/pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/Package.appxmanifest b/pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/Package.appxmanifest new file mode 100644 index 0000000000..c4a89d6664 --- /dev/null +++ b/pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/Package.appxmanifest @@ -0,0 +1,23 @@ + + + + + + RetroArch: non-free cores + libretro + Assets\StoreLogo.png + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/RetroArch-UWP-cores-nonfree.vcxproj b/pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/RetroArch-UWP-cores-nonfree.vcxproj new file mode 100644 index 0000000000..99539b2ed8 --- /dev/null +++ b/pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/RetroArch-UWP-cores-nonfree.vcxproj @@ -0,0 +1,230 @@ + + + + {cc7b9a23-bd64-4eb9-9d8f-f5115fb8960f} + RetroArchUWP_cores_nonfree + en-US + 14.0 + true + Windows Store + 10.0.17763.0 + 10.0.15063.0 + 10.0 + + + + + Debug + ARM + + + Debug + ARM64 + + + Debug + Win32 + + + Debug + x64 + + + Release + ARM + + + Release + ARM64 + + + Release + Win32 + + + Release + x64 + + + + Application + true + v141 + + + Application + true + v141 + + + Application + true + v141 + + + Application + true + v141 + true + + + Application + false + true + v141 + true + + + Application + false + true + v141 + true + + + Application + false + true + v141 + true + + + Application + false + true + v141 + true + + + + + + + + + + + + + + + + + + + + + + + + + ..\RetroArch-UWP\RetroArch-UWP_TemporaryKey.pfx + False + False + Always + x86|x64|arm + 1 + OnApplicationRun + + + + /bigobj %(AdditionalOptions) + 4453;28204 + NotUsing + + + + + /bigobj %(AdditionalOptions) + 4453;28204 + NotUsing + + + + + /bigobj %(AdditionalOptions) + 4453;28204 + NotUsing + + + + + /bigobj %(AdditionalOptions) + 4453;28204 + NotUsing + + + + + /bigobj %(AdditionalOptions) + 4453;28204 + NotUsing + + + + + /bigobj %(AdditionalOptions) + 4453;28204 + NotUsing + + + + + /bigobj %(AdditionalOptions) + 4453;28204 + NotUsing + + + + + /bigobj %(AdditionalOptions) + 4453;28204 + NotUsing + + + + + Designer + + + true + cores\%(Filename)%(Extension) + + + true + %(Filename)%(Extension) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/RetroArch-UWP-cores-nonfree.vcxproj.filters b/pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/RetroArch-UWP-cores-nonfree.vcxproj.filters new file mode 100644 index 0000000000..9834a81c26 --- /dev/null +++ b/pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/RetroArch-UWP-cores-nonfree.vcxproj.filters @@ -0,0 +1,100 @@ + + + + + 56304c12-6031-4556-a470-2c69aecd5919 + bmp;fbx;gif;jpg;jpeg;tga;tiff;tif;png + + + + + Assets + + + Assets + + + Assets + + + Assets + + + Assets + + + Assets + + + Assets + + + Assets + + + Assets + + + Assets + + + Assets + + + Assets + + + Assets + + + Assets + + + Assets + + + Assets + + + Assets + + + Assets + + + Assets + + + Assets + + + Assets + + + Assets + + + Assets + + + Assets + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/cores/ARM/.empty b/pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/cores/ARM/.empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/cores/ARM/cores/.empty b/pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/cores/ARM/cores/.empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/cores/ARM64/.empty b/pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/cores/ARM64/.empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/cores/ARM64/cores/.empty b/pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/cores/ARM64/cores/.empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/cores/Win32/.empty b/pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/cores/Win32/.empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/cores/Win32/cores/.empty b/pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/cores/Win32/cores/.empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/cores/x64/.empty b/pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/cores/x64/.empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/cores/x64/cores/.empty b/pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/cores/x64/cores/.empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/dummy.cpp b/pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/dummy.cpp new file mode 100644 index 0000000000..935c25a93c --- /dev/null +++ b/pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/dummy.cpp @@ -0,0 +1,5 @@ +[Platform::MTAThread] +int main(Platform::Array^) +{ + throw ref new Platform::NotImplementedException(); +} diff --git a/pkg/msvc/RetroArch-msvc2017-UWP.sln b/pkg/msvc-uwp/RetroArch-UWP.sln similarity index 50% rename from pkg/msvc/RetroArch-msvc2017-UWP.sln rename to pkg/msvc-uwp/RetroArch-UWP.sln index 30fad3eb7a..29d683556e 100644 --- a/pkg/msvc/RetroArch-msvc2017-UWP.sln +++ b/pkg/msvc-uwp/RetroArch-UWP.sln @@ -3,20 +3,25 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 VisualStudioVersion = 15.0.28307.168 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RetroArch-msvc2017-UWP", "msvc-2017-UWP\RetroArch-msvc2017-UWP.vcxproj", "{F5E937B6-1BA0-4446-B94B-F3BBDEF908F4}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RetroArch-UWP", "RetroArch-UWP\RetroArch-UWP.vcxproj", "{F5E937B6-1BA0-4446-B94B-F3BBDEF908F4}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RetroArch-UWP-cores-nonfree", "RetroArch-UWP-cores-nonfree\RetroArch-UWP-cores-nonfree.vcxproj", "{CC7B9A23-BD64-4EB9-9D8F-F5115FB8960F}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU Debug|ARM = Debug|ARM Debug|ARM64 = Debug|ARM64 Debug|x64 = Debug|x64 Debug|x86 = Debug|x86 + Release|Any CPU = Release|Any CPU Release|ARM = Release|ARM Release|ARM64 = Release|ARM64 Release|x64 = Release|x64 Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {F5E937B6-1BA0-4446-B94B-F3BBDEF908F4}.Debug|Any CPU.ActiveCfg = Debug|Win32 {F5E937B6-1BA0-4446-B94B-F3BBDEF908F4}.Debug|ARM.ActiveCfg = Debug|ARM {F5E937B6-1BA0-4446-B94B-F3BBDEF908F4}.Debug|ARM.Build.0 = Debug|ARM {F5E937B6-1BA0-4446-B94B-F3BBDEF908F4}.Debug|ARM.Deploy.0 = Debug|ARM @@ -29,6 +34,7 @@ Global {F5E937B6-1BA0-4446-B94B-F3BBDEF908F4}.Debug|x86.ActiveCfg = Debug|Win32 {F5E937B6-1BA0-4446-B94B-F3BBDEF908F4}.Debug|x86.Build.0 = Debug|Win32 {F5E937B6-1BA0-4446-B94B-F3BBDEF908F4}.Debug|x86.Deploy.0 = Debug|Win32 + {F5E937B6-1BA0-4446-B94B-F3BBDEF908F4}.Release|Any CPU.ActiveCfg = Release|Win32 {F5E937B6-1BA0-4446-B94B-F3BBDEF908F4}.Release|ARM.ActiveCfg = Release|ARM {F5E937B6-1BA0-4446-B94B-F3BBDEF908F4}.Release|ARM.Build.0 = Release|ARM {F5E937B6-1BA0-4446-B94B-F3BBDEF908F4}.Release|ARM.Deploy.0 = Release|ARM @@ -41,6 +47,32 @@ Global {F5E937B6-1BA0-4446-B94B-F3BBDEF908F4}.Release|x86.ActiveCfg = Release|Win32 {F5E937B6-1BA0-4446-B94B-F3BBDEF908F4}.Release|x86.Build.0 = Release|Win32 {F5E937B6-1BA0-4446-B94B-F3BBDEF908F4}.Release|x86.Deploy.0 = Release|Win32 + {CC7B9A23-BD64-4EB9-9D8F-F5115FB8960F}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {CC7B9A23-BD64-4EB9-9D8F-F5115FB8960F}.Debug|ARM.ActiveCfg = Debug|ARM + {CC7B9A23-BD64-4EB9-9D8F-F5115FB8960F}.Debug|ARM.Build.0 = Debug|ARM + {CC7B9A23-BD64-4EB9-9D8F-F5115FB8960F}.Debug|ARM.Deploy.0 = Debug|ARM + {CC7B9A23-BD64-4EB9-9D8F-F5115FB8960F}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {CC7B9A23-BD64-4EB9-9D8F-F5115FB8960F}.Debug|ARM64.Build.0 = Debug|ARM64 + {CC7B9A23-BD64-4EB9-9D8F-F5115FB8960F}.Debug|ARM64.Deploy.0 = Debug|ARM64 + {CC7B9A23-BD64-4EB9-9D8F-F5115FB8960F}.Debug|x64.ActiveCfg = Debug|x64 + {CC7B9A23-BD64-4EB9-9D8F-F5115FB8960F}.Debug|x64.Build.0 = Debug|x64 + {CC7B9A23-BD64-4EB9-9D8F-F5115FB8960F}.Debug|x64.Deploy.0 = Debug|x64 + {CC7B9A23-BD64-4EB9-9D8F-F5115FB8960F}.Debug|x86.ActiveCfg = Debug|Win32 + {CC7B9A23-BD64-4EB9-9D8F-F5115FB8960F}.Debug|x86.Build.0 = Debug|Win32 + {CC7B9A23-BD64-4EB9-9D8F-F5115FB8960F}.Debug|x86.Deploy.0 = Debug|Win32 + {CC7B9A23-BD64-4EB9-9D8F-F5115FB8960F}.Release|Any CPU.ActiveCfg = Release|Win32 + {CC7B9A23-BD64-4EB9-9D8F-F5115FB8960F}.Release|ARM.ActiveCfg = Release|ARM + {CC7B9A23-BD64-4EB9-9D8F-F5115FB8960F}.Release|ARM.Build.0 = Release|ARM + {CC7B9A23-BD64-4EB9-9D8F-F5115FB8960F}.Release|ARM.Deploy.0 = Release|ARM + {CC7B9A23-BD64-4EB9-9D8F-F5115FB8960F}.Release|ARM64.ActiveCfg = Release|ARM64 + {CC7B9A23-BD64-4EB9-9D8F-F5115FB8960F}.Release|ARM64.Build.0 = Release|ARM64 + {CC7B9A23-BD64-4EB9-9D8F-F5115FB8960F}.Release|ARM64.Deploy.0 = Release|ARM64 + {CC7B9A23-BD64-4EB9-9D8F-F5115FB8960F}.Release|x64.ActiveCfg = Release|x64 + {CC7B9A23-BD64-4EB9-9D8F-F5115FB8960F}.Release|x64.Build.0 = Release|x64 + {CC7B9A23-BD64-4EB9-9D8F-F5115FB8960F}.Release|x64.Deploy.0 = Release|x64 + {CC7B9A23-BD64-4EB9-9D8F-F5115FB8960F}.Release|x86.ActiveCfg = Release|Win32 + {CC7B9A23-BD64-4EB9-9D8F-F5115FB8960F}.Release|x86.Build.0 = Release|Win32 + {CC7B9A23-BD64-4EB9-9D8F-F5115FB8960F}.Release|x86.Deploy.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/pkg/msvc-uwp/RetroArch-UWP/Assets/LargeTile.scale-100.png b/pkg/msvc-uwp/RetroArch-UWP/Assets/LargeTile.scale-100.png new file mode 100644 index 0000000000..f731463086 Binary files /dev/null and b/pkg/msvc-uwp/RetroArch-UWP/Assets/LargeTile.scale-100.png differ diff --git a/pkg/msvc-uwp/RetroArch-UWP/Assets/LargeTile.scale-200.png b/pkg/msvc-uwp/RetroArch-UWP/Assets/LargeTile.scale-200.png new file mode 100644 index 0000000000..80c1425605 Binary files /dev/null and b/pkg/msvc-uwp/RetroArch-UWP/Assets/LargeTile.scale-200.png differ diff --git a/pkg/msvc-uwp/RetroArch-UWP/Assets/LargeTile.scale-400.png b/pkg/msvc-uwp/RetroArch-UWP/Assets/LargeTile.scale-400.png new file mode 100644 index 0000000000..85140caac2 Binary files /dev/null and b/pkg/msvc-uwp/RetroArch-UWP/Assets/LargeTile.scale-400.png differ diff --git a/pkg/msvc-uwp/RetroArch-UWP/Assets/SmallTile.scale-100.png b/pkg/msvc-uwp/RetroArch-UWP/Assets/SmallTile.scale-100.png new file mode 100644 index 0000000000..ef1f5dc6a8 Binary files /dev/null and b/pkg/msvc-uwp/RetroArch-UWP/Assets/SmallTile.scale-100.png differ diff --git a/pkg/msvc-uwp/RetroArch-UWP/Assets/SmallTile.scale-200.png b/pkg/msvc-uwp/RetroArch-UWP/Assets/SmallTile.scale-200.png new file mode 100644 index 0000000000..ca2057c758 Binary files /dev/null and b/pkg/msvc-uwp/RetroArch-UWP/Assets/SmallTile.scale-200.png differ diff --git a/pkg/msvc-uwp/RetroArch-UWP/Assets/SmallTile.scale-400.png b/pkg/msvc-uwp/RetroArch-UWP/Assets/SmallTile.scale-400.png new file mode 100644 index 0000000000..398721a461 Binary files /dev/null and b/pkg/msvc-uwp/RetroArch-UWP/Assets/SmallTile.scale-400.png differ diff --git a/pkg/msvc/msvc-2017-UWP/Assets/SplashScreen.scale-100.png b/pkg/msvc-uwp/RetroArch-UWP/Assets/SplashScreen.scale-100.png similarity index 100% rename from pkg/msvc/msvc-2017-UWP/Assets/SplashScreen.scale-100.png rename to pkg/msvc-uwp/RetroArch-UWP/Assets/SplashScreen.scale-100.png diff --git a/pkg/msvc/msvc-2017-UWP/Assets/SplashScreen.scale-200.png b/pkg/msvc-uwp/RetroArch-UWP/Assets/SplashScreen.scale-200.png similarity index 100% rename from pkg/msvc/msvc-2017-UWP/Assets/SplashScreen.scale-200.png rename to pkg/msvc-uwp/RetroArch-UWP/Assets/SplashScreen.scale-200.png diff --git a/pkg/msvc/msvc-2017-UWP/Assets/SplashScreen.scale-400.png b/pkg/msvc-uwp/RetroArch-UWP/Assets/SplashScreen.scale-400.png similarity index 100% rename from pkg/msvc/msvc-2017-UWP/Assets/SplashScreen.scale-400.png rename to pkg/msvc-uwp/RetroArch-UWP/Assets/SplashScreen.scale-400.png diff --git a/pkg/msvc-uwp/RetroArch-UWP/Assets/Square150x150Logo.scale-100.png b/pkg/msvc-uwp/RetroArch-UWP/Assets/Square150x150Logo.scale-100.png new file mode 100644 index 0000000000..3b3b57758c Binary files /dev/null and b/pkg/msvc-uwp/RetroArch-UWP/Assets/Square150x150Logo.scale-100.png differ diff --git a/pkg/msvc-uwp/RetroArch-UWP/Assets/Square150x150Logo.scale-200.png b/pkg/msvc-uwp/RetroArch-UWP/Assets/Square150x150Logo.scale-200.png new file mode 100644 index 0000000000..22ebaab856 Binary files /dev/null and b/pkg/msvc-uwp/RetroArch-UWP/Assets/Square150x150Logo.scale-200.png differ diff --git a/pkg/msvc-uwp/RetroArch-UWP/Assets/Square150x150Logo.scale-400.png b/pkg/msvc-uwp/RetroArch-UWP/Assets/Square150x150Logo.scale-400.png new file mode 100644 index 0000000000..efe1abaff7 Binary files /dev/null and b/pkg/msvc-uwp/RetroArch-UWP/Assets/Square150x150Logo.scale-400.png differ diff --git a/pkg/msvc-uwp/RetroArch-UWP/Assets/Square44x44Logo.altform-unplated_targetsize-16.png b/pkg/msvc-uwp/RetroArch-UWP/Assets/Square44x44Logo.altform-unplated_targetsize-16.png new file mode 100644 index 0000000000..d5b34622f9 Binary files /dev/null and b/pkg/msvc-uwp/RetroArch-UWP/Assets/Square44x44Logo.altform-unplated_targetsize-16.png differ diff --git a/pkg/msvc-uwp/RetroArch-UWP/Assets/Square44x44Logo.altform-unplated_targetsize-256.png b/pkg/msvc-uwp/RetroArch-UWP/Assets/Square44x44Logo.altform-unplated_targetsize-256.png new file mode 100644 index 0000000000..22c0960e8d Binary files /dev/null and b/pkg/msvc-uwp/RetroArch-UWP/Assets/Square44x44Logo.altform-unplated_targetsize-256.png differ diff --git a/pkg/msvc-uwp/RetroArch-UWP/Assets/Square44x44Logo.altform-unplated_targetsize-48.png b/pkg/msvc-uwp/RetroArch-UWP/Assets/Square44x44Logo.altform-unplated_targetsize-48.png new file mode 100644 index 0000000000..2a253ca049 Binary files /dev/null and b/pkg/msvc-uwp/RetroArch-UWP/Assets/Square44x44Logo.altform-unplated_targetsize-48.png differ diff --git a/pkg/msvc-uwp/RetroArch-UWP/Assets/Square44x44Logo.scale-100.png b/pkg/msvc-uwp/RetroArch-UWP/Assets/Square44x44Logo.scale-100.png new file mode 100644 index 0000000000..8b7216b8d8 Binary files /dev/null and b/pkg/msvc-uwp/RetroArch-UWP/Assets/Square44x44Logo.scale-100.png differ diff --git a/pkg/msvc-uwp/RetroArch-UWP/Assets/Square44x44Logo.scale-200.png b/pkg/msvc-uwp/RetroArch-UWP/Assets/Square44x44Logo.scale-200.png new file mode 100644 index 0000000000..6fec1f0113 Binary files /dev/null and b/pkg/msvc-uwp/RetroArch-UWP/Assets/Square44x44Logo.scale-200.png differ diff --git a/pkg/msvc-uwp/RetroArch-UWP/Assets/Square44x44Logo.scale-400.png b/pkg/msvc-uwp/RetroArch-UWP/Assets/Square44x44Logo.scale-400.png new file mode 100644 index 0000000000..5e2a9c1e20 Binary files /dev/null and b/pkg/msvc-uwp/RetroArch-UWP/Assets/Square44x44Logo.scale-400.png differ diff --git a/pkg/msvc-uwp/RetroArch-UWP/Assets/Square44x44Logo.targetsize-16.png b/pkg/msvc-uwp/RetroArch-UWP/Assets/Square44x44Logo.targetsize-16.png new file mode 100644 index 0000000000..979d24169f Binary files /dev/null and b/pkg/msvc-uwp/RetroArch-UWP/Assets/Square44x44Logo.targetsize-16.png differ diff --git a/pkg/msvc-uwp/RetroArch-UWP/Assets/Square44x44Logo.targetsize-256.png b/pkg/msvc-uwp/RetroArch-UWP/Assets/Square44x44Logo.targetsize-256.png new file mode 100644 index 0000000000..1f953b2fc8 Binary files /dev/null and b/pkg/msvc-uwp/RetroArch-UWP/Assets/Square44x44Logo.targetsize-256.png differ diff --git a/pkg/msvc-uwp/RetroArch-UWP/Assets/Square44x44Logo.targetsize-48.png b/pkg/msvc-uwp/RetroArch-UWP/Assets/Square44x44Logo.targetsize-48.png new file mode 100644 index 0000000000..82b200438a Binary files /dev/null and b/pkg/msvc-uwp/RetroArch-UWP/Assets/Square44x44Logo.targetsize-48.png differ diff --git a/pkg/msvc-uwp/RetroArch-UWP/Assets/StoreLogo.scale-100.png b/pkg/msvc-uwp/RetroArch-UWP/Assets/StoreLogo.scale-100.png new file mode 100644 index 0000000000..a065bc4725 Binary files /dev/null and b/pkg/msvc-uwp/RetroArch-UWP/Assets/StoreLogo.scale-100.png differ diff --git a/pkg/msvc-uwp/RetroArch-UWP/Assets/StoreLogo.scale-200.png b/pkg/msvc-uwp/RetroArch-UWP/Assets/StoreLogo.scale-200.png new file mode 100644 index 0000000000..2f37ce6d7d Binary files /dev/null and b/pkg/msvc-uwp/RetroArch-UWP/Assets/StoreLogo.scale-200.png differ diff --git a/pkg/msvc-uwp/RetroArch-UWP/Assets/StoreLogo.scale-400.png b/pkg/msvc-uwp/RetroArch-UWP/Assets/StoreLogo.scale-400.png new file mode 100644 index 0000000000..bc17a33e34 Binary files /dev/null and b/pkg/msvc-uwp/RetroArch-UWP/Assets/StoreLogo.scale-400.png differ diff --git a/pkg/msvc-uwp/RetroArch-UWP/Assets/Wide310x150Logo.scale-100.png b/pkg/msvc-uwp/RetroArch-UWP/Assets/Wide310x150Logo.scale-100.png new file mode 100644 index 0000000000..6253947fdc Binary files /dev/null and b/pkg/msvc-uwp/RetroArch-UWP/Assets/Wide310x150Logo.scale-100.png differ diff --git a/pkg/msvc-uwp/RetroArch-UWP/Assets/Wide310x150Logo.scale-200.png b/pkg/msvc-uwp/RetroArch-UWP/Assets/Wide310x150Logo.scale-200.png new file mode 100644 index 0000000000..7053ee0bbf Binary files /dev/null and b/pkg/msvc-uwp/RetroArch-UWP/Assets/Wide310x150Logo.scale-200.png differ diff --git a/pkg/msvc-uwp/RetroArch-UWP/Assets/Wide310x150Logo.scale-400.png b/pkg/msvc-uwp/RetroArch-UWP/Assets/Wide310x150Logo.scale-400.png new file mode 100644 index 0000000000..a0661bc4aa Binary files /dev/null and b/pkg/msvc-uwp/RetroArch-UWP/Assets/Wide310x150Logo.scale-400.png differ diff --git a/pkg/msvc-uwp/RetroArch-UWP/Bundle.Mapping.txt b/pkg/msvc-uwp/RetroArch-UWP/Bundle.Mapping.txt new file mode 100644 index 0000000000..5e48e1ae47 --- /dev/null +++ b/pkg/msvc-uwp/RetroArch-UWP/Bundle.Mapping.txt @@ -0,0 +1,2 @@ +[ExternalPackages] +"..\AppPackages\RetroArch-UWP-cores-nonfree\RetroArch-UWP-cores-nonfree_1.0.0.0_Test\RetroArch-UWP-cores-nonfree_1.0.0.0_x86_x64_arm.appxbundle" diff --git a/pkg/msvc/msvc-2017-UWP/Package.appxmanifest b/pkg/msvc-uwp/RetroArch-UWP/Package.appxmanifest similarity index 95% rename from pkg/msvc/msvc-2017-UWP/Package.appxmanifest rename to pkg/msvc-uwp/RetroArch-UWP/Package.appxmanifest index ba8189e07c..e1d4376bbd 100644 --- a/pkg/msvc/msvc-2017-UWP/Package.appxmanifest +++ b/pkg/msvc-uwp/RetroArch-UWP/Package.appxmanifest @@ -1,4 +1,4 @@ - + @@ -8,7 +8,7 @@ Assets\StoreLogo.png - + @@ -26,4 +26,4 @@ - \ No newline at end of file + diff --git a/pkg/msvc/msvc-2017-UWP/RetroArch-msvc2017-UWP.vcxproj b/pkg/msvc-uwp/RetroArch-UWP/RetroArch-UWP.vcxproj similarity index 91% rename from pkg/msvc/msvc-2017-UWP/RetroArch-msvc2017-UWP.vcxproj rename to pkg/msvc-uwp/RetroArch-UWP/RetroArch-UWP.vcxproj index 85cc79217b..1f21ca7a6c 100644 --- a/pkg/msvc/msvc-2017-UWP/RetroArch-msvc2017-UWP.vcxproj +++ b/pkg/msvc-uwp/RetroArch-UWP/RetroArch-UWP.vcxproj @@ -1,317 +1,337 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - Debug - ARM - - - Release - ARM - - - Debug - ARM64 - - - Release - ARM64 - - - - {f5e937b6-1ba0-4446-b94b-f3bbdef908f4} - DirectXApp - RetroArchUWP - en-US - 14.0 - true - Windows Store - 10.0.17763.0 - 10.0.15063.0 - 10.0 - - - - Application - true - v141 - - - Application - true - v141 - - - Application - true - v141 - true - - - Application - true - v141 - - - Application - false - true - v141 - true - - - Application - false - true - v141 - true - - - Application - false - true - v141 - true - - - Application - false - true - v141 - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - msvc-2017-UWP_TemporaryKey.pfx - - - - d2d1.lib; d3d11.lib; dxgi.lib; windowscodecs.lib; dwrite.lib; dxguid.lib; %(AdditionalDependencies) - %(AdditionalLibraryDirectories); $(VCInstallDir)\lib\store\arm; $(VCInstallDir)\lib\arm - /nodefaultlib:vccorlibd /nodefaultlib:msvcrtd vccorlibd.lib msvcrtd.lib %(AdditionalOptions) - - - - - $(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\..\;$(MSBuildProjectDirectory)\..\..\..\deps\rcheevos\include;$(MSBuildProjectDirectory)\..\..\..\deps\zlib;$(MSBuildProjectDirectory)\..\..\..\libretro-common\include;$(MSBuildProjectDirectory)\..\..\..\deps;$(MSBuildProjectDirectory)\..\..\..\deps\glslang;$(MSBuildProjectDirectory)\..\..\..\deps\SPIRV-Cross;$(MSBuildProjectDirectory)\..\..\..\deps\stb;$(MSBuildProjectDirectory)\..\..\..\gfx\include;%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) - 4453;28204 - WIN32;HAVE_MAIN;HAVE_DYNAMIC;HAVE_XAUDIO2;RARCH_INTERNAL;HAVE_CC_RESAMPLER;WANT_GLSLANG;HAVE_GLSLANG;HAVE_SLANG;HAVE_SPIRV_CROSS;HAVE_UPDATE_ASSETS;HAVE_D3D;HAVE_D3D11;HAVE_D3D12;ENABLE_HLSL;RC_DISABLE_LUA;HAVE_CHEEVOS;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_FBO;HAVE_ZLIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;_DEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_XINPUT;HAVE_XINPUT2;HAVE_XAUDIO;HAVE_DIRECTX;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_NETPLAYDISCOVERY;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;__SSE__;__i686__;HAVE_OVERLAY;HAVE_RGUI;HAVE_MENU;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT;HAVE_STATIC_DUMMY;HAVE_STATIC_VIDEO_FILTERS;HAVE_STATIC_AUDIO_FILTERS - - - - - d2d1.lib; d3d11.lib; dxgi.lib; windowscodecs.lib; dwrite.lib; dxguid.lib; %(AdditionalDependencies) - %(AdditionalLibraryDirectories); $(VCInstallDir)\lib\store\arm; $(VCInstallDir)\lib\arm - /nodefaultlib:vccorlib /nodefaultlib:msvcrt vccorlib.lib msvcrt.lib %(AdditionalOptions) - - - - - $(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\..\;$(MSBuildProjectDirectory)\..\..\..\deps\rcheevos\include;$(MSBuildProjectDirectory)\..\..\..\deps\zlib;$(MSBuildProjectDirectory)\..\..\..\libretro-common\include;$(MSBuildProjectDirectory)\..\..\..\deps;$(MSBuildProjectDirectory)\..\..\..\deps\glslang;$(MSBuildProjectDirectory)\..\..\..\deps\SPIRV-Cross;$(MSBuildProjectDirectory)\..\..\..\deps\stb;$(MSBuildProjectDirectory)\..\..\..\gfx\include;%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) - 4453;28204 - WIN32;HAVE_MAIN;HAVE_DYNAMIC;HAVE_XAUDIO2;RARCH_INTERNAL;HAVE_CC_RESAMPLER;WANT_GLSLANG;HAVE_GLSLANG;HAVE_SLANG;HAVE_SPIRV_CROSS;HAVE_UPDATE_ASSETS;HAVE_D3D;HAVE_D3D11;HAVE_D3D12;ENABLE_HLSL;RC_DISABLE_LUA;HAVE_CHEEVOS;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_FBO;HAVE_ZLIB;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_XINPUT;HAVE_XINPUT2;HAVE_XAUDIO;HAVE_DIRECTX;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_NETPLAYDISCOVERY;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;__SSE__;__i686__;HAVE_OVERLAY;HAVE_MENU;HAVE_RGUI;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT;HAVE_STATIC_DUMMY;HAVE_STATIC_VIDEO_FILTERS;HAVE_STATIC_AUDIO_FILTERS - - - - - d2d1.lib; d3d11.lib; dxgi.lib; windowscodecs.lib; dwrite.lib; dxguid.lib; %(AdditionalDependencies) - %(AdditionalLibraryDirectories); $(VCInstallDir)\lib\store\arm64; $(VCInstallDir)\lib\arm64 - /nodefaultlib:vccorlibd /nodefaultlib:msvcrtd vccorlibd.lib msvcrtd.lib %(AdditionalOptions) - - - - - $(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\..\;$(MSBuildProjectDirectory)\..\..\..\deps\rcheevos\include;$(MSBuildProjectDirectory)\..\..\..\deps\zlib;$(MSBuildProjectDirectory)\..\..\..\libretro-common\include;$(MSBuildProjectDirectory)\..\..\..\deps;$(MSBuildProjectDirectory)\..\..\..\deps\glslang;$(MSBuildProjectDirectory)\..\..\..\deps\SPIRV-Cross;$(MSBuildProjectDirectory)\..\..\..\deps\stb;$(MSBuildProjectDirectory)\..\..\..\gfx\include;%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) - 4453;28204 - WIN32;HAVE_MAIN;HAVE_DYNAMIC;HAVE_XAUDIO2;RARCH_INTERNAL;HAVE_CC_RESAMPLER;WANT_GLSLANG;HAVE_GLSLANG;HAVE_SLANG;HAVE_SPIRV_CROSS;HAVE_UPDATE_ASSETS;HAVE_D3D;HAVE_D3D11;HAVE_D3D12;ENABLE_HLSL;RC_DISABLE_LUA;HAVE_CHEEVOS;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_FBO;HAVE_ZLIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;_DEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_XINPUT;HAVE_XINPUT2;HAVE_XAUDIO;HAVE_DIRECTX;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_NETPLAYDISCOVERY;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;__SSE__;__i686__;HAVE_OVERLAY;HAVE_RGUI;HAVE_MENU;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT;HAVE_STATIC_DUMMY;HAVE_STATIC_VIDEO_FILTERS;HAVE_STATIC_AUDIO_FILTERS - - - - - d2d1.lib; d3d11.lib; dxgi.lib; windowscodecs.lib; dwrite.lib; dxguid.lib; %(AdditionalDependencies) - %(AdditionalLibraryDirectories); $(VCInstallDir)\lib\store\arm64; $(VCInstallDir)\lib\arm64 - /nodefaultlib:vccorlib /nodefaultlib:msvcrt vccorlib.lib msvcrt.lib %(AdditionalOptions) - - - - - $(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\..\;$(MSBuildProjectDirectory)\..\..\..\deps\rcheevos\include;$(MSBuildProjectDirectory)\..\..\..\deps\zlib;$(MSBuildProjectDirectory)\..\..\..\libretro-common\include;$(MSBuildProjectDirectory)\..\..\..\deps;$(MSBuildProjectDirectory)\..\..\..\deps\glslang;$(MSBuildProjectDirectory)\..\..\..\deps\SPIRV-Cross;$(MSBuildProjectDirectory)\..\..\..\deps\stb;$(MSBuildProjectDirectory)\..\..\..\gfx\include;%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) - 4453;28204 - WIN32;HAVE_MAIN;HAVE_DYNAMIC;HAVE_XAUDIO2;RARCH_INTERNAL;HAVE_CC_RESAMPLER;WANT_GLSLANG;HAVE_GLSLANG;HAVE_SLANG;HAVE_SPIRV_CROSS;HAVE_UPDATE_ASSETS;HAVE_D3D;HAVE_D3D11;HAVE_D3D12;ENABLE_HLSL;RC_DISABLE_LUA;HAVE_CHEEVOS;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_FBO;HAVE_ZLIB;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_XINPUT;HAVE_XINPUT2;HAVE_XAUDIO;HAVE_DIRECTX;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_NETPLAYDISCOVERY;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;__SSE__;__i686__;HAVE_OVERLAY;HAVE_MENU;HAVE_RGUI;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT;HAVE_STATIC_DUMMY;HAVE_STATIC_VIDEO_FILTERS;HAVE_STATIC_AUDIO_FILTERS - - - - - d2d1.lib; d3d11.lib; dxgi.lib; windowscodecs.lib; dwrite.lib; dxguid.lib; %(AdditionalDependencies) - %(AdditionalLibraryDirectories); $(VCInstallDir)\lib\store; $(VCInstallDir)\lib - /nodefaultlib:vccorlibd /nodefaultlib:msvcrtd vccorlibd.lib msvcrtd.lib %(AdditionalOptions) - - - - - $(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\..\;$(MSBuildProjectDirectory)\..\..\..\deps\rcheevos\include;$(MSBuildProjectDirectory)\..\..\..\deps\zlib;$(MSBuildProjectDirectory)\..\..\..\libretro-common\include;$(MSBuildProjectDirectory)\..\..\..\deps;$(MSBuildProjectDirectory)\..\..\..\deps\glslang;$(MSBuildProjectDirectory)\..\..\..\deps\SPIRV-Cross;$(MSBuildProjectDirectory)\..\..\..\deps\stb;$(MSBuildProjectDirectory)\..\..\..\gfx\include;%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) - 4453;28204 - WIN32;HAVE_MAIN;HAVE_DYNAMIC;HAVE_XAUDIO2;RARCH_INTERNAL;HAVE_CC_RESAMPLER;WANT_GLSLANG;HAVE_GLSLANG;HAVE_SLANG;HAVE_SPIRV_CROSS;HAVE_UPDATE_ASSETS;HAVE_D3D;HAVE_D3D11;HAVE_D3D12;ENABLE_HLSL;RC_DISABLE_LUA;HAVE_CHEEVOS;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_FBO;HAVE_ZLIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;_DEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_XINPUT;HAVE_XINPUT2;HAVE_XAUDIO;HAVE_DIRECTX;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_NETPLAYDISCOVERY;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;__SSE__;__i686__;HAVE_OVERLAY;HAVE_RGUI;HAVE_MENU;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT;HAVE_STATIC_DUMMY;HAVE_STATIC_VIDEO_FILTERS;HAVE_STATIC_AUDIO_FILTERS - ProgramDatabase - - - - - d2d1.lib; d3d11.lib; dxgi.lib; windowscodecs.lib; dwrite.lib; dxguid.lib; %(AdditionalDependencies) - %(AdditionalLibraryDirectories); $(VCInstallDir)\lib\store; $(VCInstallDir)\lib - /nodefaultlib:vccorlib /nodefaultlib:msvcrt vccorlib.lib msvcrt.lib %(AdditionalOptions) - - - - - $(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\..\;$(MSBuildProjectDirectory)\..\..\..\deps\rcheevos\include;$(MSBuildProjectDirectory)\..\..\..\deps\zlib;$(MSBuildProjectDirectory)\..\..\..\libretro-common\include;$(MSBuildProjectDirectory)\..\..\..\deps;$(MSBuildProjectDirectory)\..\..\..\deps\glslang;$(MSBuildProjectDirectory)\..\..\..\deps\SPIRV-Cross;$(MSBuildProjectDirectory)\..\..\..\deps\stb;$(MSBuildProjectDirectory)\..\..\..\gfx\include;%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) - 4453;28204 - WIN32;HAVE_MAIN;HAVE_DYNAMIC;HAVE_XAUDIO2;RARCH_INTERNAL;HAVE_CC_RESAMPLER;WANT_GLSLANG;HAVE_GLSLANG;HAVE_SLANG;HAVE_SPIRV_CROSS;HAVE_UPDATE_ASSETS;HAVE_D3D;HAVE_D3D11;HAVE_D3D12;ENABLE_HLSL;RC_DISABLE_LUA;HAVE_CHEEVOS;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_FBO;HAVE_ZLIB;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_XINPUT;HAVE_XINPUT2;HAVE_XAUDIO;HAVE_DIRECTX;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_NETPLAYDISCOVERY;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;__SSE__;__i686__;HAVE_OVERLAY;HAVE_MENU;HAVE_RGUI;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT;HAVE_STATIC_DUMMY;HAVE_STATIC_VIDEO_FILTERS;HAVE_STATIC_AUDIO_FILTERS - - - - - d2d1.lib; d3d11.lib; dxgi.lib; windowscodecs.lib; dwrite.lib; dxguid.lib; %(AdditionalDependencies) - %(AdditionalLibraryDirectories); $(VCInstallDir)\lib\store\amd64; $(VCInstallDir)\lib\amd64 - /nodefaultlib:vccorlibd /nodefaultlib:msvcrtd vccorlibd.lib msvcrtd.lib %(AdditionalOptions) - - - - - $(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\..\;$(MSBuildProjectDirectory)\..\..\..\deps\rcheevos\include;$(MSBuildProjectDirectory)\..\..\..\deps\zlib;$(MSBuildProjectDirectory)\..\..\..\libretro-common\include;$(MSBuildProjectDirectory)\..\..\..\deps;$(MSBuildProjectDirectory)\..\..\..\deps\glslang;$(MSBuildProjectDirectory)\..\..\..\deps\SPIRV-Cross;$(MSBuildProjectDirectory)\..\..\..\deps\stb;$(MSBuildProjectDirectory)\..\..\..\gfx\include;%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) - 4453;28204 - WIN32;HAVE_MAIN;HAVE_DYNAMIC;HAVE_XAUDIO2;RARCH_INTERNAL;HAVE_CC_RESAMPLER;WANT_GLSLANG;HAVE_GLSLANG;HAVE_SLANG;HAVE_SPIRV_CROSS;HAVE_UPDATE_ASSETS;HAVE_D3D;HAVE_D3D11;HAVE_D3D12;ENABLE_HLSL;RC_DISABLE_LUA;HAVE_CHEEVOS;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_FBO;HAVE_ZLIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;_DEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_XINPUT;HAVE_XINPUT2;HAVE_XAUDIO;HAVE_DIRECTX;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_NETPLAYDISCOVERY;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;__SSE__;__i686__;HAVE_OVERLAY;HAVE_RGUI;HAVE_MENU;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT;HAVE_STATIC_DUMMY;HAVE_STATIC_VIDEO_FILTERS;HAVE_STATIC_AUDIO_FILTERS - ProgramDatabase - - - - - d2d1.lib; d3d11.lib; dxgi.lib; windowscodecs.lib; dwrite.lib; dxguid.lib; %(AdditionalDependencies) - %(AdditionalLibraryDirectories); $(VCInstallDir)\lib\store\amd64; $(VCInstallDir)\lib\amd64 - /nodefaultlib:vccorlib /nodefaultlib:msvcrt vccorlib.lib msvcrt.lib %(AdditionalOptions) - - - - - $(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\..\;$(MSBuildProjectDirectory)\..\..\..\deps\rcheevos\include;$(MSBuildProjectDirectory)\..\..\..\deps\zlib;$(MSBuildProjectDirectory)\..\..\..\libretro-common\include;$(MSBuildProjectDirectory)\..\..\..\deps;$(MSBuildProjectDirectory)\..\..\..\deps\glslang;$(MSBuildProjectDirectory)\..\..\..\deps\SPIRV-Cross;$(MSBuildProjectDirectory)\..\..\..\deps\stb;$(MSBuildProjectDirectory)\..\..\..\gfx\include;%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) - 4453;28204 - WIN32;HAVE_MAIN;HAVE_DYNAMIC;HAVE_XAUDIO2;RARCH_INTERNAL;HAVE_CC_RESAMPLER;WANT_GLSLANG;HAVE_GLSLANG;HAVE_SLANG;HAVE_SPIRV_CROSS;HAVE_UPDATE_ASSETS;HAVE_D3D;HAVE_D3D11;HAVE_D3D12;ENABLE_HLSL;RC_DISABLE_LUA;HAVE_CHEEVOS;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_FBO;HAVE_ZLIB;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_XINPUT;HAVE_XINPUT2;HAVE_XAUDIO;HAVE_DIRECTX;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_NETPLAYDISCOVERY;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;__SSE__;__i686__;HAVE_OVERLAY;HAVE_MENU;HAVE_RGUI;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT;HAVE_STATIC_DUMMY;HAVE_STATIC_VIDEO_FILTERS;HAVE_STATIC_AUDIO_FILTERS - - - - - false - false - false - false - false - false - false - false - - - - - - - - - - Designer - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + Debug + ARM + + + Release + ARM + + + Debug + ARM64 + + + Release + ARM64 + + + + {f5e937b6-1ba0-4446-b94b-f3bbdef908f4} + DirectXApp + RetroArchUWP + en-US + 14.0 + true + Windows Store + 10.0 + 10.0.17763.0 + 10.0.15063.0 + true + + + + Application + true + v141 + + + Application + true + v141 + + + Application + true + v141 + true + + + Application + true + v141 + + + Application + false + true + v141 + true + + + Application + false + true + v141 + true + + + Application + false + true + v141 + true + + + Application + false + true + v141 + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + RetroArch-UWP_TemporaryKey.pfx + False + False + x86|x64|arm + 1 + OnApplicationRun + Always + + + + d2d1.lib; d3d11.lib; dxgi.lib; windowscodecs.lib; dwrite.lib; dxguid.lib; %(AdditionalDependencies) + %(AdditionalLibraryDirectories); $(VCInstallDir)\lib\store\arm; $(VCInstallDir)\lib\arm + /nodefaultlib:vccorlibd /nodefaultlib:msvcrtd vccorlibd.lib msvcrtd.lib %(AdditionalOptions) + + + + + $(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\..\;$(MSBuildProjectDirectory)\..\..\..\deps\rcheevos\include;$(MSBuildProjectDirectory)\..\..\..\deps\zlib;$(MSBuildProjectDirectory)\..\..\..\libretro-common\include;$(MSBuildProjectDirectory)\..\..\..\deps;$(MSBuildProjectDirectory)\..\..\..\deps\glslang;$(MSBuildProjectDirectory)\..\..\..\deps\SPIRV-Cross;$(MSBuildProjectDirectory)\..\..\..\deps\stb;$(MSBuildProjectDirectory)\..\..\..\gfx\include;%(AdditionalIncludeDirectories) + /bigobj %(AdditionalOptions) + 4453;28204 + WIN32;HAVE_MAIN;HAVE_DYNAMIC;HAVE_XAUDIO2;RARCH_INTERNAL;HAVE_CC_RESAMPLER;WANT_GLSLANG;HAVE_GLSLANG;HAVE_SLANG;HAVE_SPIRV_CROSS;HAVE_UPDATE_ASSETS;HAVE_D3D;HAVE_D3D11;HAVE_D3D12;ENABLE_HLSL;RC_DISABLE_LUA;HAVE_CHEEVOS;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_FBO;HAVE_ZLIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;_DEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_XINPUT;HAVE_XINPUT2;HAVE_XAUDIO;HAVE_DIRECTX;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_NETPLAYDISCOVERY;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;HAVE_OVERLAY;HAVE_RGUI;HAVE_MENU;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT;HAVE_STATIC_DUMMY;HAVE_STATIC_VIDEO_FILTERS;HAVE_STATIC_AUDIO_FILTERS + + + + + d2d1.lib; d3d11.lib; dxgi.lib; windowscodecs.lib; dwrite.lib; dxguid.lib; %(AdditionalDependencies) + %(AdditionalLibraryDirectories); $(VCInstallDir)\lib\store\arm; $(VCInstallDir)\lib\arm + /nodefaultlib:vccorlib /nodefaultlib:msvcrt vccorlib.lib msvcrt.lib %(AdditionalOptions) + + + + + $(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\..\;$(MSBuildProjectDirectory)\..\..\..\deps\rcheevos\include;$(MSBuildProjectDirectory)\..\..\..\deps\zlib;$(MSBuildProjectDirectory)\..\..\..\libretro-common\include;$(MSBuildProjectDirectory)\..\..\..\deps;$(MSBuildProjectDirectory)\..\..\..\deps\glslang;$(MSBuildProjectDirectory)\..\..\..\deps\SPIRV-Cross;$(MSBuildProjectDirectory)\..\..\..\deps\stb;$(MSBuildProjectDirectory)\..\..\..\gfx\include;%(AdditionalIncludeDirectories) + /bigobj %(AdditionalOptions) + 4453;28204 + WIN32;HAVE_MAIN;HAVE_DYNAMIC;HAVE_XAUDIO2;RARCH_INTERNAL;HAVE_CC_RESAMPLER;WANT_GLSLANG;HAVE_GLSLANG;HAVE_SLANG;HAVE_SPIRV_CROSS;HAVE_UPDATE_ASSETS;HAVE_D3D;HAVE_D3D11;HAVE_D3D12;ENABLE_HLSL;RC_DISABLE_LUA;HAVE_CHEEVOS;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_FBO;HAVE_ZLIB;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_XINPUT;HAVE_XINPUT2;HAVE_XAUDIO;HAVE_DIRECTX;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_NETPLAYDISCOVERY;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;HAVE_OVERLAY;HAVE_MENU;HAVE_RGUI;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT;HAVE_STATIC_DUMMY;HAVE_STATIC_VIDEO_FILTERS;HAVE_STATIC_AUDIO_FILTERS + + + + + d2d1.lib; d3d11.lib; dxgi.lib; windowscodecs.lib; dwrite.lib; dxguid.lib; %(AdditionalDependencies) + %(AdditionalLibraryDirectories); $(VCInstallDir)\lib\store\arm64; $(VCInstallDir)\lib\arm64 + /nodefaultlib:vccorlibd /nodefaultlib:msvcrtd vccorlibd.lib msvcrtd.lib %(AdditionalOptions) + + + + + $(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\..\;$(MSBuildProjectDirectory)\..\..\..\deps\rcheevos\include;$(MSBuildProjectDirectory)\..\..\..\deps\zlib;$(MSBuildProjectDirectory)\..\..\..\libretro-common\include;$(MSBuildProjectDirectory)\..\..\..\deps;$(MSBuildProjectDirectory)\..\..\..\deps\glslang;$(MSBuildProjectDirectory)\..\..\..\deps\SPIRV-Cross;$(MSBuildProjectDirectory)\..\..\..\deps\stb;$(MSBuildProjectDirectory)\..\..\..\gfx\include;%(AdditionalIncludeDirectories) + /bigobj %(AdditionalOptions) + 4453;28204 + WIN32;HAVE_MAIN;HAVE_DYNAMIC;HAVE_XAUDIO2;RARCH_INTERNAL;HAVE_CC_RESAMPLER;WANT_GLSLANG;HAVE_GLSLANG;HAVE_SLANG;HAVE_SPIRV_CROSS;HAVE_UPDATE_ASSETS;HAVE_D3D;HAVE_D3D11;HAVE_D3D12;ENABLE_HLSL;RC_DISABLE_LUA;HAVE_CHEEVOS;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_FBO;HAVE_ZLIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;_DEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_XINPUT;HAVE_XINPUT2;HAVE_XAUDIO;HAVE_DIRECTX;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_NETPLAYDISCOVERY;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;HAVE_OVERLAY;HAVE_RGUI;HAVE_MENU;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT;HAVE_STATIC_DUMMY;HAVE_STATIC_VIDEO_FILTERS;HAVE_STATIC_AUDIO_FILTERS + + + + + d2d1.lib; d3d11.lib; dxgi.lib; windowscodecs.lib; dwrite.lib; dxguid.lib; %(AdditionalDependencies) + %(AdditionalLibraryDirectories); $(VCInstallDir)\lib\store\arm64; $(VCInstallDir)\lib\arm64 + /nodefaultlib:vccorlib /nodefaultlib:msvcrt vccorlib.lib msvcrt.lib %(AdditionalOptions) + + + + + $(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\..\;$(MSBuildProjectDirectory)\..\..\..\deps\rcheevos\include;$(MSBuildProjectDirectory)\..\..\..\deps\zlib;$(MSBuildProjectDirectory)\..\..\..\libretro-common\include;$(MSBuildProjectDirectory)\..\..\..\deps;$(MSBuildProjectDirectory)\..\..\..\deps\glslang;$(MSBuildProjectDirectory)\..\..\..\deps\SPIRV-Cross;$(MSBuildProjectDirectory)\..\..\..\deps\stb;$(MSBuildProjectDirectory)\..\..\..\gfx\include;%(AdditionalIncludeDirectories) + /bigobj %(AdditionalOptions) + 4453;28204 + WIN32;HAVE_MAIN;HAVE_DYNAMIC;HAVE_XAUDIO2;RARCH_INTERNAL;HAVE_CC_RESAMPLER;WANT_GLSLANG;HAVE_GLSLANG;HAVE_SLANG;HAVE_SPIRV_CROSS;HAVE_UPDATE_ASSETS;HAVE_D3D;HAVE_D3D11;HAVE_D3D12;ENABLE_HLSL;RC_DISABLE_LUA;HAVE_CHEEVOS;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_FBO;HAVE_ZLIB;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_XINPUT;HAVE_XINPUT2;HAVE_XAUDIO;HAVE_DIRECTX;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_NETPLAYDISCOVERY;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;HAVE_OVERLAY;HAVE_MENU;HAVE_RGUI;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT;HAVE_STATIC_DUMMY;HAVE_STATIC_VIDEO_FILTERS;HAVE_STATIC_AUDIO_FILTERS + + + + + d2d1.lib; d3d11.lib; dxgi.lib; windowscodecs.lib; dwrite.lib; dxguid.lib; %(AdditionalDependencies) + %(AdditionalLibraryDirectories); $(VCInstallDir)\lib\store; $(VCInstallDir)\lib + /nodefaultlib:vccorlibd /nodefaultlib:msvcrtd vccorlibd.lib msvcrtd.lib %(AdditionalOptions) + + + + + $(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\..\;$(MSBuildProjectDirectory)\..\..\..\deps\rcheevos\include;$(MSBuildProjectDirectory)\..\..\..\deps\zlib;$(MSBuildProjectDirectory)\..\..\..\libretro-common\include;$(MSBuildProjectDirectory)\..\..\..\deps;$(MSBuildProjectDirectory)\..\..\..\deps\glslang;$(MSBuildProjectDirectory)\..\..\..\deps\SPIRV-Cross;$(MSBuildProjectDirectory)\..\..\..\deps\stb;$(MSBuildProjectDirectory)\..\..\..\gfx\include;%(AdditionalIncludeDirectories) + /bigobj %(AdditionalOptions) + 4453;28204 + WIN32;HAVE_MAIN;HAVE_DYNAMIC;HAVE_XAUDIO2;RARCH_INTERNAL;HAVE_CC_RESAMPLER;WANT_GLSLANG;HAVE_GLSLANG;HAVE_SLANG;HAVE_SPIRV_CROSS;HAVE_UPDATE_ASSETS;HAVE_D3D;HAVE_D3D11;HAVE_D3D12;ENABLE_HLSL;RC_DISABLE_LUA;HAVE_CHEEVOS;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_FBO;HAVE_ZLIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;_DEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_XINPUT;HAVE_XINPUT2;HAVE_XAUDIO;HAVE_DIRECTX;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_NETPLAYDISCOVERY;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;HAVE_OVERLAY;HAVE_RGUI;HAVE_MENU;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT;HAVE_STATIC_DUMMY;HAVE_STATIC_VIDEO_FILTERS;HAVE_STATIC_AUDIO_FILTERS + ProgramDatabase + + + + + d2d1.lib; d3d11.lib; dxgi.lib; windowscodecs.lib; dwrite.lib; dxguid.lib; %(AdditionalDependencies) + %(AdditionalLibraryDirectories); $(VCInstallDir)\lib\store; $(VCInstallDir)\lib + /nodefaultlib:vccorlib /nodefaultlib:msvcrt vccorlib.lib msvcrt.lib %(AdditionalOptions) + + + + + $(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\..\;$(MSBuildProjectDirectory)\..\..\..\deps\rcheevos\include;$(MSBuildProjectDirectory)\..\..\..\deps\zlib;$(MSBuildProjectDirectory)\..\..\..\libretro-common\include;$(MSBuildProjectDirectory)\..\..\..\deps;$(MSBuildProjectDirectory)\..\..\..\deps\glslang;$(MSBuildProjectDirectory)\..\..\..\deps\SPIRV-Cross;$(MSBuildProjectDirectory)\..\..\..\deps\stb;$(MSBuildProjectDirectory)\..\..\..\gfx\include;%(AdditionalIncludeDirectories) + /bigobj %(AdditionalOptions) + 4453;28204 + WIN32;HAVE_MAIN;HAVE_DYNAMIC;HAVE_XAUDIO2;RARCH_INTERNAL;HAVE_CC_RESAMPLER;WANT_GLSLANG;HAVE_GLSLANG;HAVE_SLANG;HAVE_SPIRV_CROSS;HAVE_UPDATE_ASSETS;HAVE_D3D;HAVE_D3D11;HAVE_D3D12;ENABLE_HLSL;RC_DISABLE_LUA;HAVE_CHEEVOS;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_FBO;HAVE_ZLIB;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_XINPUT;HAVE_XINPUT2;HAVE_XAUDIO;HAVE_DIRECTX;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_NETPLAYDISCOVERY;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;HAVE_OVERLAY;HAVE_MENU;HAVE_RGUI;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT;HAVE_STATIC_DUMMY;HAVE_STATIC_VIDEO_FILTERS;HAVE_STATIC_AUDIO_FILTERS + + + + + d2d1.lib; d3d11.lib; dxgi.lib; windowscodecs.lib; dwrite.lib; dxguid.lib; %(AdditionalDependencies) + %(AdditionalLibraryDirectories); $(VCInstallDir)\lib\store\amd64; $(VCInstallDir)\lib\amd64 + /nodefaultlib:vccorlibd /nodefaultlib:msvcrtd vccorlibd.lib msvcrtd.lib %(AdditionalOptions) + + + + + $(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\..\;$(MSBuildProjectDirectory)\..\..\..\deps\rcheevos\include;$(MSBuildProjectDirectory)\..\..\..\deps\zlib;$(MSBuildProjectDirectory)\..\..\..\libretro-common\include;$(MSBuildProjectDirectory)\..\..\..\deps;$(MSBuildProjectDirectory)\..\..\..\deps\glslang;$(MSBuildProjectDirectory)\..\..\..\deps\SPIRV-Cross;$(MSBuildProjectDirectory)\..\..\..\deps\stb;$(MSBuildProjectDirectory)\..\..\..\gfx\include;%(AdditionalIncludeDirectories) + /bigobj %(AdditionalOptions) + 4453;28204 + WIN32;HAVE_MAIN;HAVE_DYNAMIC;HAVE_XAUDIO2;RARCH_INTERNAL;HAVE_CC_RESAMPLER;WANT_GLSLANG;HAVE_GLSLANG;HAVE_SLANG;HAVE_SPIRV_CROSS;HAVE_UPDATE_ASSETS;HAVE_D3D;HAVE_D3D11;HAVE_D3D12;ENABLE_HLSL;RC_DISABLE_LUA;HAVE_CHEEVOS;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_FBO;HAVE_ZLIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;_DEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_XINPUT;HAVE_XINPUT2;HAVE_XAUDIO;HAVE_DIRECTX;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_NETPLAYDISCOVERY;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;HAVE_OVERLAY;HAVE_RGUI;HAVE_MENU;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT;HAVE_STATIC_DUMMY;HAVE_STATIC_VIDEO_FILTERS;HAVE_STATIC_AUDIO_FILTERS + ProgramDatabase + + + + + d2d1.lib; d3d11.lib; dxgi.lib; windowscodecs.lib; dwrite.lib; dxguid.lib; %(AdditionalDependencies) + %(AdditionalLibraryDirectories); $(VCInstallDir)\lib\store\amd64; $(VCInstallDir)\lib\amd64 + /nodefaultlib:vccorlib /nodefaultlib:msvcrt vccorlib.lib msvcrt.lib %(AdditionalOptions) + + + + + $(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\..\;$(MSBuildProjectDirectory)\..\..\..\deps\rcheevos\include;$(MSBuildProjectDirectory)\..\..\..\deps\zlib;$(MSBuildProjectDirectory)\..\..\..\libretro-common\include;$(MSBuildProjectDirectory)\..\..\..\deps;$(MSBuildProjectDirectory)\..\..\..\deps\glslang;$(MSBuildProjectDirectory)\..\..\..\deps\SPIRV-Cross;$(MSBuildProjectDirectory)\..\..\..\deps\stb;$(MSBuildProjectDirectory)\..\..\..\gfx\include;%(AdditionalIncludeDirectories) + /bigobj %(AdditionalOptions) + 4453;28204 + WIN32;HAVE_MAIN;HAVE_DYNAMIC;HAVE_XAUDIO2;RARCH_INTERNAL;HAVE_CC_RESAMPLER;WANT_GLSLANG;HAVE_GLSLANG;HAVE_SLANG;HAVE_SPIRV_CROSS;HAVE_UPDATE_ASSETS;HAVE_D3D;HAVE_D3D11;HAVE_D3D12;ENABLE_HLSL;RC_DISABLE_LUA;HAVE_CHEEVOS;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_FBO;HAVE_ZLIB;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_XINPUT;HAVE_XINPUT2;HAVE_XAUDIO;HAVE_DIRECTX;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_NETPLAYDISCOVERY;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;HAVE_OVERLAY;HAVE_MENU;HAVE_RGUI;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT;HAVE_STATIC_DUMMY;HAVE_STATIC_VIDEO_FILTERS;HAVE_STATIC_AUDIO_FILTERS + + + + + false + false + false + false + false + false + false + false + + + + + + + + + + Designer + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + cores\%(Filename)%(Extension) + + + true + %(Filename)%(Extension) + + + + + + + + + + + + \ No newline at end of file diff --git a/pkg/msvc/msvc-2017-UWP/RetroArch-msvc2017-UWP.vcxproj.filters b/pkg/msvc-uwp/RetroArch-UWP/RetroArch-UWP.vcxproj.filters similarity index 89% rename from pkg/msvc/msvc-2017-UWP/RetroArch-msvc2017-UWP.vcxproj.filters rename to pkg/msvc-uwp/RetroArch-UWP/RetroArch-UWP.vcxproj.filters index 4c212ae9e5..3fcb574ea4 100644 --- a/pkg/msvc/msvc-2017-UWP/RetroArch-msvc2017-UWP.vcxproj.filters +++ b/pkg/msvc-uwp/RetroArch-UWP/RetroArch-UWP.vcxproj.filters @@ -1,130 +1,130 @@ - - - - - {1246fa09-e114-4a52-88c2-657b2f13d9fb} - - - {32de9679-6494-4933-afa2-430fd975e506} - - - {73676219-cf54-454f-b6fa-9b192c1454f8} - - - - - {bf1e643d-c518-4a77-a355-ae8a93efc18b} - - - {c3155604-6d38-494a-bfe0-861cef871cb2} - - - - - - - - - - - uwp - - - uwp - - - - - griffin - - - griffin - - - uwp - - - - - Assets - - - Assets - - - Assets - - - Assets - - - Assets - - - Assets - - - Assets - - - Assets - - - Assets - - - Assets - - - Assets - - - Assets - - - Assets - - - Assets - - - Assets - - - Assets - - - Assets - - - Assets - - - Assets - - - Assets - - - Assets - - - Assets - - - Assets - - - Assets - - - Assets - - - Assets - - - Assets - - + + + + + {1246fa09-e114-4a52-88c2-657b2f13d9fb} + + + {32de9679-6494-4933-afa2-430fd975e506} + + + {c3155604-6d38-494a-bfe0-861cef871cb2} + + + + + + + + + + + + + uwp + + + uwp + + + + + griffin + + + griffin + + + uwp + + + griffin + + + + + Assets + + + Assets + + + Assets + + + Assets + + + Assets + + + Assets + + + Assets + + + Assets + + + Assets + + + Assets + + + Assets + + + Assets + + + Assets + + + Assets + + + Assets + + + Assets + + + Assets + + + Assets + + + Assets + + + Assets + + + Assets + + + Assets + + + Assets + + + Assets + + + Assets + + + Assets + + + Assets + + + + + \ No newline at end of file diff --git a/pkg/msvc/msvc-2017-UWP/msvc-2017-UWP_TemporaryKey.pfx b/pkg/msvc-uwp/RetroArch-UWP/RetroArch-UWP_TemporaryKey.pfx similarity index 100% rename from pkg/msvc/msvc-2017-UWP/msvc-2017-UWP_TemporaryKey.pfx rename to pkg/msvc-uwp/RetroArch-UWP/RetroArch-UWP_TemporaryKey.pfx diff --git a/pkg/msvc-uwp/RetroArch-UWP/cores/ARM/.empty b/pkg/msvc-uwp/RetroArch-UWP/cores/ARM/.empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/pkg/msvc-uwp/RetroArch-UWP/cores/ARM/cores/.empty b/pkg/msvc-uwp/RetroArch-UWP/cores/ARM/cores/.empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/pkg/msvc-uwp/RetroArch-UWP/cores/ARM64/.empty b/pkg/msvc-uwp/RetroArch-UWP/cores/ARM64/.empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/pkg/msvc-uwp/RetroArch-UWP/cores/ARM64/cores/.empty b/pkg/msvc-uwp/RetroArch-UWP/cores/ARM64/cores/.empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/pkg/msvc-uwp/RetroArch-UWP/cores/Win32/.empty b/pkg/msvc-uwp/RetroArch-UWP/cores/Win32/.empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/pkg/msvc-uwp/RetroArch-UWP/cores/Win32/cores/.empty b/pkg/msvc-uwp/RetroArch-UWP/cores/Win32/cores/.empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/pkg/msvc-uwp/RetroArch-UWP/cores/x64/.empty b/pkg/msvc-uwp/RetroArch-UWP/cores/x64/.empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/pkg/msvc-uwp/RetroArch-UWP/cores/x64/cores/.empty b/pkg/msvc-uwp/RetroArch-UWP/cores/x64/cores/.empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/uwp/uwp_func.h b/uwp/uwp_func.h index 4b92bc489b..ecab3b8a03 100644 --- a/uwp/uwp_func.h +++ b/uwp/uwp_func.h @@ -33,6 +33,8 @@ bool uwp_keyboard_pressed(unsigned key); int16_t uwp_mouse_state(unsigned port, unsigned id, bool screen); int16_t uwp_pointer_state(unsigned idx, unsigned id, bool screen); +void uwp_fill_installed_core_packages(struct string_list *list); + extern const struct rarch_key_map rarch_key_map_uwp[]; #ifdef __cplusplus diff --git a/uwp/uwp_main.cpp b/uwp/uwp_main.cpp index 674232172b..bc1c9b5e13 100644 --- a/uwp/uwp_main.cpp +++ b/uwp/uwp_main.cpp @@ -21,9 +21,12 @@ #include "../input/input_keymaps.h" #include "../input/input_driver.h" #include "../verbosity.h" +#include "../libretro-common/include/encodings/utf.h" +#include "../libretro-common/include/lists/string_list.h" #include "uwp_func.h" #include +#include using namespace RetroArchUWP; @@ -38,6 +41,7 @@ using namespace Windows::Devices::Input; using namespace Windows::System; using namespace Windows::System::Profile; using namespace Windows::Foundation; +using namespace Windows::Foundation::Collections; using namespace Windows::Graphics::Display; char uwp_dir_install[PATH_MAX_LENGTH]; @@ -290,6 +294,11 @@ void App::Load(Platform::String^ entryPoint) return; } m_initialized = true; + + auto catalog = Windows::ApplicationModel::PackageCatalog::OpenForCurrentPackage(); + + catalog->PackageInstalling += + ref new TypedEventHandler(this, &App::OnPackageInstalling); } // This method is called after the window becomes active. @@ -461,6 +470,17 @@ void App::OnDisplayContentsInvalidated(DisplayInformation^ sender, Object^ args) // Probably can be ignored? } +void App::OnPackageInstalling(PackageCatalog^ sender, PackageInstallingEventArgs^ args) +{ + /* TODO: This doesn't seem to work even though it's exactly the same as in sample app and it works there */ + if (args->IsComplete) + { + char msg[512]; + snprintf(msg, sizeof(msg), "Package \"%ls\" installed, a restart may be necessary", args->Package->DisplayName->Data()); + runloop_msg_queue_push(msg, 1, 5 * 60, false); + } +} + // Taken from DirectX UWP samples - on Xbox, everything is scaled 200% so getting the DPI calculation correct is crucial static inline float ConvertDipsToPixels(float dips, float dpi) { @@ -528,6 +548,18 @@ extern "C" { return (void*)CoreWindow::GetForCurrentThread(); } + void uwp_fill_installed_core_packages(struct string_list *list) + { + for (auto package : Windows::ApplicationModel::Package::Current->Dependencies) + { + if (package->IsOptional) + { + string_list_elem_attr attr{}; + string_list_append(list, utf16_to_utf8_string_alloc((package->InstalledLocation->Path + L"\\cores")->Data()), attr); + } + } + } + void uwp_input_next_frame(void) { uwp_current_input = uwp_next_input; diff --git a/uwp/uwp_main.h b/uwp/uwp_main.h index 623d922161..a2f2595d45 100644 --- a/uwp/uwp_main.h +++ b/uwp/uwp_main.h @@ -53,6 +53,8 @@ namespace RetroArchUWP void OnOrientationChanged(Windows::Graphics::Display::DisplayInformation^ sender, Platform::Object^ args); void OnDisplayContentsInvalidated(Windows::Graphics::Display::DisplayInformation^ sender, Platform::Object^ args); + void OnPackageInstalling(Windows::ApplicationModel::PackageCatalog^ sender, Windows::ApplicationModel::PackageInstallingEventArgs^ args); + public: bool IsInitialized() { return m_initialized; } bool IsWindowClosed() { return m_windowClosed; }