merged 1.3 r978:979 into trunk
This commit is contained in:
parent
ab045a1b8e
commit
627771cf13
|
@ -17,7 +17,6 @@
|
|||
!define vcRedistFile "vcredist_${arch}.exe"
|
||||
!define startMenuApp "qsynergy.exe"
|
||||
!define binDir "..\bin"
|
||||
!define libDir "..\lib"
|
||||
!define uninstall "uninstall.exe"
|
||||
!define icon "..\src\gui\res\win\QSynergy.ico"
|
||||
!define controlPanelReg "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall"
|
||||
|
@ -115,7 +114,7 @@ Section "Server and Client" core
|
|||
; client and server files
|
||||
File "${binDir}\Release\synergys.exe"
|
||||
File "${binDir}\Release\synergyc.exe"
|
||||
File "${libDir}\Release\synrgyhk.dll"
|
||||
File "${binDir}\Release\synrgyhk.dll"
|
||||
|
||||
SectionEnd
|
||||
|
||||
|
|
|
@ -110,6 +110,19 @@ add_library(platform STATIC ${src})
|
|||
|
||||
if (WIN32)
|
||||
add_library(synrgyhk SHARED ${inc_hook} ${src_hook})
|
||||
|
||||
# move the synrgyhk.dll (and supporting files) from the lib dir to
|
||||
# the bin dir, so that synergyc and synergys can easily find it.
|
||||
# we should leave the other libraries compiling to the lib dir,
|
||||
# so that the bin dir remains tidy. the path is relative to the
|
||||
# build dir (in this case, that's: build\src\lib\platform).
|
||||
add_custom_command(
|
||||
TARGET synrgyhk
|
||||
POST_BUILD
|
||||
COMMAND move
|
||||
..\\..\\..\\..\\lib\\${CMAKE_CFG_INTDIR}\\synrgyhk.*
|
||||
..\\..\\..\\..\\bin\\${CMAKE_CFG_INTDIR}
|
||||
1> NUL)
|
||||
endif()
|
||||
|
||||
if (UNIX)
|
||||
|
|
Loading…
Reference in New Issue