summaryrefslogtreecommitdiffstats
path: root/build/util.py
diff options
context:
space:
mode:
authorRJ Ryan <rryan@mixxx.org>2014-09-16 13:56:42 -0400
committerRJ Ryan <rryan@mixxx.org>2014-09-16 13:56:42 -0400
commit1f35632a7d4b80475f92dfe15f19634fe0555efe (patch)
tree3ab212c3ce5063d5f25e7fa46591333101722bc5 /build/util.py
parentaa4557c422164890ac17fe26e55681bfae0b5f0c (diff)
Update MSVC++ runtime installation.
* Distribute the runtime executable installer instead of an MSI. * Remove hacky util.get_mssdk_path() since it essentially picks an SDK at random if you have multiple installed. * Update NSIS to use MSVC2013 runtime registry key.
Diffstat (limited to 'build/util.py')
-rw-r--r--build/util.py16
1 files changed, 1 insertions, 15 deletions
diff --git a/build/util.py b/build/util.py
index 21d94cc916..d6ec81fa2d 100644
--- a/build/util.py
+++ b/build/util.py
@@ -140,20 +140,7 @@ def get_flags(env, argflag, default=0):
return flags
-def get_mssdk_path():
- """Look for the Microsoft SDK path checking the various environment
- variables they set."""
- path = os.getenv('SDKDIR', None)
- if path is not None:
- return path
- path = os.getenv('MSSdk', None)
- if path is not None:
- return path
- return ""
-
# Checks for pkg-config on Linux
-
-
def CheckForPKGConfig(context, version='0.0.0'):
context.Message(
"Checking for pkg-config (at least version %s)... " % version)
@@ -162,9 +149,8 @@ def CheckForPKGConfig(context, version='0.0.0'):
context.Result(ret)
return ret
+
# Uses pkg-config to check for a minimum version
-
-
def CheckForPKG(context, name, version=""):
if version == "":
context.Message("Checking for %s... \t" % name)