rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

corrected toolchain and nsi paths for new build structure

This commit is contained in:
Nick Bolton 2011-04-26 19:33:19 +00:00
parent 85b2802777
commit 1ca32353d9
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
res/Installer.nsi.in
View File

@ -16,9 +16,9 @@
!define helpUrl "http://synergy-foss.org/support" !define helpUrl "http://synergy-foss.org/support"
!define vcRedistFile "vcredist_${arch}.exe" !define vcRedistFile "vcredist_${arch}.exe"
!define startMenuApp "qsynergy.exe" !define startMenuApp "qsynergy.exe"
!define binDir "..\bin\Release" !define binDir "..\bin"
!define uninstall "uninstall.exe" !define uninstall "uninstall.exe"
!define icon "..\gui\res\win\QSynergy.ico" !define icon "..\src\gui\res\win\QSynergy.ico"
!define controlPanelReg "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall" !define controlPanelReg "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall"
!define MUI_ICON ${icon} !define MUI_ICON ${icon}
@ -26,7 +26,7 @@
!include "MUI2.nsh" !include "MUI2.nsh"
!insertmacro MUI_PAGE_LICENSE "..\\cmake\\License.rtf" !insertmacro MUI_PAGE_LICENSE "..\\res\\License.rtf"
!insertmacro MUI_PAGE_DIRECTORY !insertmacro MUI_PAGE_DIRECTORY
!insertmacro MUI_PAGE_INSTFILES !insertmacro MUI_PAGE_INSTFILES
@ -112,16 +112,16 @@ SectionEnd
Section "Server and Client" core Section "Server and Client" core
; client and server files ; client and server files
File "${binDir}\synergys.exe" File "${binDir}\src\cmd\synergys\Release\synergys.exe"
File "${binDir}\synergyc.exe" File "${binDir}\src\cmd\synergyc\Release\synergyc.exe"
File "${binDir}\synrgyhk.dll" File "${binDir}\src\lib\platform\Release\synrgyhk.dll"
SectionEnd SectionEnd
Section "Graphical User Interface" gui Section "Graphical User Interface" gui
; gui and qt libs ; gui and qt libs
File "${binDir}\qsynergy.exe" File "${binDir}\Release\qsynergy.exe"
File "${qtDir}\qt\bin\libgcc_s_dw2-1.dll" File "${qtDir}\qt\bin\libgcc_s_dw2-1.dll"
File "${qtDir}\qt\bin\mingwm10.dll" File "${qtDir}\qt\bin\mingwm10.dll"
File "${qtDir}\qt\bin\QtGui4.dll" File "${qtDir}\qt\bin\QtGui4.dll"

2
tools/build/toolchain.py
View File

@ -538,7 +538,7 @@ class InternalCommands:
arch = 'x64' arch = 'x64'
installDirVar = '$PROGRAMFILES64' installDirVar = '$PROGRAMFILES64'
templateFile = open('cmake\Installer.nsi.in') templateFile = open(self.cmake_dir + '\Installer.nsi.in')
template = templateFile.read() template = templateFile.read()
template = template.replace('${in:version}', self.getVersionFromCmake()) template = template.replace('${in:version}', self.getVersionFromCmake())