Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2015-09-18 14:49:05 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2015-09-18 14:49:05 (GMT) |
| commit | 68bb160b993dde045f502f10ecbbccce9d9184c1 (patch) | |
| tree | b6ea1c5480909a9f311d7b24973adb1ffe3c8c68 /Sluift/SConscript | |
| parent | 4455c20085834098f6d9aa872db3115d466e7004 (diff) | |
| download | swift-68bb160b993dde045f502f10ecbbccce9d9184c1.zip swift-68bb160b993dde045f502f10ecbbccce9d9184c1.tar.bz2 | |
Specify OS X framework version for script interface extraction
The iTunes support in Sluift requires extraction of the iTunes
scripting interface. Clang version Apple LLVM version 7.0.0
will error with "error: type arguments cannot be applied to
non-parameterized class 'NSArray'" and similar on the extracted
scripting interface.
With this change the sdp tool will generate scripting
interfaces compatible to OS X 10.10. The generated interface
files do not cause the error.
Test-Information:
Tested the build on OS X 10.10.5 and OS X 10.9.5 and verified
that the Sluift command "sluift.itunes.get_current_track()"
still works on both systems.
Change-Id: If70c797aea69e95c7be3cda4c50b64da45028aac
Diffstat (limited to 'Sluift/SConscript')
| -rw-r--r-- | Sluift/SConscript | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Sluift/SConscript b/Sluift/SConscript index a2b6748..09da0a9 100644 --- a/Sluift/SConscript +++ b/Sluift/SConscript | |||
| @@ -56,11 +56,11 @@ elif env["SCONS_STAGE"] == "build" : | |||
| 56 | sluift_env.Append(CPPDEFINES = ["SLUIFT_BUILD_DLL"]) | 56 | sluift_env.Append(CPPDEFINES = ["SLUIFT_BUILD_DLL"]) |
| 57 | 57 | ||
| 58 | if sluift_env["PLATFORM"] == "darwin" and os.path.isdir("/Applications/iTunes.app") : | 58 | if sluift_env["PLATFORM"] == "darwin" and os.path.isdir("/Applications/iTunes.app") : |
| 59 | sluift_env.Append(FRAMEWORKS = ["ScriptingBridge"]) | 59 | sluift_env.Append(FRAMEWORKS = ["ScriptingBridge"]) |
| 60 | sluift_env.Command("iTunes.h", "/Applications/iTunes.app", | 60 | sluift_env.Command("iTunes.h", "/Applications/iTunes.app", |
| 61 | "sdef ${SOURCE} | sdp -fh --basename iTunes -o ${TARGET.dir}") | 61 | "sdef ${SOURCE} | sdp -fh --basename iTunes -V 10.10 -o ${TARGET.dir}") |
| 62 | sluift_env.Append(CPPDEFINES = ["HAVE_ITUNES"]) | 62 | sluift_env.Append(CPPDEFINES = ["HAVE_ITUNES"]) |
| 63 | sluift_sources += ["ITunesInterface.mm"] | 63 | sluift_sources += ["ITunesInterface.mm"] |
| 64 | 64 | ||
| 65 | # Generate Version.h | 65 | # Generate Version.h |
| 66 | version_header = "#pragma once\n\n" | 66 | version_header = "#pragma once\n\n" |