Skip to content

Commit

Permalink
[TIMOB-25895] Add Windows SDK 7.1.1 compatibility (#29)
Browse files Browse the repository at this point in the history
  • Loading branch information
infosia authored Mar 30, 2018
1 parent 1e6f014 commit 7246e36
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 7 deletions.
2 changes: 1 addition & 1 deletion windows/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ project(TiPaint)

set(TiPaint_VERSION 0.1.0)

set(WINDOWS_SOURCE_DIR "C:/ProgramData/Titanium/mobilesdk/win32/7.0.0.GA/windows")
set(WINDOWS_SOURCE_DIR "C:/ProgramData/Titanium/mobilesdk/win32/7.1.1.GA/windows")

SET(CMAKE_FIND_LIBRARY_PREFIXES "")
SET(CMAKE_FIND_LIBRARY_SUFFIXES ".lib" ".dll")
Expand Down
13 changes: 10 additions & 3 deletions windows/cmake/FindHAL.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,17 @@ set_target_properties(HAL PROPERTIES
INTERFACE_HAL_MAJOR_VERSION "0"
)

set_target_properties(HAL PROPERTIES
IMPORTED_IMPLIB "${WINDOWS_SOURCE_DIR}/lib/HAL/${PLATFORM}/${HAL_ARCH}/HAL.lib"
IMPORTED_LOCATION "${WINDOWS_SOURCE_DIR}/lib/HAL/${PLATFORM}/${HAL_ARCH}/HAL.dll"
if (HAL_RENAME_AXWAYHAL)
set_target_properties(HAL PROPERTIES
IMPORTED_IMPLIB "${WINDOWS_SOURCE_DIR}/lib/HAL/${PLATFORM}/${HAL_ARCH}/AXWAYHAL.lib"
IMPORTED_LOCATION "${WINDOWS_SOURCE_DIR}/lib/HAL/${PLATFORM}/${HAL_ARCH}/AXWAYHAL.dll"
)
else()
set_target_properties(HAL PROPERTIES
IMPORTED_IMPLIB "${WINDOWS_SOURCE_DIR}/lib/HAL/${PLATFORM}/${HAL_ARCH}/HAL.lib"
IMPORTED_LOCATION "${WINDOWS_SOURCE_DIR}/lib/HAL/${PLATFORM}/${HAL_ARCH}/HAL.dll"
)
endif()

# This file does not depend on other imported targets which have
# been exported from the same project but in a separate export set.
Expand Down
6 changes: 3 additions & 3 deletions windows/manifest
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
version: 3.0.0
apiversion: 4
version: 3.1.0
apiversion: 5
architectures: ARM x86
description: Provides a paint surface user interface view.
author: Gary Mathews
Expand All @@ -12,4 +12,4 @@ moduleid: ti.paint
moduleIdAsIdentifier: TiPaint
guid: 3a8ff336-741e-4a70-bb0c-01a4e44574e9
platform: windows
minsdk: 7.0.0
minsdk: 7.1.1

0 comments on commit 7246e36

Please sign in to comment.