Merge bonjour branch
This commit is contained in:
commit
cb20fdcc97
Binary file not shown.
Binary file not shown.
|
@ -208,7 +208,7 @@ class InternalCommands:
|
|||
qmake_cmd = 'qmake'
|
||||
make_cmd = 'make'
|
||||
xcodebuild_cmd = 'xcodebuild'
|
||||
w32_make_cmd = 'mingw32-make'
|
||||
w32_make_cmd = 'nmake'
|
||||
w32_qt_version = '5.6.1'
|
||||
defaultTarget = 'release'
|
||||
|
||||
|
|
|
@ -134,18 +134,24 @@ release {
|
|||
MOC_DIR = tmp/release
|
||||
RCC_DIR = tmp/release
|
||||
}
|
||||
win32-g++ {
|
||||
LIBS += -L"../../ext/bonjour/x64" -ldnssd
|
||||
INCLUDEPATH += "$$(BONJOUR_SDK_HOME)/Include/"
|
||||
}
|
||||
win32-msvc2015 {
|
||||
LIBS += -L"$$(BONJOUR_SDK_HOME)/Lib/x64" -ldnssd
|
||||
LIBS += -lAdvapi32
|
||||
QMAKE_LFLAGS += /NODEFAULTLIB:LIBCMT
|
||||
INCLUDEPATH += "$$(BONJOUR_SDK_HOME)/Include/"
|
||||
}
|
||||
win32-msvc* {
|
||||
contains(QMAKE_HOST.arch, x86):{
|
||||
QMAKE_LFLAGS *= /MACHINE:X86
|
||||
LIBS += -L"$$(BONJOUR_SDK_HOME)/Lib/Win32" -ldnssd
|
||||
}
|
||||
|
||||
contains(QMAKE_HOST.arch, x86_64):{
|
||||
QMAKE_LFLAGS *= /MACHINE:X64
|
||||
LIBS += -L"$$(BONJOUR_SDK_HOME)/Lib/x64" -ldnssd
|
||||
}
|
||||
}
|
||||
win32 {
|
||||
Debug:DESTDIR = ../../bin/Debug
|
||||
Release:DESTDIR = ../../bin/Release
|
||||
INCLUDEPATH += "$$(BONJOUR_SDK_HOME)/Include"
|
||||
}
|
||||
else:DESTDIR = ../../bin
|
||||
|
|
|
@ -7,9 +7,6 @@
|
|||
<?define BinPath="../../../bin/$(var.Configuration)" ?>
|
||||
<?define ResPath="../../../res" ?>
|
||||
<?define ExtPath="../../../ext" ?>
|
||||
<?define QtMajor="5" ?>
|
||||
<?define QtPath="C:\Qt\5.6\mingw49_32\bin" ?>
|
||||
<?define QtPlatformPath="C:\Qt\5.6\mingw49_32\plugins\platforms" ?>
|
||||
|
||||
<?ifndef Version ?>
|
||||
<?define Version="1.0.0" ?>
|
||||
|
@ -23,11 +20,15 @@
|
|||
<?define PlatformSimpleName="64-bit" ?>
|
||||
<?define UpgradeGuid="$(var.UpgradeGuid64)" ?>
|
||||
<?define var.OpensslPath="openssl-win64" ?>
|
||||
<?define var.QtPath="C:\Qt\5.6\msvc2015_64\bin" ?>
|
||||
<?define QtPlatformPath="C:\Qt\5.6\msvc2015_64\plugins\platforms" ?>
|
||||
<?else?>
|
||||
<?define ProgramFilesFolder="ProgramFilesFolder" ?>
|
||||
<?define PlatformSimpleName="32-bit" ?>
|
||||
<?define UpgradeGuid="$(var.UpgradeGuid32)" ?>
|
||||
<?define var.OpensslPath="openssl-win32" ?>
|
||||
<?define var.QtPath="C:\Qt\5.6\msvc2015\bin" ?>
|
||||
<?define QtPlatformPath="C:\Qt\5.6\msvc2015\plugins\platforms" ?>
|
||||
<?endif?>
|
||||
|
||||
<?define CRT="$(env.CommonProgramFiles)\Merge Modules\Microsoft_VC140_CRT_$(var.Platform).msm" ?>
|
||||
|
|
|
@ -120,26 +120,13 @@
|
|||
<Shortcut Id="GuiShortcut" Name="$(var.Name)" Directory="ProgramMenuFolder" Icon="synergy.ico" Advertise="yes" />
|
||||
<fire:FirewallException Id="GuiFirewallException" Name="$(var.Name)" Scope="any" IgnoreFailure="yes" />
|
||||
</File>
|
||||
|
||||
<?if 5 = $(var.QtMajor) ?>
|
||||
<File Source="$(var.QtPath)\Qt5Core.dll" />
|
||||
<File Source="$(var.QtPath)\Qt5Gui.dll" />
|
||||
<File Source="$(var.QtPath)\Qt5Network.dll" />
|
||||
<File Source="$(var.QtPath)\Qt5Svg.dll" />
|
||||
<File Source="$(var.QtPath)\Qt5Widgets.dll" />
|
||||
<File Source="$(var.QtPath)\libGLESV2.dll" />
|
||||
<File Source="$(var.QtPath)\libGLESv2.dll" />
|
||||
<File Source="$(var.QtPath)\libEGL.dll" />
|
||||
<File Source="$(var.QtPath)\libstdc++-6.dll" />
|
||||
<File Source="$(var.QtPath)\libwinpthread-1.dll" />
|
||||
<?else?>
|
||||
<File Source="$(var.QtPath)\mingwm10.dll" CompanionFile="GuiProgram" />
|
||||
<File Source="$(var.QtPath)\QtCore4.dll" CompanionFile="GuiProgram" />
|
||||
<File Source="$(var.QtPath)\QtGui4.dll" CompanionFile="GuiProgram" />
|
||||
<File Source="$(var.QtPath)\QtNetwork4.dll" CompanionFile="GuiProgram" />
|
||||
<?endif?>
|
||||
|
||||
<File Source="$(var.ExtPath)\bonjour\x64\dnssd.dll" />
|
||||
|
||||
</Component>
|
||||
|
||||
</ComponentGroup>
|
||||
|
|
Loading…
Reference in New Issue