UWP fixes

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)

DataSpec/DNACommon/DNACommon.hpp

@@ -356,13 +356,19 @@ public:
     }
     void clear() { m_words.clear(); m_bitCount = 0; }
 
-    class Iterator : public std::iterator<std::forward_iterator_tag, bool>
+    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;}

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()

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 $<TARGET_FILE:packbadge>
                    ARGS ${CMAKE_CURRENT_SOURCE_DIR}/badge.png
                    ${CMAKE_CURRENT_BINARY_DIR}/badge.bin

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()

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()
+

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)

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()

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()
+

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]

Editor/platforms/win/Package.appxmanifest

@@ -1,31 +1,25 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Package xmlns="http://schemas.microsoft.com/appx/2010/manifest">
-  <Identity Name="AxioDL.URDE" 
-			Version="1.0.0.0" 
-			Publisher="CN=URDE, O=URDE" />
+<?xml version="1.0" encoding="utf-8"?>
+<Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" xmlns:uap4="http://schemas.microsoft.com/appx/manifest/uap/windows10/4" xmlns:pm="http://schemas.microsoft.com/appx/2014/phone/manifest" IgnorableNamespaces="uap uap4 pm">
+  <Identity Name="AxioDL.URDE" Version="1.0.0.0" Publisher="CN=AxioDL" />
+  <pm:PhoneIdentity PhoneProductId="97E278C0-4527-453D-AE03-375B1FAA0B19" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
   <Properties>
-	<DisplayName>URDE</DisplayName>
-	<PublisherDisplayName>AxioDL</PublisherDisplayName>
+    <DisplayName>URDE</DisplayName>
+    <PublisherDisplayName>AxioDL</PublisherDisplayName>
+    <Logo>Assets\urde.png</Logo>
   </Properties>
+  <Dependencies>
+    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.14393.0" MaxVersionTested="10.0.16299.0" />
+  </Dependencies>
   <Resources>
-	<Resource Language="en-us" />
+    <Resource Language="en-us" />
   </Resources>
   <Applications>
-	<Application Id="URDE" StartPage="">
-	  <VisualElements 
-		   DisplayName="URDE"
-		   Description="Game engine recreation for Metroid Prime"
-		   Square310x310Logo="Tiles\Square310x310Logo.png"
-		   Wide310x150Logo="Tiles\Wide310x150Logo.png"
-		   Square150x150Logo="Tiles\Square150x150Logo.png"
-		   Square71x71Logo="Tiles\Square71x71Logo.png"
-		   Square44x44Logo="Tiles\Square44x44Logo.png"
-		   ForegroundText="light"
-		   BackgroundColor="#333333">
-		 <SplashScreen
-		   BackgroundColor="#333333" 
-		   Image="Tiles\SplashScreen.png" />
-	  </VisualElements>
-	</Application>
+    <Application Id="URDE" Executable="$targetnametoken$.exe" EntryPoint="URDE.App">
+      <uap:VisualElements DisplayName="URDE" Description="Game engine recreation for Metroid Prime" Square150x150Logo="Assets\Square150x150Logo.png" Square44x44Logo="Assets\Square44x44Logo.png" BackgroundColor="#333333">
+        <uap:DefaultTile Square310x310Logo="Assets\LargeTile.png" Wide310x150Logo="Assets\WideTile.png" Square71x71Logo="Assets\SmallTile.png">
+        </uap:DefaultTile>
+        <uap:SplashScreen BackgroundColor="#333333" Image="Assets\SplashScreen.png" />
+      </uap:VisualElements>
+    </Application>
   </Applications>
-</Package>
+</Package>

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()

amuse

@@ -1 +1 @@
-Subproject commit d399f1d302663b85d1062f8876a9b4d0436c1815
+Subproject commit 5caf6bf017efdee381ac700d67f14a7202c19b3d

hecl

@@ -1 +1 @@
-Subproject commit eec247cff61e8f7d561109ce321b57e84c8663e5
+Subproject commit ba6f66296b1fa5d4962c97aaa87c060d2aee97e7

jbus

@@ -1 +1 @@
-Subproject commit b1f9b08d25486f17815075502e61636681c70828
+Subproject commit 34860de2488a4bf08089f67d1792841d8c7b7beb

kabufuda

@@ -1 +1 @@
-Subproject commit bdfff2ba3370bcd3943652c545076934c1c9265f
+Subproject commit bd73c89b548e1787d648b14cd05c9278a1ed81b8

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)

nod

@@ -1 +1 @@
-Subproject commit 3d70a568dcb04d2d1cc114493ab38e7cff10e78d
+Subproject commit 34de6276b0fa30d7050c25978001736c8ad2e90c