-
-
Notifications
You must be signed in to change notification settings - Fork 6.3k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[Windows]: add support of Universal Windows Platform. #12942
Conversation
jenkins build this with addons please |
don't forget to add a patch file for libUPnP in lib/libUPnP/patches |
Is the use of bastardized c++ a platform requirement? |
@notspiff what do you call "bastardized c++"? |
Couldnt recall the actual name. Safe c++ is it? ref keyword, ^ etc. The msft inventions which are not part of the c++ language. Managed c++ i think it is. |
Its name is WinRT and it's a platform requirement. there is a https://github.com/Microsoft/cppwinrt which allow replace WinRT with C++ but in fact it still is WinRT |
thanks for info. |
c32bb00
to
fc28014
Compare
CMakeLists.txt
Outdated
@@ -64,6 +64,11 @@ if(CORE_SYSTEM_NAME STREQUAL linux) | |||
option(ENABLE_EVENTCLIENTS "Enable event clients support?" OFF) | |||
endif() | |||
|
|||
if(CORE_SYSTEM_NAME STREQUAL windowsstore) | |||
set(ENABLE_OPTICAL OFF) |
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
cmake/modules/FindPCRE.cmake
Outdated
@@ -61,7 +61,7 @@ if(PCRE_FOUND) | |||
endif() | |||
set_target_properties(PCRE::PCRE PROPERTIES | |||
INTERFACE_INCLUDE_DIRECTORIES "${PCRE_INCLUDE_DIR}") | |||
if(WIN32) | |||
if(WIN32 AND NOT ARCH STREQUAL arm) |
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
cmake/addons/CMakeLists.txt
Outdated
@@ -243,7 +249,7 @@ foreach(addon ${addons}) | |||
endif() | |||
|
|||
if(ADDON_FOUND) | |||
message(STATUS "\n-- ---- Configuring addon ${addon} ----") | |||
message(STATUS "\n-- ---- Configuring addon ${addon} platform: ${CORE_SYSTEM_NAME} ----") |
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
@@ -7,6 +7,10 @@ function(add_addon_depends addon searchpath) | |||
set(OUTPUT_DIR ${ADDON_DEPENDS_PATH}) | |||
# look for platform-specific dependencies | |||
file(GLOB_RECURSE cmake_input_files ${searchpath}/${CORE_SYSTEM_NAME}/*.txt) | |||
# backward compatibility | |||
if("${cmake_input_files}" STREQUAL "" AND CORE_SYSTEM_NAME STREQUAL windowsstore) |
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
4d1f3aa
to
1472cbd
Compare
now windows.xml is setting for all windows platforms win32.xml is settings for desktop platform win10.xml is settings for universal platform.
jenkins build this with addons please |
\o/ |
Congrats to all that made this possible! |
see title