Browse Source

Hack to fix Windows Release build

Either this location is incorrect, or it is an optional install that I
haven’t figured out how to get yet. Either way, this is failing
TeamCity Windows Releases builds which I want to turn on. So for now,
I’m disabling. I’ll figure out how to make it work correctly with my
work on generating windows installs.
QGC4.4
Don Gagne 11 years ago
parent
commit
35fbc63d4e
  1. 5
      QGCSetup.pri

5
QGCSetup.pri

@ -186,10 +186,13 @@ WindowsBuild {
ReleaseBuild { ReleaseBuild {
QMAKE_POST_LINK += $$escape_expand(\\n) $$quote(del /F "$$DESTDIR_WIN\\$${TARGET}.exp") QMAKE_POST_LINK += $$escape_expand(\\n) $$quote(del /F "$$DESTDIR_WIN\\$${TARGET}.exp")
# This next xcopy does not always work because the files are not there by default, so disabling for now while
# we figure out the right way to do it
# Copy Visual Studio DLLs # Copy Visual Studio DLLs
# Note that this is only done for release because the debugging versions of these DLLs cannot be redistributed. # Note that this is only done for release because the debugging versions of these DLLs cannot be redistributed.
# I'm not certain of the path for VS2008, so this only works for VS2010. # I'm not certain of the path for VS2008, so this only works for VS2010.
win32-msvc2010 { win32-msvc2010_NotWorkingButKeepingIn {
QMAKE_POST_LINK += $$escape_expand(\\n) $$quote(xcopy /D /Y "\"C:\\Program Files \(x86\)\\Microsoft Visual Studio 10.0\\VC\\redist\\x86\\Microsoft.VC100.CRT\\*.dll\"" "$$DESTDIR_WIN\\") QMAKE_POST_LINK += $$escape_expand(\\n) $$quote(xcopy /D /Y "\"C:\\Program Files \(x86\)\\Microsoft Visual Studio 10.0\\VC\\redist\\x86\\Microsoft.VC100.CRT\\*.dll\"" "$$DESTDIR_WIN\\")
} }
} }

Loading…
Cancel
Save