backup/barrier
1
0
Fork 0
mirror of https://github.com/debauchee/barrier.git synced 2026-05-09 07:22:21 +08:00
Code Issues Projects Releases Wiki Activity

fix bug #2770 - mingwm10.dll missing from 1.4.2 and 1.5.0 installer

Browse Source
This commit is contained in:
Nick Bolton
2011-01-18 22:55:39 +00:00
parent ef3baf5e52
commit 2e15caa2bb
3 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
build/commands.py
View File

@@ -439,7 +439,7 @@ class InternalCommands:
if err != 0:
raise Exception('doxygen failed with error code: ' + str(err))
def dist(self, type, vcRedistDir):
def dist(self, type, vcRedistDir, qtDir):
# Package is supported by default.
package_unsupported = False
@@ -453,8 +453,8 @@ class InternalCommands:
raise Exception(
'VC++ redist dir path not specified (--vcredist-dir).')
# escape path separators for cmake
vcRedistDir = vcRedistDir.replace('\\', '\\\\')
# forward slashes are easier in cmake
vcRedistDir = vcRedistDir.replace('\\', '/')
vcRedistArch = 'x86'
if generator.endswith('Win64'):
@@ -465,6 +465,10 @@ class InternalCommands:
confArgs += (' -DVCREDIST_DIR:STRING=' + vcRedistDir +
' -DVCREDIST_FILE:STRING=' + vcRedistFile)
if (qtDir != ''):
# forward slashes are easier in cmake
confArgs += ' -DQT_DIR:STRING=' + qtDir.replace('\\', '/')
self.configure_internal('', confArgs)
else:
self.configure_internal(unixTarget, confArgs)
@@ -878,6 +882,7 @@ class CommandHandler:
ic = InternalCommands()
build_targets = []
vcRedistDir = ''
qtDir = ''
def __init__(self, argv, opts, args, verbose):
@@ -899,6 +904,8 @@ class CommandHandler:
self.build_targets += ['release',]
elif o == '--vcredist-dir':
self.vcRedistDir = a
elif o == '--qt-dir':
self.qtDir = a
def about(self):
self.ic.about()
@@ -933,7 +940,7 @@ class CommandHandler:
if len(self.args) > 0:
type = self.args[0]
self.ic.dist(type, self.vcRedistDir)
self.ic.dist(type, self.vcRedistDir, self.qtDir)
def distftp(self):
type = None