AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

UWP CMake fixes

This commit is contained in:
Jack Andersen 2017-12-07 16:55:12 -10:00
parent 6a7eeb08fe
commit 0c1d0b5ce3
5 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -1,5 +1,4 @@
cmake_minimum_required(VERSION 3.10 FATAL_ERROR) # because of c++17 cmake_minimum_required(VERSION 3.10 FATAL_ERROR) # because of c++17
cmake_policy(SET CMP0054 NEW) cmake_policy(SET CMP0054 NEW)
project(urde) project(urde)
@ -11,6 +10,7 @@ set(BUILD_STATIC_LIBS ON CACHE BOOL "Force static libs on" FORCE)
if(MSVC) if(MSVC)
if(${CMAKE_GENERATOR} MATCHES "Visual Studio*") if(${CMAKE_GENERATOR} MATCHES "Visual Studio*")
set(VS_DEFINES "/MP") set(VS_DEFINES "/MP")
set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT urde)
endif() endif()
# Shaddup MSVC # Shaddup MSVC

8
Editor/CMakeLists.txt
View File

@ -107,11 +107,7 @@ if (NOT WINDOWS_STORE)
add_custom_command(TARGET urde POST_BUILD add_custom_command(TARGET urde POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:hecl> $<TARGET_FILE_DIR:urde>) COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:hecl> $<TARGET_FILE_DIR:urde>)
else() 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_WINRT_COMPONENT TRUE)
#set_property(TARGET urde boo PROPERTY VS_DESKTOP_EXTENSIONS_VERSION "${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}") # This should match the Package.appxmanifest
#set_property(TARGET urde boo PROPERTY VS_MOBILE_EXTENSIONS_VERSION "${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}") set_property(TARGET urde PROPERTY VS_WINDOWS_TARGET_PLATFORM_MIN_VERSION "10.0.14393.0")
#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 boo PROPERTY VS_SDK_REFERENCES "Microsoft.UniversalCRT.Debug, Version=${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}")
endif() endif()

7
Editor/platforms/win/Package.appxmanifest
View File

@ -16,7 +16,12 @@
<Applications> <Applications>
<Application Id="URDE" Executable="$targetnametoken$.exe" EntryPoint="URDE.App"> <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: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 Square310x310Logo="Assets\LargeTile.png" Wide310x150Logo="Assets\WideTile.png" Square71x71Logo="Assets\SmallTile.png" ShortName="URDE">
<uap:ShowNameOnTiles>
<uap:ShowOn Tile="square150x150Logo" />
<uap:ShowOn Tile="wide310x150Logo" />
<uap:ShowOn Tile="square310x310Logo" />
</uap:ShowNameOnTiles>
</uap:DefaultTile> </uap:DefaultTile>
<uap:SplashScreen BackgroundColor="#333333" Image="Assets\SplashScreen.png" /> <uap:SplashScreen BackgroundColor="#333333" Image="Assets\SplashScreen.png" />
</uap:VisualElements> </uap:VisualElements>

2
hecl

@ -1 +1 @@
Subproject commit ba6f66296b1fa5d4962c97aaa87c060d2aee97e7 Subproject commit f52faef9e474889e23803d23b00f860e0da2cb99

2
specter

@ -1 +1 @@
Subproject commit f93f63b53f552af93980cdb4552a54f3330e5fb6 Subproject commit 23eefd6872b03b6701c18be2ea00e517ac8e1f0e