summaryrefslogtreecommitdiff
path: root/cscript
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2018-02-17 22:54:48 +0000
committercah <cah@ableton.com>2019-12-03 11:37:28 +0100
commit2f3e45c89a7b3d387ba3f509b2a32a7f0bdf9c37 (patch)
tree815b869c043f46f94826cb3bfc5109365742ba95 /cscript
parent445405975d61d4e1f52093974518ca8422bff462 (diff)
Fix deprecated cscript bits.
Diffstat (limited to 'cscript')
-rw-r--r--cscript12
1 files changed, 5 insertions, 7 deletions
diff --git a/cscript b/cscript
index 98959a4a..f6887a7d 100644
--- a/cscript
+++ b/cscript
@@ -5,15 +5,13 @@ def build(target, options):
if target.platform == 'windows':
# Hack: the build fails if PATH includes /opt/windows/64/bin; I don't know why:
# remove it
- target.set('PATH', '%s:%s' % (target.mingw_path, os.environ['PATH']))
+ target.set('PATH', '%s:%s' % (target.tool_path, os.environ['PATH']))
f = open('mingw.cmake', 'w')
print("SET(CMAKE_SYSTEM_NAME Windows)", file=f)
- print("SET(CMAKE_C_COMPILER %s/%s)" % (target.mingw_path, target.get('CC')), file=f)
- print("SET(CMAKE_RC_COMPILER %s/%s)" % (target.mingw_path, target.get('WINRC')), file=f)
- all = ""
- for p in target.mingw_prefixes:
- all += "%s " % p
- print("SET(CMAKE_ROOT_FIND_PATH %s %s)" % (all, target.mingw_path), file=f)
+ print("SET(CMAKE_C_COMPILER %s/%s)" % (target.tool_path, target.get('CC')), file=f)
+ print("SET(CMAKE_RC_COMPILER %s/%s)" % (target.tool_path, target.get('WINRC')), file=f)
+ all = "%s " % target.library_prefix
+ print("SET(CMAKE_ROOT_FIND_PATH %s %s)" % (all, target.tool_path), file=f)
print("SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)", file=f)
print("SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)", file=f)
print("SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)", file=f)