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

Added experimental x64 build option for VS2008

This commit is contained in:
sveith 2009-04-07 22:36:07 +00:00
parent 5c89bc4b17
commit bf6da57cbd
10 changed files with 797 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cmd/launcher/CHotkeyOptions.cpp
View File

@ -559,7 +559,7 @@ CHotkeyOptions::CConditionDialog::doModal(HWND parent,
s_lastGoodCondition = NULL; s_lastGoodCondition = NULL;
} }
int n = DialogBox(s_instance, MAKEINTRESOURCE(IDD_HOTKEY_CONDITION), int n = DialogBox(s_instance, MAKEINTRESOURCE(IDD_HOTKEY_CONDITION),
parent, dlgProc); parent, (DLGPROC) dlgProc);
condition = s_condition; condition = s_condition;
delete s_lastGoodCondition; delete s_lastGoodCondition;
@ -579,8 +579,8 @@ CHotkeyOptions::CConditionDialog::doInit(HWND hwnd)
{ {
// subclass edit control // subclass edit control
HWND child = getItem(hwnd, IDC_HOTKEY_CONDITION_HOTKEY); HWND child = getItem(hwnd, IDC_HOTKEY_CONDITION_HOTKEY);
s_editWndProc = (WNDPROC)GetWindowLong(child, GWL_WNDPROC); s_editWndProc = (WNDPROC)GetWindowLongPtr(child, GWLP_WNDPROC);
SetWindowLong(child, GWL_WNDPROC, (LONG)editProc); SetWindowLongPtr(child, GWLP_WNDPROC, (LONG_PTR) editProc);
// fill control // fill control
fillHotkey(hwnd); fillHotkey(hwnd);
@ -944,7 +944,7 @@ CHotkeyOptions::CActionDialog::doModal(HWND parent, CConfig* config,
} }
int n = DialogBox(s_instance, MAKEINTRESOURCE(IDD_HOTKEY_ACTION), int n = DialogBox(s_instance, MAKEINTRESOURCE(IDD_HOTKEY_ACTION),
parent, dlgProc); parent, (DLGPROC) dlgProc);
onActivate = s_onActivate; onActivate = s_onActivate;
action = s_action; action = s_action;
@ -960,8 +960,8 @@ CHotkeyOptions::CActionDialog::doInit(HWND hwnd)
{ {
// subclass edit control // subclass edit control
HWND child = getItem(hwnd, IDC_HOTKEY_ACTION_HOTKEY); HWND child = getItem(hwnd, IDC_HOTKEY_ACTION_HOTKEY);
s_editWndProc = (WNDPROC)GetWindowLong(child, GWL_WNDPROC); s_editWndProc = (WNDPROC)GetWindowLongPtr(child, GWLP_WNDPROC);
SetWindowLong(child, GWL_WNDPROC, (LONG)editProc); SetWindowLongPtr(child, GWLP_WNDPROC, (LONG_PTR)editProc);
setWindowText(getItem(hwnd, IDC_HOTKEY_ACTION_HOTKEY), ""); setWindowText(getItem(hwnd, IDC_HOTKEY_ACTION_HOTKEY), "");
fillHotkey(hwnd); fillHotkey(hwnd);
@ -1734,7 +1734,7 @@ CHotkeyOptions::CScreensDialog::doModal(HWND parent, CConfig* config,
s_config = config; s_config = config;
s_action = action; s_action = action;
DialogBox(s_instance, MAKEINTRESOURCE(IDD_HOTKEY_SCREENS), DialogBox(s_instance, MAKEINTRESOURCE(IDD_HOTKEY_SCREENS),
parent, dlgProc); parent, (DLGPROC) dlgProc);
s_config = NULL; s_config = NULL;
s_action = NULL; s_action = NULL;
} }

7
cmd/synergyc/CMSWindowsClientTaskBarReceiver.cpp
View File

@ -325,14 +325,13 @@ CMSWindowsClientTaskBarReceiver::staticDlgProc(HWND hwnd,
if (msg == WM_INITDIALOG) { if (msg == WM_INITDIALOG) {
self = reinterpret_cast<CMSWindowsClientTaskBarReceiver*>( self = reinterpret_cast<CMSWindowsClientTaskBarReceiver*>(
reinterpret_cast<void*>(lParam)); reinterpret_cast<void*>(lParam));
SetWindowLong(hwnd, GWL_USERDATA, lParam); SetWindowLongPtr(hwnd, GWLP_USERDATA, (LONG_PTR) lParam);
} }
else { else {
// get the extra window data and forward the call // get the extra window data and forward the call
LONG data = GetWindowLong(hwnd, GWL_USERDATA); LONG_PTR data = GetWindowLongPtr(hwnd, GWLP_USERDATA);
if (data != 0) { if (data != 0) {
self = reinterpret_cast<CMSWindowsClientTaskBarReceiver*>( self = (CMSWindowsClientTaskBarReceiver*) data;
reinterpret_cast<void*>(data));
} }
} }

8
cmd/synergyc/synergyc.cpp
View File

@ -713,7 +713,13 @@ parse(int argc, const char* const* argv)
} }
// identify system // identify system
LOG((CLOG_INFO "Synergy client %s on %s", kVersion, ARCH->getOSName().c_str())); LOG((CLOG_INFO "%s Client on %s %s", kAppVersion, ARCH->getOSName().c_str(), ARCH->getPlatformName().c_str()));
#ifdef WIN32
#ifdef _AMD64_
LOG((CLOG_WARN "This is an experimental x64 build of %s. Use it at your own risk.", kApplication));
#endif
#endif
} }

6
cmd/synergys/synergys.cpp
View File

@ -1040,6 +1040,12 @@ parse(int argc, const char* const* argv)
// identify system // identify system
LOG((CLOG_INFO "%s Server on %s %s", kAppVersion, ARCH->getOSName().c_str(), ARCH->getPlatformName().c_str())); LOG((CLOG_INFO "%s Server on %s %s", kAppVersion, ARCH->getOSName().c_str(), ARCH->getPlatformName().c_str()));
#ifdef WIN32
#ifdef _AMD64_
LOG((CLOG_WARN "This is an experimental x64 build of %s. Use it at your own risk.", kApplication));
#endif
#endif
} }
static static

154
vs2008/client/client.vcproj
View File

@ -12,6 +12,9 @@
<Platform <Platform
Name="Win32" Name="Win32"
/> />
<Platform
Name="x64"
/>
</Platforms> </Platforms>
<ToolFiles> <ToolFiles>
</ToolFiles> </ToolFiles>
@ -89,6 +92,80 @@
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
/> />
</Configuration> </Configuration>
<Configuration
Name="Debug|x64"
OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="1"
CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\lib\arch;..\..\lib\base;..\..\lib\client;..\..\lib\common;..\..\lib\io;..\..\lib\mt;..\..\lib\net;..\..\lib\platform;..\..\lib\server;..\..\lib\synergy"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\synergyc.exe"
LinkIncremental="2"
GenerateDebugInformation="true"
SubSystem="2"
TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration <Configuration
Name="Release|Win32" Name="Release|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)" OutputDirectory="$(SolutionDir)$(ConfigurationName)"
@ -165,6 +242,83 @@
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
/> />
</Configuration> </Configuration>
<Configuration
Name="Release|x64"
OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="1"
CharacterSet="2"
WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="..\..\lib\arch;..\..\lib\base;..\..\lib\client;..\..\lib\common;..\..\lib\io;..\..\lib\mt;..\..\lib\net;..\..\lib\platform;..\..\lib\server;..\..\lib\synergy"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\synergyc.exe"
LinkIncremental="1"
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
</Configurations> </Configurations>
<References> <References>
<ProjectReference <ProjectReference

155
vs2008/hook/hook.vcproj
View File

@ -12,6 +12,9 @@
<Platform <Platform
Name="Win32" Name="Win32"
/> />
<Platform
Name="x64"
/>
</Platforms> </Platforms>
<ToolFiles> <ToolFiles>
</ToolFiles> </ToolFiles>
@ -166,6 +169,158 @@
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
/> />
</Configuration> </Configuration>
<Configuration
Name="Debug|x64"
OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\lib\arch;..\..\lib\base;..\..\lib\client;..\..\lib\common;..\..\lib\io;..\..\lib\mt;..\..\lib\net;..\..\lib\platform;..\..\lib\server;..\..\lib\synergy"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SYNRGYHK_EXPORTS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\synrgyhk.dll"
LinkIncremental="2"
GenerateDebugInformation="true"
SubSystem="2"
TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release|x64"
OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="2"
WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
EnableIntrinsicFunctions="true"
WholeProgramOptimization="false"
AdditionalIncludeDirectories="..\..\lib\arch;..\..\lib\base;..\..\lib\client;..\..\lib\common;..\..\lib\io;..\..\lib\mt;..\..\lib\net;..\..\lib\platform;..\..\lib\server;..\..\lib\synergy"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SYNRGYHK_EXPORTS"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\synrgyhk.dll"
LinkIncremental="1"
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
</Configurations> </Configurations>
<References> <References>
</References> </References>

162
vs2008/launcher/launcher.vcproj
View File

@ -12,6 +12,9 @@
<Platform <Platform
Name="Win32" Name="Win32"
/> />
<Platform
Name="x64"
/>
</Platforms> </Platforms>
<ToolFiles> <ToolFiles>
</ToolFiles> </ToolFiles>
@ -89,6 +92,80 @@
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
/> />
</Configuration> </Configuration>
<Configuration
Name="Debug|x64"
OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="1"
CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\lib\arch;..\..\lib\base;..\..\lib\client;..\..\lib\common;..\..\lib\io;..\..\lib\mt;..\..\lib\net;..\..\lib\platform;..\..\lib\server;..\..\lib\synergy"
PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_WINDOWS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\synergy.exe"
LinkIncremental="2"
GenerateDebugInformation="true"
SubSystem="2"
TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration <Configuration
Name="Release|Win32" Name="Release|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)" OutputDirectory="$(SolutionDir)$(ConfigurationName)"
@ -165,20 +242,97 @@
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
/> />
</Configuration> </Configuration>
<Configuration
Name="Release|x64"
OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="1"
CharacterSet="2"
WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="..\..\lib\arch;..\..\lib\base;..\..\lib\client;..\..\lib\common;..\..\lib\io;..\..\lib\mt;..\..\lib\net;..\..\lib\platform;..\..\lib\server;..\..\lib\synergy"
PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_WINDOWS"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\synergy.exe"
LinkIncremental="1"
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
</Configurations> </Configurations>
<References> <References>
<ProjectReference <ProjectReference
ReferencedProjectIdentifier="{EC741F89-2FC8-46B5-9C0F-0F1A3089ED21}" ReferencedProjectIdentifier="{EC741F89-2FC8-46B5-9C0F-0F1A3089ED21}"
RelativePathToProject=".\libsynergy\libsynergy.vcproj" RelativePathToProject=".\libsynergy\libsynergy.vcproj"
/> />
<ProjectReference
ReferencedProjectIdentifier="{18E611F5-A254-495B-BAC8-3322F827E7B3}"
RelativePathToProject=".\server\server.vcproj"
/>
<ProjectReference <ProjectReference
ReferencedProjectIdentifier="{29F4C90F-33D2-4AD1-9E59-412DFA26FC29}" ReferencedProjectIdentifier="{29F4C90F-33D2-4AD1-9E59-412DFA26FC29}"
RelativePathToProject=".\client\client.vcproj" RelativePathToProject=".\client\client.vcproj"
/> />
<ProjectReference
ReferencedProjectIdentifier="{18E611F5-A254-495B-BAC8-3322F827E7B3}"
RelativePathToProject=".\server\server.vcproj"
/>
</References> </References>
<Files> <Files>
<Filter <Filter

131
vs2008/libsynergy/libsynergy.vcproj
View File

@ -12,6 +12,9 @@
<Platform <Platform
Name="Win32" Name="Win32"
/> />
<Platform
Name="x64"
/>
</Platforms> </Platforms>
<ToolFiles> <ToolFiles>
</ToolFiles> </ToolFiles>
@ -142,6 +145,134 @@
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
/> />
</Configuration> </Configuration>
<Configuration
Name="Debug|x64"
OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="4"
CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\lib\arch;..\..\lib\base;..\..\lib\client;..\..\lib\common;..\..\lib\io;..\..\lib\mt;..\..\lib\net;..\..\lib\platform;..\..\lib\server;..\..\lib\synergy"
PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_WINDOWS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLibrarianTool"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release|x64"
OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="4"
CharacterSet="2"
WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
EnableIntrinsicFunctions="true"
WholeProgramOptimization="true"
AdditionalIncludeDirectories="..\..\lib\arch;..\..\lib\base;..\..\lib\client;..\..\lib\common;..\..\lib\io;..\..\lib\mt;..\..\lib\net;..\..\lib\platform;..\..\lib\server;..\..\lib\synergy"
PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_WINDOWS"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLibrarianTool"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
</Configurations> </Configurations>
<References> <References>
</References> </References>

154
vs2008/server/server.vcproj
View File

@ -12,6 +12,9 @@
<Platform <Platform
Name="Win32" Name="Win32"
/> />
<Platform
Name="x64"
/>
</Platforms> </Platforms>
<ToolFiles> <ToolFiles>
</ToolFiles> </ToolFiles>
@ -90,6 +93,81 @@
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
/> />
</Configuration> </Configuration>
<Configuration
Name="Debug|x64"
OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="1"
UseOfMFC="0"
CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\lib\arch;..\..\lib\base;..\..\lib\client;..\..\lib\common;..\..\lib\io;..\..\lib\mt;..\..\lib\net;..\..\lib\platform;..\..\lib\server;..\..\lib\synergy"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\synergys.exe"
LinkIncremental="2"
GenerateDebugInformation="true"
SubSystem="2"
TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration <Configuration
Name="Release|Win32" Name="Release|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)" OutputDirectory="$(SolutionDir)$(ConfigurationName)"
@ -165,6 +243,82 @@
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
/> />
</Configuration> </Configuration>
<Configuration
Name="Release|x64"
OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="1"
UseOfMFC="0"
CharacterSet="2"
WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories="..\..\lib\arch;..\..\lib\base;..\..\lib\client;..\..\lib\common;..\..\lib\io;..\..\lib\mt;..\..\lib\net;..\..\lib\platform;..\..\lib\server;..\..\lib\synergy"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\synergys.exe"
LinkIncremental="1"
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
</Configurations> </Configurations>
<References> <References>
<ProjectReference <ProjectReference

22
vs2008/synergy-plus.sln
View File

@ -14,29 +14,51 @@ EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32 Debug|Win32 = Debug|Win32
Debug|x64 = Debug|x64
Release|Win32 = Release|Win32 Release|Win32 = Release|Win32
Release|x64 = Release|x64
EndGlobalSection EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution GlobalSection(ProjectConfigurationPlatforms) = postSolution
{EC741F89-2FC8-46B5-9C0F-0F1A3089ED21}.Debug|Win32.ActiveCfg = Debug|Win32 {EC741F89-2FC8-46B5-9C0F-0F1A3089ED21}.Debug|Win32.ActiveCfg = Debug|Win32
{EC741F89-2FC8-46B5-9C0F-0F1A3089ED21}.Debug|Win32.Build.0 = Debug|Win32 {EC741F89-2FC8-46B5-9C0F-0F1A3089ED21}.Debug|Win32.Build.0 = Debug|Win32
{EC741F89-2FC8-46B5-9C0F-0F1A3089ED21}.Debug|x64.ActiveCfg = Debug|x64
{EC741F89-2FC8-46B5-9C0F-0F1A3089ED21}.Debug|x64.Build.0 = Debug|x64
{EC741F89-2FC8-46B5-9C0F-0F1A3089ED21}.Release|Win32.ActiveCfg = Release|Win32 {EC741F89-2FC8-46B5-9C0F-0F1A3089ED21}.Release|Win32.ActiveCfg = Release|Win32
{EC741F89-2FC8-46B5-9C0F-0F1A3089ED21}.Release|Win32.Build.0 = Release|Win32 {EC741F89-2FC8-46B5-9C0F-0F1A3089ED21}.Release|Win32.Build.0 = Release|Win32
{EC741F89-2FC8-46B5-9C0F-0F1A3089ED21}.Release|x64.ActiveCfg = Release|x64
{EC741F89-2FC8-46B5-9C0F-0F1A3089ED21}.Release|x64.Build.0 = Release|x64
{29F4C90F-33D2-4AD1-9E59-412DFA26FC29}.Debug|Win32.ActiveCfg = Debug|Win32 {29F4C90F-33D2-4AD1-9E59-412DFA26FC29}.Debug|Win32.ActiveCfg = Debug|Win32
{29F4C90F-33D2-4AD1-9E59-412DFA26FC29}.Debug|Win32.Build.0 = Debug|Win32 {29F4C90F-33D2-4AD1-9E59-412DFA26FC29}.Debug|Win32.Build.0 = Debug|Win32
{29F4C90F-33D2-4AD1-9E59-412DFA26FC29}.Debug|x64.ActiveCfg = Debug|x64
{29F4C90F-33D2-4AD1-9E59-412DFA26FC29}.Debug|x64.Build.0 = Debug|x64
{29F4C90F-33D2-4AD1-9E59-412DFA26FC29}.Release|Win32.ActiveCfg = Release|Win32 {29F4C90F-33D2-4AD1-9E59-412DFA26FC29}.Release|Win32.ActiveCfg = Release|Win32
{29F4C90F-33D2-4AD1-9E59-412DFA26FC29}.Release|Win32.Build.0 = Release|Win32 {29F4C90F-33D2-4AD1-9E59-412DFA26FC29}.Release|Win32.Build.0 = Release|Win32
{29F4C90F-33D2-4AD1-9E59-412DFA26FC29}.Release|x64.ActiveCfg = Release|x64
{29F4C90F-33D2-4AD1-9E59-412DFA26FC29}.Release|x64.Build.0 = Release|x64
{316F0911-BB20-4BE0-A095-29BF593225B9}.Debug|Win32.ActiveCfg = Debug|Win32 {316F0911-BB20-4BE0-A095-29BF593225B9}.Debug|Win32.ActiveCfg = Debug|Win32
{316F0911-BB20-4BE0-A095-29BF593225B9}.Debug|Win32.Build.0 = Debug|Win32 {316F0911-BB20-4BE0-A095-29BF593225B9}.Debug|Win32.Build.0 = Debug|Win32
{316F0911-BB20-4BE0-A095-29BF593225B9}.Debug|x64.ActiveCfg = Debug|x64
{316F0911-BB20-4BE0-A095-29BF593225B9}.Debug|x64.Build.0 = Debug|x64
{316F0911-BB20-4BE0-A095-29BF593225B9}.Release|Win32.ActiveCfg = Release|Win32 {316F0911-BB20-4BE0-A095-29BF593225B9}.Release|Win32.ActiveCfg = Release|Win32
{316F0911-BB20-4BE0-A095-29BF593225B9}.Release|Win32.Build.0 = Release|Win32 {316F0911-BB20-4BE0-A095-29BF593225B9}.Release|Win32.Build.0 = Release|Win32
{316F0911-BB20-4BE0-A095-29BF593225B9}.Release|x64.ActiveCfg = Release|x64
{316F0911-BB20-4BE0-A095-29BF593225B9}.Release|x64.Build.0 = Release|x64
{18E611F5-A254-495B-BAC8-3322F827E7B3}.Debug|Win32.ActiveCfg = Debug|Win32 {18E611F5-A254-495B-BAC8-3322F827E7B3}.Debug|Win32.ActiveCfg = Debug|Win32
{18E611F5-A254-495B-BAC8-3322F827E7B3}.Debug|Win32.Build.0 = Debug|Win32 {18E611F5-A254-495B-BAC8-3322F827E7B3}.Debug|Win32.Build.0 = Debug|Win32
{18E611F5-A254-495B-BAC8-3322F827E7B3}.Debug|x64.ActiveCfg = Debug|x64
{18E611F5-A254-495B-BAC8-3322F827E7B3}.Debug|x64.Build.0 = Debug|x64
{18E611F5-A254-495B-BAC8-3322F827E7B3}.Release|Win32.ActiveCfg = Release|Win32 {18E611F5-A254-495B-BAC8-3322F827E7B3}.Release|Win32.ActiveCfg = Release|Win32
{18E611F5-A254-495B-BAC8-3322F827E7B3}.Release|Win32.Build.0 = Release|Win32 {18E611F5-A254-495B-BAC8-3322F827E7B3}.Release|Win32.Build.0 = Release|Win32
{18E611F5-A254-495B-BAC8-3322F827E7B3}.Release|x64.ActiveCfg = Release|x64
{18E611F5-A254-495B-BAC8-3322F827E7B3}.Release|x64.Build.0 = Release|x64
{832C210D-EFE3-4C58-988E-5D9FF74A8568}.Debug|Win32.ActiveCfg = Debug|Win32 {832C210D-EFE3-4C58-988E-5D9FF74A8568}.Debug|Win32.ActiveCfg = Debug|Win32
{832C210D-EFE3-4C58-988E-5D9FF74A8568}.Debug|Win32.Build.0 = Debug|Win32 {832C210D-EFE3-4C58-988E-5D9FF74A8568}.Debug|Win32.Build.0 = Debug|Win32
{832C210D-EFE3-4C58-988E-5D9FF74A8568}.Debug|x64.ActiveCfg = Debug|x64
{832C210D-EFE3-4C58-988E-5D9FF74A8568}.Debug|x64.Build.0 = Debug|x64
{832C210D-EFE3-4C58-988E-5D9FF74A8568}.Release|Win32.ActiveCfg = Release|Win32 {832C210D-EFE3-4C58-988E-5D9FF74A8568}.Release|Win32.ActiveCfg = Release|Win32
{832C210D-EFE3-4C58-988E-5D9FF74A8568}.Release|Win32.Build.0 = Release|Win32 {832C210D-EFE3-4C58-988E-5D9FF74A8568}.Release|Win32.Build.0 = Release|Win32
{832C210D-EFE3-4C58-988E-5D9FF74A8568}.Release|x64.ActiveCfg = Release|x64
{832C210D-EFE3-4C58-988E-5D9FF74A8568}.Release|x64.Build.0 = Release|x64
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE