diff --git a/CMakeLists.txt b/CMakeLists.txt index 20dfaa54a..6603cac22 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,8 +19,8 @@ if(MSVC) /wd4067 /wd4146 ${VS_DEFINES}) if(WINDOWS_STORE) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /ZW") - add_definitions(-DWINAPI_FAMILY=WINAPI_FAMILY_PC_APP) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /AI\"$ENV{PROGRAMFILES\(X86\)}/Microsoft Visual Studio/2017/Community/Common7/IDE/VC/vcpackages\" /AI\"$ENV{PROGRAMFILES\(X86\)}/Windows Kits/10/UnionMetadata\"") + set(HAVE_WORDS_BIGENDIAN_EXITCODE 0) endif() set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHsc") @@ -104,8 +104,17 @@ set(HECL_DATASPEC_PUSHES hecl::Database::DATA_SPEC_REGISTRY.push_back(&DataSpec::SpecEntMP3ORIG);") add_subdirectory(hecl) +if(NOT TARGET bintoc) + # Use native if cross compiling + find_package(hecl-bintoc REQUIRED) +endif() + if(NOT TARGET atdna) - message(FATAL_ERROR "atdna required for building URDE; please verify LLVM installation") + # Import native atdna if cross-compiling + find_package(atdna REQUIRED) + if(NOT TARGET atdna) + message(FATAL_ERROR "atdna required for building URDE; please verify LLVM installation") + endif() endif() add_definitions(${BOO_SYS_DEFINES}) @@ -145,13 +154,13 @@ if (QMAKE_EXECUTABLE) set(QT_MINIMUM_VERSION 5.3.0) execute_process(COMMAND ${QMAKE_EXECUTABLE} -query QT_VERSION OUTPUT_VARIABLE QT_VERSION) if(QT_VERSION LESS QT_MINIMUM_VERSION) - message("Qt version ${QT_VERSION} does not meet the minimum ${QT_MINIMUM_VERSION} requirement, hecl-gui will not be built") + message(WARNING "Qt version ${QT_VERSION} does not meet the minimum ${QT_MINIMUM_VERSION} requirement, hecl-gui will not be built") else() - message("hecl-gui will be built with Qt verion ${QT_VERSION}") + message(STATUS "hecl-gui will be built with Qt verion ${QT_VERSION}") add_subdirectory(hecl-gui) endif() else() - message("Qt not found, hecl-gui will not be built") + message(STATUS "Qt not found, hecl-gui will not be built") endif() unset(GIT_EXECUTABLE CACHE) find_package(Git) diff --git a/DataSpec/DNACommon/DNACommon.hpp b/DataSpec/DNACommon/DNACommon.hpp index 1fac6b539..c77adfc8d 100644 --- a/DataSpec/DNACommon/DNACommon.hpp +++ b/DataSpec/DNACommon/DNACommon.hpp @@ -356,13 +356,19 @@ public: } void clear() { m_words.clear(); m_bitCount = 0; } - class Iterator : public std::iterator + class Iterator { friend class WordBitmap; const WordBitmap& m_bmp; size_t m_idx = 0; Iterator(const WordBitmap& bmp, size_t idx) : m_bmp(bmp), m_idx(idx) {} public: + using iterator_category = std::forward_iterator_tag; + using value_type = bool; + using difference_type = std::ptrdiff_t; + using pointer = bool*; + using reference = bool&; + Iterator& operator++() {++m_idx; return *this;} bool operator*() {return m_bmp.getBit(m_idx);} bool operator!=(const Iterator& other) const {return m_idx != other.m_idx;} diff --git a/Editor/CMakeLists.txt b/Editor/CMakeLists.txt index 4455ab369..71dc07db5 100644 --- a/Editor/CMakeLists.txt +++ b/Editor/CMakeLists.txt @@ -14,11 +14,46 @@ if(WIN32) set(PLAT_SRCS platforms/win/urde.rc) if(WINDOWS_STORE) set(UWP_ASSETS + platforms/win/Assets/LargeTile.scale-100.png + platforms/win/Assets/LargeTile.scale-125.png + platforms/win/Assets/LargeTile.scale-150.png + platforms/win/Assets/LargeTile.scale-200.png + platforms/win/Assets/LargeTile.scale-400.png + platforms/win/Assets/SmallTile.scale-100.png + platforms/win/Assets/SmallTile.scale-125.png + platforms/win/Assets/SmallTile.scale-150.png + platforms/win/Assets/SmallTile.scale-200.png + platforms/win/Assets/SmallTile.scale-400.png + platforms/win/Assets/SplashScreen.scale-100.png + platforms/win/Assets/SplashScreen.scale-125.png + platforms/win/Assets/SplashScreen.scale-150.png + platforms/win/Assets/SplashScreen.scale-200.png + platforms/win/Assets/SplashScreen.scale-400.png + platforms/win/Assets/Square44x44Logo.scale-100.png + platforms/win/Assets/Square44x44Logo.scale-125.png + platforms/win/Assets/Square44x44Logo.scale-150.png + platforms/win/Assets/Square44x44Logo.scale-200.png + platforms/win/Assets/Square44x44Logo.scale-400.png + platforms/win/Assets/Square44x44Logo.altform-unplated_targetsize-16.png + platforms/win/Assets/Square44x44Logo.altform-unplated_targetsize-24.png + platforms/win/Assets/Square44x44Logo.altform-unplated_targetsize-32.png + platforms/win/Assets/Square44x44Logo.altform-unplated_targetsize-48.png + platforms/win/Assets/Square44x44Logo.altform-unplated_targetsize-256.png platforms/win/Assets/Square150x150Logo.scale-100.png platforms/win/Assets/Square150x150Logo.scale-125.png platforms/win/Assets/Square150x150Logo.scale-150.png platforms/win/Assets/Square150x150Logo.scale-200.png - platforms/win/Assets/Square150x150Logo.scale-400.png) + platforms/win/Assets/Square150x150Logo.scale-400.png + platforms/win/Assets/urde.scale-100.png + platforms/win/Assets/urde.scale-125.png + platforms/win/Assets/urde.scale-150.png + platforms/win/Assets/urde.scale-200.png + platforms/win/Assets/urde.scale-400.png + platforms/win/Assets/WideTile.scale-100.png + platforms/win/Assets/WideTile.scale-125.png + platforms/win/Assets/WideTile.scale-150.png + platforms/win/Assets/WideTile.scale-200.png + platforms/win/Assets/WideTile.scale-400.png) set_property(SOURCE platforms/win/Package.appxmanifest PROPERTY VS_DEPLOYMENT_CONTENT 1) set_property(SOURCE ${UWP_ASSETS} PROPERTY VS_DEPLOYMENT_CONTENT 1) set_property(SOURCE ${UWP_ASSETS} PROPERTY VS_DEPLOYMENT_LOCATION "Assets") @@ -74,9 +109,9 @@ if (NOT WINDOWS_STORE) else() message(STATUS "Targeting Windows 10. Setting Extensions to version ${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}") set_property(TARGET urde PROPERTY VS_WINRT_COMPONENT TRUE) - set_property(TARGET urde PROPERTY VS_DESKTOP_EXTENSIONS_VERSION "${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}") - set_property(TARGET urde PROPERTY VS_MOBILE_EXTENSIONS_VERSION "${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}") - set_property(TARGET urde PROPERTY VS_IOT_EXTENSIONS_VERSION "${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}") + #set_property(TARGET urde boo PROPERTY VS_DESKTOP_EXTENSIONS_VERSION "${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}") + #set_property(TARGET urde boo PROPERTY VS_MOBILE_EXTENSIONS_VERSION "${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}") + #set_property(TARGET urde boo PROPERTY VS_IOT_EXTENSIONS_VERSION "${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}") # Add a reference to an SDK - set_property(TARGET urde PROPERTY VS_SDK_REFERENCES "Microsoft.UniversalCRT.Debug, Version=${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}") + #set_property(TARGET urde boo PROPERTY VS_SDK_REFERENCES "Microsoft.UniversalCRT.Debug, Version=${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}") endif() diff --git a/Editor/badging/CMakeLists.txt b/Editor/badging/CMakeLists.txt index 0b8e14cd1..cd37eec31 100644 --- a/Editor/badging/CMakeLists.txt +++ b/Editor/badging/CMakeLists.txt @@ -1,10 +1,32 @@ -cmake_policy(SET CMP0053 OLD) - +if(NOT CMAKE_CROSSCOMPILING) include_directories(${LIBPNG_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR}) add_executable(packbadge packbadge.c) target_link_libraries(packbadge ${PNG_LIB} ${ZLIB_LIBRARIES}) +################## +# Package Export # +################## + +# Add all targets to the build-tree export set +export(TARGETS packbadge FILE "${CMAKE_CURRENT_BINARY_DIR}/urde-packbadgeTargets.cmake") + +# Export the package for use from the build-tree +# (this registers the build-tree with a global CMake-registry) +export(PACKAGE urde-packbadge) + +# Create the atdnaConfig.cmake +# ... for the build tree +configure_file(urde-packbadgeConfig.cmake.in "${CMAKE_CURRENT_BINARY_DIR}/urde-packbadgeConfig.cmake" @ONLY) +# ... for the install tree +configure_file(urde-packbadgeConfig.cmake.in "${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/urde-packbadgeConfig.cmake" @ONLY) +# ... for both +configure_file(urde-packbadgeConfigVersion.cmake.in "${CMAKE_CURRENT_BINARY_DIR}/urde-packbadgeConfigVersion.cmake" @ONLY) + +else() +find_package(urde-packbadge REQUIRED) +endif() + add_custom_command(OUTPUT badge.bin COMMAND $ ARGS ${CMAKE_CURRENT_SOURCE_DIR}/badge.png ${CMAKE_CURRENT_BINARY_DIR}/badge.bin diff --git a/Editor/badging/urde-packbadgeConfig.cmake.in b/Editor/badging/urde-packbadgeConfig.cmake.in new file mode 100644 index 000000000..3f7d75304 --- /dev/null +++ b/Editor/badging/urde-packbadgeConfig.cmake.in @@ -0,0 +1,9 @@ +# - Config file for the packbadge package + +# Compute paths +get_filename_component(PACKBADGE_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) + +# Our library dependencies (contains definitions for IMPORTED targets) +if(NOT TARGET packbadge AND NOT packbadge_BINARY_DIR) + include("${PACKBADGE_CMAKE_DIR}/packbadgeTargets.cmake") +endif() diff --git a/Editor/badging/urde-packbadgeConfigVersion.cmake.in b/Editor/badging/urde-packbadgeConfigVersion.cmake.in new file mode 100644 index 000000000..05eda9878 --- /dev/null +++ b/Editor/badging/urde-packbadgeConfigVersion.cmake.in @@ -0,0 +1,12 @@ +set(PACKAGE_VERSION "@PACKBADGE_VERSION@") + +# Check whether the requested PACKAGE_FIND_VERSION is compatible +if("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}") + set(PACKAGE_VERSION_COMPATIBLE FALSE) +else() + set(PACKAGE_VERSION_COMPATIBLE TRUE) + if ("${PACKAGE_VERSION}" VERSION_EQUAL "${PACKAGE_FIND_VERSION}") + set(PACKAGE_VERSION_EXACT TRUE) + endif() +endif() + diff --git a/Editor/icons/CMakeLists.txt b/Editor/icons/CMakeLists.txt index 62ee33ee8..1b5b73d3f 100644 --- a/Editor/icons/CMakeLists.txt +++ b/Editor/icons/CMakeLists.txt @@ -1,8 +1,31 @@ -if(NOT WINDOWS_STORE) +if(NOT CMAKE_CROSSCOMPILING) include_directories(${LIBPNG_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR}) add_executable(packicons packicons.c) target_link_libraries(packicons ${PNG_LIB} ${ZLIB_LIBRARIES}) +################## +# Package Export # +################## + +# Add all targets to the build-tree export set +export(TARGETS packicons FILE "${CMAKE_CURRENT_BINARY_DIR}/urde-packiconsTargets.cmake") + +# Export the package for use from the build-tree +# (this registers the build-tree with a global CMake-registry) +export(PACKAGE urde-packicons) + +# Create the atdnaConfig.cmake +# ... for the build tree +configure_file(urde-packiconsConfig.cmake.in "${CMAKE_CURRENT_BINARY_DIR}/urde-packiconsConfig.cmake" @ONLY) +# ... for the install tree +configure_file(urde-packiconsConfig.cmake.in "${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/urde-packiconsConfig.cmake" @ONLY) +# ... for both +configure_file(urde-packiconsConfigVersion.cmake.in "${CMAKE_CURRENT_BINARY_DIR}/urde-packiconsConfigVersion.cmake" @ONLY) + +else() +find_package(urde-packicons REQUIRED) +endif() + unset(INKSCAPE_BIN CACHE) set(CMAKE_FIND_APPBUNDLE "NEVER") if(WIN32) @@ -24,10 +47,6 @@ else() ${CMAKE_CURRENT_BINARY_DIR}/icons.bin MAIN_DEPENDENCY icons.svg COMMENT "Generating icons.bin") endif() -else() - add_custom_command(OUTPUT icons.bin COMMAND ${CMAKE_COMMAND} ARGS -P - ${CMAKE_CURRENT_SOURCE_DIR}/IconDownload.cmake) -endif() bintoc(icons.c ${CMAKE_CURRENT_BINARY_DIR}/icons.bin URDE_ICONS) add_library(UrdeIcons icons.cpp icons.hpp icons.bin icons.c) diff --git a/Editor/icons/urde-packiconsConfig.cmake.in b/Editor/icons/urde-packiconsConfig.cmake.in new file mode 100644 index 000000000..1d3c7028e --- /dev/null +++ b/Editor/icons/urde-packiconsConfig.cmake.in @@ -0,0 +1,9 @@ +# - Config file for the packicons package + +# Compute paths +get_filename_component(PACKICONS_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) + +# Our library dependencies (contains definitions for IMPORTED targets) +if(NOT TARGET packicons AND NOT packicons_BINARY_DIR) + include("${PACKICONS_CMAKE_DIR}/urde-packiconsTargets.cmake") +endif() diff --git a/Editor/icons/urde-packiconsConfigVersion.cmake.in b/Editor/icons/urde-packiconsConfigVersion.cmake.in new file mode 100644 index 000000000..da3ba016d --- /dev/null +++ b/Editor/icons/urde-packiconsConfigVersion.cmake.in @@ -0,0 +1,12 @@ +set(PACKAGE_VERSION "@PACKICONS_VERSION@") + +# Check whether the requested PACKAGE_FIND_VERSION is compatible +if("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}") + set(PACKAGE_VERSION_COMPATIBLE FALSE) +else() + set(PACKAGE_VERSION_COMPATIBLE TRUE) + if ("${PACKAGE_VERSION}" VERSION_EQUAL "${PACKAGE_FIND_VERSION}") + set(PACKAGE_VERSION_EXACT TRUE) + endif() +endif() + diff --git a/Editor/main.cpp b/Editor/main.cpp index 87c35bc53..37b69cdf5 100644 --- a/Editor/main.cpp +++ b/Editor/main.cpp @@ -170,6 +170,7 @@ int main(int argc, const boo::SystemChar** argv) #endif #if WINDOWS_STORE +#include "boo/UWPViewProvider.hpp" using namespace Windows::ApplicationModel::Core; [Platform::MTAThread] diff --git a/Editor/platforms/win/Assets/LargeTile.scale-100.png b/Editor/platforms/win/Assets/LargeTile.scale-100.png new file mode 100644 index 000000000..fb0be3633 Binary files /dev/null and b/Editor/platforms/win/Assets/LargeTile.scale-100.png differ diff --git a/Editor/platforms/win/Assets/LargeTile.scale-125.png b/Editor/platforms/win/Assets/LargeTile.scale-125.png new file mode 100644 index 000000000..296be842f Binary files /dev/null and b/Editor/platforms/win/Assets/LargeTile.scale-125.png differ diff --git a/Editor/platforms/win/Assets/LargeTile.scale-150.png b/Editor/platforms/win/Assets/LargeTile.scale-150.png new file mode 100644 index 000000000..07714d0b0 Binary files /dev/null and b/Editor/platforms/win/Assets/LargeTile.scale-150.png differ diff --git a/Editor/platforms/win/Assets/LargeTile.scale-200.png b/Editor/platforms/win/Assets/LargeTile.scale-200.png new file mode 100644 index 000000000..a853a66d5 Binary files /dev/null and b/Editor/platforms/win/Assets/LargeTile.scale-200.png differ diff --git a/Editor/platforms/win/Assets/LargeTile.scale-400.png b/Editor/platforms/win/Assets/LargeTile.scale-400.png new file mode 100644 index 000000000..c83669b0d Binary files /dev/null and b/Editor/platforms/win/Assets/LargeTile.scale-400.png differ diff --git a/Editor/platforms/win/Assets/SmallTile.scale-100.png b/Editor/platforms/win/Assets/SmallTile.scale-100.png new file mode 100644 index 000000000..743f048bb Binary files /dev/null and b/Editor/platforms/win/Assets/SmallTile.scale-100.png differ diff --git a/Editor/platforms/win/Assets/SmallTile.scale-125.png b/Editor/platforms/win/Assets/SmallTile.scale-125.png new file mode 100644 index 000000000..d6a3b5fd0 Binary files /dev/null and b/Editor/platforms/win/Assets/SmallTile.scale-125.png differ diff --git a/Editor/platforms/win/Assets/SmallTile.scale-150.png b/Editor/platforms/win/Assets/SmallTile.scale-150.png new file mode 100644 index 000000000..f20fa77a8 Binary files /dev/null and b/Editor/platforms/win/Assets/SmallTile.scale-150.png differ diff --git a/Editor/platforms/win/Assets/SmallTile.scale-200.png b/Editor/platforms/win/Assets/SmallTile.scale-200.png new file mode 100644 index 000000000..8b8e141eb Binary files /dev/null and b/Editor/platforms/win/Assets/SmallTile.scale-200.png differ diff --git a/Editor/platforms/win/Assets/SmallTile.scale-400.png b/Editor/platforms/win/Assets/SmallTile.scale-400.png new file mode 100644 index 000000000..6c4546912 Binary files /dev/null and b/Editor/platforms/win/Assets/SmallTile.scale-400.png differ diff --git a/Editor/platforms/win/Assets/SplashScreen.scale-100.png b/Editor/platforms/win/Assets/SplashScreen.scale-100.png index 93cae6a3d..980def028 100644 Binary files a/Editor/platforms/win/Assets/SplashScreen.scale-100.png and b/Editor/platforms/win/Assets/SplashScreen.scale-100.png differ diff --git a/Editor/platforms/win/Assets/SplashScreen.scale-125.png b/Editor/platforms/win/Assets/SplashScreen.scale-125.png index 7b81b5f39..38c8f2b7d 100644 Binary files a/Editor/platforms/win/Assets/SplashScreen.scale-125.png and b/Editor/platforms/win/Assets/SplashScreen.scale-125.png differ diff --git a/Editor/platforms/win/Assets/SplashScreen.scale-150.png b/Editor/platforms/win/Assets/SplashScreen.scale-150.png index f6368c56a..8d8a39ac7 100644 Binary files a/Editor/platforms/win/Assets/SplashScreen.scale-150.png and b/Editor/platforms/win/Assets/SplashScreen.scale-150.png differ diff --git a/Editor/platforms/win/Assets/SplashScreen.scale-200.png b/Editor/platforms/win/Assets/SplashScreen.scale-200.png index 34d168905..5dc5216c5 100644 Binary files a/Editor/platforms/win/Assets/SplashScreen.scale-200.png and b/Editor/platforms/win/Assets/SplashScreen.scale-200.png differ diff --git a/Editor/platforms/win/Assets/SplashScreen.scale-400.png b/Editor/platforms/win/Assets/SplashScreen.scale-400.png index df4eb1f3f..5ffbccb5e 100644 Binary files a/Editor/platforms/win/Assets/SplashScreen.scale-400.png and b/Editor/platforms/win/Assets/SplashScreen.scale-400.png differ diff --git a/Editor/platforms/win/Assets/Square150x150Logo.scale-100.png b/Editor/platforms/win/Assets/Square150x150Logo.scale-100.png index 49196d784..323868d0e 100644 Binary files a/Editor/platforms/win/Assets/Square150x150Logo.scale-100.png and b/Editor/platforms/win/Assets/Square150x150Logo.scale-100.png differ diff --git a/Editor/platforms/win/Assets/Square150x150Logo.scale-125.png b/Editor/platforms/win/Assets/Square150x150Logo.scale-125.png index 4d609219a..51da710b1 100644 Binary files a/Editor/platforms/win/Assets/Square150x150Logo.scale-125.png and b/Editor/platforms/win/Assets/Square150x150Logo.scale-125.png differ diff --git a/Editor/platforms/win/Assets/Square150x150Logo.scale-150.png b/Editor/platforms/win/Assets/Square150x150Logo.scale-150.png index 26dc8dccf..fbf005467 100644 Binary files a/Editor/platforms/win/Assets/Square150x150Logo.scale-150.png and b/Editor/platforms/win/Assets/Square150x150Logo.scale-150.png differ diff --git a/Editor/platforms/win/Assets/Square150x150Logo.scale-200.png b/Editor/platforms/win/Assets/Square150x150Logo.scale-200.png index a5231ccf5..b32bf4d7f 100644 Binary files a/Editor/platforms/win/Assets/Square150x150Logo.scale-200.png and b/Editor/platforms/win/Assets/Square150x150Logo.scale-200.png differ diff --git a/Editor/platforms/win/Assets/Square150x150Logo.scale-400.png b/Editor/platforms/win/Assets/Square150x150Logo.scale-400.png index 13c6dff4d..126056ca0 100644 Binary files a/Editor/platforms/win/Assets/Square150x150Logo.scale-400.png and b/Editor/platforms/win/Assets/Square150x150Logo.scale-400.png differ diff --git a/Editor/platforms/win/Assets/Square310x310Logo.scale-100.png b/Editor/platforms/win/Assets/Square310x310Logo.scale-100.png deleted file mode 100644 index fbd8697a7..000000000 Binary files a/Editor/platforms/win/Assets/Square310x310Logo.scale-100.png and /dev/null differ diff --git a/Editor/platforms/win/Assets/Square310x310Logo.scale-125.png b/Editor/platforms/win/Assets/Square310x310Logo.scale-125.png deleted file mode 100644 index 3ecdbe9ca..000000000 Binary files a/Editor/platforms/win/Assets/Square310x310Logo.scale-125.png and /dev/null differ diff --git a/Editor/platforms/win/Assets/Square310x310Logo.scale-150.png b/Editor/platforms/win/Assets/Square310x310Logo.scale-150.png deleted file mode 100644 index ded323015..000000000 Binary files a/Editor/platforms/win/Assets/Square310x310Logo.scale-150.png and /dev/null differ diff --git a/Editor/platforms/win/Assets/Square310x310Logo.scale-200.png b/Editor/platforms/win/Assets/Square310x310Logo.scale-200.png deleted file mode 100644 index 7eac62681..000000000 Binary files a/Editor/platforms/win/Assets/Square310x310Logo.scale-200.png and /dev/null differ diff --git a/Editor/platforms/win/Assets/Square310x310Logo.scale-400.png b/Editor/platforms/win/Assets/Square310x310Logo.scale-400.png deleted file mode 100644 index 76e2b8f85..000000000 Binary files a/Editor/platforms/win/Assets/Square310x310Logo.scale-400.png and /dev/null differ diff --git a/Editor/platforms/win/Assets/Square44x44Logo.altform-unplated_targetsize-16.png b/Editor/platforms/win/Assets/Square44x44Logo.altform-unplated_targetsize-16.png new file mode 100644 index 000000000..0288b0727 Binary files /dev/null and b/Editor/platforms/win/Assets/Square44x44Logo.altform-unplated_targetsize-16.png differ diff --git a/Editor/platforms/win/Assets/Square44x44Logo.altform-unplated_targetsize-24.png b/Editor/platforms/win/Assets/Square44x44Logo.altform-unplated_targetsize-24.png new file mode 100644 index 000000000..fc5d91424 Binary files /dev/null and b/Editor/platforms/win/Assets/Square44x44Logo.altform-unplated_targetsize-24.png differ diff --git a/Editor/platforms/win/Assets/Square44x44Logo.altform-unplated_targetsize-256.png b/Editor/platforms/win/Assets/Square44x44Logo.altform-unplated_targetsize-256.png new file mode 100644 index 000000000..c3ad3aeea Binary files /dev/null and b/Editor/platforms/win/Assets/Square44x44Logo.altform-unplated_targetsize-256.png differ diff --git a/Editor/platforms/win/Assets/Square44x44Logo.altform-unplated_targetsize-32.png b/Editor/platforms/win/Assets/Square44x44Logo.altform-unplated_targetsize-32.png new file mode 100644 index 000000000..ee42f263c Binary files /dev/null and b/Editor/platforms/win/Assets/Square44x44Logo.altform-unplated_targetsize-32.png differ diff --git a/Editor/platforms/win/Assets/Square44x44Logo.altform-unplated_targetsize-48.png b/Editor/platforms/win/Assets/Square44x44Logo.altform-unplated_targetsize-48.png new file mode 100644 index 000000000..680cb0f19 Binary files /dev/null and b/Editor/platforms/win/Assets/Square44x44Logo.altform-unplated_targetsize-48.png differ diff --git a/Editor/platforms/win/Assets/Square44x44Logo.scale-100.png b/Editor/platforms/win/Assets/Square44x44Logo.scale-100.png index 1a5dcbb30..f9ea0b89f 100644 Binary files a/Editor/platforms/win/Assets/Square44x44Logo.scale-100.png and b/Editor/platforms/win/Assets/Square44x44Logo.scale-100.png differ diff --git a/Editor/platforms/win/Assets/Square44x44Logo.scale-125.png b/Editor/platforms/win/Assets/Square44x44Logo.scale-125.png index ffcb08cdd..6327c11d6 100644 Binary files a/Editor/platforms/win/Assets/Square44x44Logo.scale-125.png and b/Editor/platforms/win/Assets/Square44x44Logo.scale-125.png differ diff --git a/Editor/platforms/win/Assets/Square44x44Logo.scale-150.png b/Editor/platforms/win/Assets/Square44x44Logo.scale-150.png index e4c5dc51e..3c2b2a5a2 100644 Binary files a/Editor/platforms/win/Assets/Square44x44Logo.scale-150.png and b/Editor/platforms/win/Assets/Square44x44Logo.scale-150.png differ diff --git a/Editor/platforms/win/Assets/Square44x44Logo.scale-200.png b/Editor/platforms/win/Assets/Square44x44Logo.scale-200.png index 74913b02b..a31acc0d5 100644 Binary files a/Editor/platforms/win/Assets/Square44x44Logo.scale-200.png and b/Editor/platforms/win/Assets/Square44x44Logo.scale-200.png differ diff --git a/Editor/platforms/win/Assets/Square44x44Logo.scale-400.png b/Editor/platforms/win/Assets/Square44x44Logo.scale-400.png index 7d43bb6cb..6987b47c9 100644 Binary files a/Editor/platforms/win/Assets/Square44x44Logo.scale-400.png and b/Editor/platforms/win/Assets/Square44x44Logo.scale-400.png differ diff --git a/Editor/platforms/win/Assets/Square44x44Logo.targetsize-16.png b/Editor/platforms/win/Assets/Square44x44Logo.targetsize-16.png new file mode 100644 index 000000000..02220c6c3 Binary files /dev/null and b/Editor/platforms/win/Assets/Square44x44Logo.targetsize-16.png differ diff --git a/Editor/platforms/win/Assets/Square44x44Logo.targetsize-24.png b/Editor/platforms/win/Assets/Square44x44Logo.targetsize-24.png new file mode 100644 index 000000000..b5613b860 Binary files /dev/null and b/Editor/platforms/win/Assets/Square44x44Logo.targetsize-24.png differ diff --git a/Editor/platforms/win/Assets/Square44x44Logo.targetsize-256.png b/Editor/platforms/win/Assets/Square44x44Logo.targetsize-256.png new file mode 100644 index 000000000..c13bd9279 Binary files /dev/null and b/Editor/platforms/win/Assets/Square44x44Logo.targetsize-256.png differ diff --git a/Editor/platforms/win/Assets/Square44x44Logo.targetsize-32.png b/Editor/platforms/win/Assets/Square44x44Logo.targetsize-32.png new file mode 100644 index 000000000..605fd10bd Binary files /dev/null and b/Editor/platforms/win/Assets/Square44x44Logo.targetsize-32.png differ diff --git a/Editor/platforms/win/Assets/Square44x44Logo.targetsize-48.png b/Editor/platforms/win/Assets/Square44x44Logo.targetsize-48.png new file mode 100644 index 000000000..66f529aa1 Binary files /dev/null and b/Editor/platforms/win/Assets/Square44x44Logo.targetsize-48.png differ diff --git a/Editor/platforms/win/Assets/Square71x71Logo.scale-100.png b/Editor/platforms/win/Assets/Square71x71Logo.scale-100.png deleted file mode 100644 index af28794ae..000000000 Binary files a/Editor/platforms/win/Assets/Square71x71Logo.scale-100.png and /dev/null differ diff --git a/Editor/platforms/win/Assets/Square71x71Logo.scale-125.png b/Editor/platforms/win/Assets/Square71x71Logo.scale-125.png deleted file mode 100644 index 68b2d60bb..000000000 Binary files a/Editor/platforms/win/Assets/Square71x71Logo.scale-125.png and /dev/null differ diff --git a/Editor/platforms/win/Assets/Square71x71Logo.scale-150.png b/Editor/platforms/win/Assets/Square71x71Logo.scale-150.png deleted file mode 100644 index 0af1159c5..000000000 Binary files a/Editor/platforms/win/Assets/Square71x71Logo.scale-150.png and /dev/null differ diff --git a/Editor/platforms/win/Assets/Square71x71Logo.scale-200.png b/Editor/platforms/win/Assets/Square71x71Logo.scale-200.png deleted file mode 100644 index f7a26af3d..000000000 Binary files a/Editor/platforms/win/Assets/Square71x71Logo.scale-200.png and /dev/null differ diff --git a/Editor/platforms/win/Assets/Square71x71Logo.scale-400.png b/Editor/platforms/win/Assets/Square71x71Logo.scale-400.png deleted file mode 100644 index d1968488e..000000000 Binary files a/Editor/platforms/win/Assets/Square71x71Logo.scale-400.png and /dev/null differ diff --git a/Editor/platforms/win/Assets/Wide310x150Logo.scale-100.png b/Editor/platforms/win/Assets/Wide310x150Logo.scale-100.png deleted file mode 100644 index 15d694b25..000000000 Binary files a/Editor/platforms/win/Assets/Wide310x150Logo.scale-100.png and /dev/null differ diff --git a/Editor/platforms/win/Assets/Wide310x150Logo.scale-125.png b/Editor/platforms/win/Assets/Wide310x150Logo.scale-125.png deleted file mode 100644 index db80104c2..000000000 Binary files a/Editor/platforms/win/Assets/Wide310x150Logo.scale-125.png and /dev/null differ diff --git a/Editor/platforms/win/Assets/Wide310x150Logo.scale-150.png b/Editor/platforms/win/Assets/Wide310x150Logo.scale-150.png deleted file mode 100644 index 6b0bdc6a6..000000000 Binary files a/Editor/platforms/win/Assets/Wide310x150Logo.scale-150.png and /dev/null differ diff --git a/Editor/platforms/win/Assets/Wide310x150Logo.scale-200.png b/Editor/platforms/win/Assets/Wide310x150Logo.scale-200.png deleted file mode 100644 index 6445e25bc..000000000 Binary files a/Editor/platforms/win/Assets/Wide310x150Logo.scale-200.png and /dev/null differ diff --git a/Editor/platforms/win/Assets/Wide310x150Logo.scale-400.png b/Editor/platforms/win/Assets/Wide310x150Logo.scale-400.png deleted file mode 100644 index d81e9b641..000000000 Binary files a/Editor/platforms/win/Assets/Wide310x150Logo.scale-400.png and /dev/null differ diff --git a/Editor/platforms/win/Assets/WideTile.scale-100.png b/Editor/platforms/win/Assets/WideTile.scale-100.png new file mode 100644 index 000000000..d8a7cd68e Binary files /dev/null and b/Editor/platforms/win/Assets/WideTile.scale-100.png differ diff --git a/Editor/platforms/win/Assets/WideTile.scale-125.png b/Editor/platforms/win/Assets/WideTile.scale-125.png new file mode 100644 index 000000000..55b3ddb12 Binary files /dev/null and b/Editor/platforms/win/Assets/WideTile.scale-125.png differ diff --git a/Editor/platforms/win/Assets/WideTile.scale-150.png b/Editor/platforms/win/Assets/WideTile.scale-150.png new file mode 100644 index 000000000..5e11cff6c Binary files /dev/null and b/Editor/platforms/win/Assets/WideTile.scale-150.png differ diff --git a/Editor/platforms/win/Assets/WideTile.scale-200.png b/Editor/platforms/win/Assets/WideTile.scale-200.png new file mode 100644 index 000000000..980def028 Binary files /dev/null and b/Editor/platforms/win/Assets/WideTile.scale-200.png differ diff --git a/Editor/platforms/win/Assets/WideTile.scale-400.png b/Editor/platforms/win/Assets/WideTile.scale-400.png new file mode 100644 index 000000000..5dc5216c5 Binary files /dev/null and b/Editor/platforms/win/Assets/WideTile.scale-400.png differ diff --git a/Editor/platforms/win/Assets/urde.scale-100.png b/Editor/platforms/win/Assets/urde.scale-100.png new file mode 100644 index 000000000..4dd138bd6 Binary files /dev/null and b/Editor/platforms/win/Assets/urde.scale-100.png differ diff --git a/Editor/platforms/win/Assets/urde.scale-125.png b/Editor/platforms/win/Assets/urde.scale-125.png new file mode 100644 index 000000000..e57cc349d Binary files /dev/null and b/Editor/platforms/win/Assets/urde.scale-125.png differ diff --git a/Editor/platforms/win/Assets/urde.scale-150.png b/Editor/platforms/win/Assets/urde.scale-150.png new file mode 100644 index 000000000..8481726f2 Binary files /dev/null and b/Editor/platforms/win/Assets/urde.scale-150.png differ diff --git a/Editor/platforms/win/Assets/urde.scale-200.png b/Editor/platforms/win/Assets/urde.scale-200.png new file mode 100644 index 000000000..16fad7be1 Binary files /dev/null and b/Editor/platforms/win/Assets/urde.scale-200.png differ diff --git a/Editor/platforms/win/Assets/urde.scale-400.png b/Editor/platforms/win/Assets/urde.scale-400.png new file mode 100644 index 000000000..9a661db49 Binary files /dev/null and b/Editor/platforms/win/Assets/urde.scale-400.png differ diff --git a/Editor/platforms/win/Package.appxmanifest b/Editor/platforms/win/Package.appxmanifest index b59cfa435..e166594ef 100644 --- a/Editor/platforms/win/Package.appxmanifest +++ b/Editor/platforms/win/Package.appxmanifest @@ -1,31 +1,25 @@ - - - + + + + - URDE - AxioDL + URDE + AxioDL + Assets\urde.png + + + - + - - - - - + + + + + + + - + \ No newline at end of file diff --git a/Editor/platforms/win/urde.aps b/Editor/platforms/win/urde.aps new file mode 100644 index 000000000..f30aeb215 Binary files /dev/null and b/Editor/platforms/win/urde.aps differ diff --git a/Runtime/CMakeLists.txt b/Runtime/CMakeLists.txt index c4b9230ea..637b616c3 100644 --- a/Runtime/CMakeLists.txt +++ b/Runtime/CMakeLists.txt @@ -117,3 +117,7 @@ add_library(RuntimeCommon TCastTo.hpp TCastTo.cpp GCNTypes.hpp ${PLAT_SRCS}) + +if(WINDOWS_STORE) + set_property(TARGET RuntimeCommon PROPERTY VS_WINRT_COMPONENT TRUE) +endif() diff --git a/amuse b/amuse index d399f1d30..5caf6bf01 160000 --- a/amuse +++ b/amuse @@ -1 +1 @@ -Subproject commit d399f1d302663b85d1062f8876a9b4d0436c1815 +Subproject commit 5caf6bf017efdee381ac700d67f14a7202c19b3d diff --git a/hecl b/hecl index eec247cff..ba6f66296 160000 --- a/hecl +++ b/hecl @@ -1 +1 @@ -Subproject commit eec247cff61e8f7d561109ce321b57e84c8663e5 +Subproject commit ba6f66296b1fa5d4962c97aaa87c060d2aee97e7 diff --git a/jbus b/jbus index b1f9b08d2..34860de24 160000 --- a/jbus +++ b/jbus @@ -1 +1 @@ -Subproject commit b1f9b08d25486f17815075502e61636681c70828 +Subproject commit 34860de2488a4bf08089f67d1792841d8c7b7beb diff --git a/kabufuda b/kabufuda index bdfff2ba3..bd73c89b5 160000 --- a/kabufuda +++ b/kabufuda @@ -1 +1 @@ -Subproject commit bdfff2ba3370bcd3943652c545076934c1c9265f +Subproject commit bd73c89b548e1787d648b14cd05c9278a1ed81b8 diff --git a/mpcksum/CMakeLists.txt b/mpcksum/CMakeLists.txt index cc7120f97..3b58d8c5f 100644 --- a/mpcksum/CMakeLists.txt +++ b/mpcksum/CMakeLists.txt @@ -1,7 +1,6 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR} ./../Runtime) -add_executable(mpcksum - main.cpp) +add_executable(mpcksum main.cpp) target_link_libraries(mpcksum athena-core athena-libyaml z lzo2) diff --git a/nod b/nod index 3d70a568d..34de6276b 160000 --- a/nod +++ b/nod @@ -1 +1 @@ -Subproject commit 3d70a568dcb04d2d1cc114493ab38e7cff10e78d +Subproject commit 34de6276b0fa30d7050c25978001736c8ad2e90c