diff options
| author | Jose <jose@zeroc.com> | 2015-08-11 12:41:13 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2015-08-11 12:41:13 +0200 |
| commit | f8aac7410da99d374aa8087118cca2b877925d3a (patch) | |
| tree | da70c36c559c8c12e52f5a75c17ea239a5d96cbb /cpp | |
| parent | Refactor WinRT property sheet properties (diff) | |
| download | ice-f8aac7410da99d374aa8087118cca2b877925d3a.tar.bz2 ice-f8aac7410da99d374aa8087118cca2b877925d3a.tar.xz ice-f8aac7410da99d374aa8087118cca2b877925d3a.zip | |
Add SDK prefix to WinRT builds
Diffstat (limited to 'cpp')
| -rwxr-xr-x | cpp/config/Make.rules.msvc | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/cpp/config/Make.rules.msvc b/cpp/config/Make.rules.msvc index befcdab6c15..4d3f2377653 100755 --- a/cpp/config/Make.rules.msvc +++ b/cpp/config/Make.rules.msvc @@ -44,19 +44,21 @@ WINDOWS_SDK_DIR = $(PROGRAMFILES) (x86)\Microsoft SDKs WINDOWS_SDK_DIR = $(PROGRAMFILES)\Microsoft SDKs !endif +SDK_NAME = Ice + !if "$(CPP_COMPILER)" == "VC110" -SDK_NAME = Ice.WinRT TARGET_PLATFORM = Windows TARGET_PLATFORM_VERSION = 8.0 +SDK_PREFIX = 8.0 MIN_VS_VERSION = 11.0 !elseif "$(CPP_COMPILER)" == "VC120" -SDK_NAME = Ice.WinRT TARGET_PLATFORM = Windows TARGET_PLATFORM_VERSION = 8.1 +SDK_PREFIX = 8.1 MIN_VS_VERSION = 12.0 !elseif "$(CPP_COMPILER)" == "VC140" -SDK_NAME = Ice.UAP TARGET_PLATFORM_VERSION = 10.0.10240.0 +SDK_PREFIX = 10 TARGET_PLATFORM = UAP MIN_VS_VERSION = 14.0 !else @@ -159,9 +161,9 @@ SDK_MANIFEST = SDKManifest.xml !if "$(ice_src_dist)" != "" -SDK_BASE_PATH = $(top_srcdir)\SDKs\$(TARGET_PLATFORM)\v$(TARGET_PLATFORM_VERSION)\ExtensionSDKs\$(SDK_NAME)\$(SDK_VERSION) +SDK_BASE_PATH = $(top_srcdir)\SDKs\$(SDK_PREFIX)\$(TARGET_PLATFORM)\v$(TARGET_PLATFORM_VERSION)\ExtensionSDKs\$(SDK_NAME)\$(SDK_VERSION) !else -SDK_BASE_PATH = $(ice_dir)\SDKs\$(TARGET_PLATFORM)\v$(TARGET_PLATFORM_VERSION)\ExtensionSDKs\$(SDK_NAME)\$(SDK_VERSION) +SDK_BASE_PATH = $(ice_dir)\SDKs\$(SDK_PREFIX)\$(TARGET_PLATFORM)\v$(TARGET_PLATFORM_VERSION)\ExtensionSDKs\$(SDK_NAME)\$(SDK_VERSION) !endif SDK_INCLUDE_PATH = $(SDK_BASE_PATH)\DesignTime\CommonConfiguration\Neutral\include |