Applied patch by maruel:

- Fixed taking the address of begin() on an empty std::vector.
- Fixed nsis makefile to use %ProgramFiles% environment variable.
- Fixed nsis makefile to pass the output directory and file to makensis.
- Fixed synergy.nsi to get the files from the output directory. That
  enables a debug build of the installer.
- Fixes to compile under VS2005.

I did not apply VS2005 project files, instead adding nmake files.
nmake is pretty weak but the makefiles can be modified without having
visual studio.  Also modified the .rc files to not use winres.h.
This plus nmake means synergy can now be built using the freely
downloadable Microsoft Windows SDK for Vista, available from
microsoft's web site.  This change removes all of the old VC++6
project files in favor of the nmake files.  It also removes the
XCode project in favor of ./configure and make.

All of the nmake files are named nmake.mak.  Only the top level
makefile is directly useful (the rest are included by it) so all
builds are from the top level directory.  nmake knows the following
targets:

  all:  build synergy.exe, synergyc.exe and synergys.exe
  clean:  remove all intermediate files, keep programs
  clobber:  clean and remove programs
  installer:  build programs and an installer
  debug:  build a debug version of 'all'
  release:  build a release version of 'all'
  debug-installer:  build an installer of the debug build
  release-installer:  build an installer of the release build

The default build version is release so 'all' and 'installer' will
build a release version.  The installer itself never has debug
symbols, just the stuff it installs.  The default target is 'all'.
To build use:

  nmake /nologo /f nmake.mak <target>

VC++ and VisualStudio users may need to manually run vcvars.bat in a
command.exe or cmd.exe window before invoking nmake.  The Window 98/Me
command.exe may not handle potentially long command lines;  I haven't
tried to verify if that works.
This commit is contained in:
crs23 2007-09-06 05:01:44 +00:00
parent 0ed17ccca2
commit 5c29ae9967
66 changed files with 1623 additions and 6064 deletions

View File

@ -1,4 +1,4 @@
Synergy is copyright (C) 2002 Chris Schoeneman. Synergy is copyright (C) 2002-2007 Chris Schoeneman.
Synergy is distributed under the following license. Synergy is distributed under the following license.
GNU GENERAL PUBLIC LICENSE GNU GENERAL PUBLIC LICENSE

View File

@ -1,3 +1,54 @@
2007/07/01 crs
*.vcproj
*.vsprops
synergy.sln
dist/nullsoft/installer.mak
dist/nullsoft/synergy.nsi
lib/net/CSocketMultiplexer.cpp
lib/net/CTCPSocket.cpp
lib/platform/CSynergyHook.cpp
Applied patch by maruel:
- Fixed taking the address of begin() on an empty std::vector.
- Fixed nsis makefile to use %ProgramFiles% environment variable.
- Fixed nsis makefile to pass the output directory and file to makensis.
- Fixed synergy.nsi to get the files from the output directory. That
enables a debug build of the installer.
- Fixes to compile under VS2005.
I did not apply VS2005 project files, instead adding nmake files. nmake is
pretty weak but the makefiles can be modified without having visual studio.
Also modified the .rc files to not use winres.h. This plus nmake means
synergy can now be built using the freely downloadable Microsoft Windows
SDK for Vista, available from microsoft's web site. This change removes
all of the old VC++6 project files in favor of the nmake files. It also
removes the XCode project in favor of ./configure and make.
All of the nmake files are named nmake.mak. Only the top level makefile
is directly useful (the rest are included by it) so all builds are from
the top level directory. nmake knows the following targets:
all: build synergy.exe, synergyc.exe and synergys.exe
clean: remove all intermediate files, keep programs
clobber: clean and remove programs
installer: build programs and an installer
debug: build a debug version of 'all'
release: build a release version of 'all'
debug-installer: build an installer of the debug build
release-installer: build an installer of the release build
The default build version is release so 'all' and 'installer' will build
a release version. The installer itself never has debug symbols, just
the stuff it installs. The default target is 'all'. To build use:
nmake /nologo /f nmake.mak <target>
VC++ and VisualStudio users may need to manually run vcvars.bat in a
command.exe or cmd.exe window before invoking nmake. The Window 98/Me
command.exe may not handle potentially long command lines; I haven't
tried to verify if that works.
----------
2007/08/22 21:42:09 crs 2007/08/22 21:42:09 crs
lib/platform/COSXKeyState.cpp lib/platform/COSXKeyState.cpp

View File

@ -21,10 +21,9 @@ SUBDIRS = \
$(NULL) $(NULL)
EXTRA_DIST = \ EXTRA_DIST = \
all.dsp \ nmake.mak \
synergy.dsw \
synergy.xcode/project.pbxproj \
examples/synergy.conf \ examples/synergy.conf \
win32util/autodep.cpp \
$(NULL) $(NULL)
MAINTAINERCLEANFILES = \ MAINTAINERCLEANFILES = \

63
all.dsp
View File

@ -1,63 +0,0 @@
# Microsoft Developer Studio Project File - Name="all" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Generic Project" 0x010a
CFG=all - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE NMAKE /f "all.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "all.mak" CFG="all - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "all - Win32 Release" (based on "Win32 (x86) Generic Project")
!MESSAGE "all - Win32 Debug" (based on "Win32 (x86) Generic Project")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
MTL=midl.exe
!IF "$(CFG)" == "all - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "Release"
# PROP BASE Intermediate_Dir "Release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\build"
# PROP Intermediate_Dir "..\..\gen\build"
# PROP Target_Dir ""
!ELSEIF "$(CFG)" == "all - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "Debug"
# PROP BASE Intermediate_Dir "Debug"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\debug"
# PROP Intermediate_Dir "..\..\gen\debug"
# PROP Target_Dir ""
!ENDIF
# Begin Target
# Name "all - Win32 Release"
# Name "all - Win32 Debug"
# End Target
# End Project

View File

@ -1,63 +0,0 @@
# Microsoft Developer Studio Project File - Name="exec" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Generic Project" 0x010a
CFG=exec - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE NMAKE /f "exec.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "exec.mak" CFG="exec - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "exec - Win32 Release" (based on "Win32 (x86) Generic Project")
!MESSAGE "exec - Win32 Debug" (based on "Win32 (x86) Generic Project")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
MTL=midl.exe
!IF "$(CFG)" == "exec - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "Release"
# PROP BASE Intermediate_Dir "Release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\build"
# PROP Intermediate_Dir "..\..\gen\build"
# PROP Target_Dir ""
!ELSEIF "$(CFG)" == "exec - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "Debug"
# PROP BASE Intermediate_Dir "Debug"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\debug"
# PROP Intermediate_Dir "..\..\gen\debug"
# PROP Target_Dir ""
!ENDIF
# Begin Target
# Name "exec - Win32 Release"
# Name "exec - Win32 Debug"
# End Target
# End Project

View File

@ -36,7 +36,7 @@ MSWINDOWS_SOURCE_FILES = \
$(NULL) $(NULL)
EXTRA_DIST = \ EXTRA_DIST = \
launcher.dsp \ nmake.mak \
synergy.ico \ synergy.ico \
$(MSWINDOWS_SOURCE_FILES) \ $(MSWINDOWS_SOURCE_FILES) \
$(NULL) $(NULL)

View File

@ -1,186 +0,0 @@
# Microsoft Developer Studio Project File - Name="launcher" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Application" 0x0101
CFG=launcher - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE NMAKE /f "launcher.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "launcher.mak" CFG="launcher - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "launcher - Win32 Release" (based on "Win32 (x86) Application")
!MESSAGE "launcher - Win32 Debug" (based on "Win32 (x86) Application")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
MTL=midl.exe
RSC=rc.exe
!IF "$(CFG)" == "launcher - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "Release"
# PROP BASE Intermediate_Dir "Release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\build"
# PROP Intermediate_Dir "..\..\gen\build"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c
# ADD CPP /nologo /MT /W4 /GR /GX /O2 /I "..\..\lib\common" /I "..\..\lib\arch" /I "..\..\lib\base" /I "..\..\lib\mt" /I "..\..\lib\io" /I "..\..\lib\net" /I "..\..\lib\synergy" /I "..\..\lib\platform" /I "..\..\lib\server" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /Fd"..\..\gen\build\launcher.pdb" /FD /c
# SUBTRACT CPP /YX
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 /out:"..\..\build\synergy.exe"
# SUBTRACT LINK32 /map
!ELSEIF "$(CFG)" == "launcher - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "Debug"
# PROP BASE Intermediate_Dir "Debug"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\debug"
# PROP Intermediate_Dir "..\..\gen\debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c
# ADD CPP /nologo /MTd /W4 /Gm /GR /GX /ZI /Od /I "..\..\lib\common" /I "..\..\lib\arch" /I "..\..\lib\base" /I "..\..\lib\mt" /I "..\..\lib\io" /I "..\..\lib\net" /I "..\..\lib\synergy" /I "..\..\lib\platform" /I "..\..\lib\server" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /Fd"..\..\gen\debug\launcher.pdb" /FD /GZ /c
# SUBTRACT CPP /YX
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /out:"..\..\debug\synergy.exe" /pdbtype:sept
!ENDIF
# Begin Target
# Name "launcher - Win32 Release"
# Name "launcher - Win32 Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File
SOURCE=.\CAddScreen.cpp
# End Source File
# Begin Source File
SOURCE=.\CAdvancedOptions.cpp
# End Source File
# Begin Source File
SOURCE=.\CAutoStart.cpp
# End Source File
# Begin Source File
SOURCE=.\CGlobalOptions.cpp
# End Source File
# Begin Source File
SOURCE=.\CHotkeyOptions.cpp
# End Source File
# Begin Source File
SOURCE=.\CInfo.cpp
# End Source File
# Begin Source File
SOURCE=.\CScreensLinks.cpp
# End Source File
# Begin Source File
SOURCE=.\launcher.cpp
# End Source File
# Begin Source File
SOURCE=.\launcher.rc
# End Source File
# Begin Source File
SOURCE=.\LaunchUtil.cpp
# End Source File
# End Group
# Begin Group "Header Files"
# PROP Default_Filter "h;hpp;hxx;hm;inl"
# Begin Source File
SOURCE=.\CAddScreen.h
# End Source File
# Begin Source File
SOURCE=.\CAdvancedOptions.h
# End Source File
# Begin Source File
SOURCE=.\CAutoStart.h
# End Source File
# Begin Source File
SOURCE=.\CGlobalOptions.h
# End Source File
# Begin Source File
SOURCE=.\CHotkeyOptions.h
# End Source File
# Begin Source File
SOURCE=.\CInfo.h
# End Source File
# Begin Source File
SOURCE=.\CScreensLinks.h
# End Source File
# Begin Source File
SOURCE=.\LaunchUtil.h
# End Source File
# Begin Source File
SOURCE=.\resource.h
# End Source File
# End Group
# Begin Group "Resource Files"
# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
# Begin Source File
SOURCE=.\synergy.ico
# End Source File
# End Group
# End Target
# End Project

View File

@ -7,7 +7,10 @@
// //
// Generated from the TEXTINCLUDE 2 resource. // Generated from the TEXTINCLUDE 2 resource.
// //
#include "afxres.h" #include <winresrc.h>
#if !defined(IDC_STATIC)
#define IDC_STATIC (-1)
#endif
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS #undef APSTUDIO_READONLY_SYMBOLS

101
cmd/launcher/nmake.mak Normal file
View File

@ -0,0 +1,101 @@
# synergy -- mouse and keyboard sharing utility
# Copyright (C) 2007 Chris Schoeneman
#
# This package is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# found in the file COPYING that should have accompanied this file.
#
# This package is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
BIN_LAUNCHER_SRC = cmd\launcher
BIN_LAUNCHER_DST = $(BUILD_DST)\$(BIN_LAUNCHER_SRC)
BIN_LAUNCHER_EXE = "$(BUILD_DST)\synergy.exe"
BIN_LAUNCHER_CPP = \
"CAddScreen.cpp" \
"CAdvancedOptions.cpp" \
"CAutoStart.cpp" \
"CGlobalOptions.cpp" \
"CHotkeyOptions.cpp" \
"CInfo.cpp" \
"CScreensLinks.cpp" \
"LaunchUtil.cpp" \
"launcher.cpp" \
$(NULL)
BIN_LAUNCHER_OBJ = \
"$(BIN_LAUNCHER_DST)\CAddScreen.obj" \
"$(BIN_LAUNCHER_DST)\CAdvancedOptions.obj" \
"$(BIN_LAUNCHER_DST)\CAutoStart.obj" \
"$(BIN_LAUNCHER_DST)\CGlobalOptions.obj" \
"$(BIN_LAUNCHER_DST)\CHotkeyOptions.obj" \
"$(BIN_LAUNCHER_DST)\CInfo.obj" \
"$(BIN_LAUNCHER_DST)\CScreensLinks.obj" \
"$(BIN_LAUNCHER_DST)\LaunchUtil.obj" \
"$(BIN_LAUNCHER_DST)\launcher.obj" \
$(NULL)
BIN_LAUNCHER_RC = "$(BIN_LAUNCHER_SRC)\launcher.rc"
BIN_LAUNCHER_RES = "$(BIN_LAUNCHER_DST)\launcher.res"
BIN_LAUNCHER_INC = \
/I"lib\common" \
/I"lib\arch" \
/I"lib\base" \
/I"lib\mt" \
/I"lib\io" \
/I"lib\net" \
/I"lib\synergy" \
/I"lib\platform" \
/I"lib\server" \
$(NULL)
BIN_LAUNCHER_LIB = \
$(LIB_SERVER_LIB) \
$(LIB_PLATFORM_LIB) \
$(LIB_SYNERGY_LIB) \
$(LIB_NET_LIB) \
$(LIB_IO_LIB) \
$(LIB_MT_LIB) \
$(LIB_BASE_LIB) \
$(LIB_ARCH_LIB) \
$(LIB_COMMON_LIB) \
$(NULL)
CPP_FILES = $(CPP_FILES) $(BIN_LAUNCHER_CPP)
OBJ_FILES = $(OBJ_FILES) $(BIN_LAUNCHER_OBJ)
PROGRAMS = $(PROGRAMS) $(BIN_LAUNCHER_EXE)
# Need shell functions.
guilibs = $(guilibs) shell32.lib
# Dependency rules
$(BIN_LAUNCHER_OBJ): $(AUTODEP)
!if EXIST($(BIN_LAUNCHER_DST)\deps.mak)
!include $(BIN_LAUNCHER_DST)\deps.mak
!endif
# Build rules. Use batch-mode rules if possible.
!if DEFINED(_NMAKE_VER)
{$(BIN_LAUNCHER_SRC)\}.cpp{$(BIN_LAUNCHER_DST)\}.obj::
!else
{$(BIN_LAUNCHER_SRC)\}.cpp{$(BIN_LAUNCHER_DST)\}.obj:
!endif
@$(ECHO) Compile in $(BIN_LAUNCHER_SRC)
-@$(MKDIR) $(BIN_LAUNCHER_DST) 2>NUL:
$(cpp) $(cppdebug) $(cppflags) $(cppvarsmt) /showIncludes \
$(BIN_LAUNCHER_INC) \
/Fo$(BIN_LAUNCHER_DST)\ \
/Fd$(BIN_LAUNCHER_DST)\src.pdb \
$< | $(AUTODEP) $(BIN_LAUNCHER_SRC) $(BIN_LAUNCHER_DST)
$(BIN_LAUNCHER_RES): $(BIN_LAUNCHER_RC)
@$(ECHO) Compile $(**F)
-@$(MKDIR) $(BIN_LAUNCHER_DST) 2>NUL:
$(rc) $(rcflags) $(rcvars) \
/fo$@ \
$**
$(BIN_LAUNCHER_EXE): $(BIN_LAUNCHER_OBJ) $(BIN_LAUNCHER_RES) $(BIN_LAUNCHER_LIB)
@$(ECHO) Link $(@F)
$(link) $(ldebug) $(guilflags) $(guilibsmt) \
/out:$@ \
$**
$(AUTODEP) $(BIN_LAUNCHER_SRC) $(BIN_LAUNCHER_DST) \
$(BIN_LAUNCHER_OBJ:.obj=.d)

View File

@ -34,7 +34,7 @@ CARBON_SOURCE_FILES = \
$(NULL) $(NULL)
EXTRA_DIST = \ EXTRA_DIST = \
synergyc.dsp \ nmake.mak \
synergyc.ico \ synergyc.ico \
tb_error.ico \ tb_error.ico \
tb_idle.ico \ tb_idle.ico \

89
cmd/synergyc/nmake.mak Normal file
View File

@ -0,0 +1,89 @@
# synergy -- mouse and keyboard sharing utility
# Copyright (C) 2007 Chris Schoeneman
#
# This package is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# found in the file COPYING that should have accompanied this file.
#
# This package is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
BIN_SYNERGYC_SRC = cmd\synergyc
BIN_SYNERGYC_DST = $(BUILD_DST)\$(BIN_SYNERGYC_SRC)
BIN_SYNERGYC_EXE = "$(BUILD_DST)\synergyc.exe"
BIN_SYNERGYC_CPP = \
"CClientTaskBarReceiver.cpp" \
"CMSWindowsClientTaskBarReceiver.cpp" \
"synergyc.cpp" \
$(NULL)
BIN_SYNERGYC_OBJ = \
"$(BIN_SYNERGYC_DST)\CClientTaskBarReceiver.obj" \
"$(BIN_SYNERGYC_DST)\CMSWindowsClientTaskBarReceiver.obj" \
"$(BIN_SYNERGYC_DST)\synergyc.obj" \
$(NULL)
BIN_SYNERGYC_RC = "$(BIN_SYNERGYC_SRC)\synergyc.rc"
BIN_SYNERGYC_RES = "$(BIN_SYNERGYC_DST)\synergyc.res"
BIN_SYNERGYC_INC = \
/I"lib\common" \
/I"lib\arch" \
/I"lib\base" \
/I"lib\mt" \
/I"lib\io" \
/I"lib\net" \
/I"lib\synergy" \
/I"lib\platform" \
/I"lib\client" \
$(NULL)
BIN_SYNERGYC_LIB = \
$(LIB_CLIENT_LIB) \
$(LIB_PLATFORM_LIB) \
$(LIB_SYNERGY_LIB) \
$(LIB_NET_LIB) \
$(LIB_IO_LIB) \
$(LIB_MT_LIB) \
$(LIB_BASE_LIB) \
$(LIB_ARCH_LIB) \
$(LIB_COMMON_LIB) \
$(NULL)
CPP_FILES = $(CPP_FILES) $(BIN_SYNERGYC_CPP)
OBJ_FILES = $(OBJ_FILES) $(BIN_SYNERGYC_OBJ)
PROGRAMS = $(PROGRAMS) $(BIN_SYNERGYC_EXE)
# Need shell functions.
guilibs = $(guilibs) shell32.lib
# Dependency rules
$(BIN_SYNERGYC_OBJ): $(AUTODEP)
!if EXIST($(BIN_SYNERGYC_DST)\deps.mak)
!include $(BIN_SYNERGYC_DST)\deps.mak
!endif
# Build rules. Use batch-mode rules if possible.
!if DEFINED(_NMAKE_VER)
{$(BIN_SYNERGYC_SRC)\}.cpp{$(BIN_SYNERGYC_DST)\}.obj::
!else
{$(BIN_SYNERGYC_SRC)\}.cpp{$(BIN_SYNERGYC_DST)\}.obj:
!endif
@$(ECHO) Compile in $(BIN_SYNERGYC_SRC)
-@$(MKDIR) $(BIN_SYNERGYC_DST) 2>NUL:
$(cpp) $(cppdebug) $(cppflags) $(cppvarsmt) /showIncludes \
$(BIN_SYNERGYC_INC) \
/Fo$(BIN_SYNERGYC_DST)\ \
/Fd$(BIN_SYNERGYC_DST)\src.pdb \
$< | $(AUTODEP) $(BIN_SYNERGYC_SRC) $(BIN_SYNERGYC_DST)
$(BIN_SYNERGYC_RES): $(BIN_SYNERGYC_RC)
@$(ECHO) Compile $(**F)
-@$(MKDIR) $(BIN_SYNERGYC_DST) 2>NUL:
$(rc) $(rcflags) $(rcvars) \
/fo$@ \
$**
$(BIN_SYNERGYC_EXE): $(BIN_SYNERGYC_OBJ) $(BIN_SYNERGYC_RES) $(BIN_SYNERGYC_LIB)
@$(ECHO) Link $(@F)
$(link) $(ldebug) $(guilflags) $(guilibsmt) \
/out:$@ \
$**
$(AUTODEP) $(BIN_SYNERGYC_SRC) $(BIN_SYNERGYC_DST) \
$(BIN_SYNERGYC_OBJ:.obj=.d)

View File

@ -862,16 +862,16 @@ WinMain(HINSTANCE instance, HINSTANCE, LPSTR, int)
} }
catch (XBase& e) { catch (XBase& e) {
showError(instance, __argv[0], IDS_UNCAUGHT_EXCEPTION, e.what()); showError(instance, __argv[0], IDS_UNCAUGHT_EXCEPTION, e.what());
throw; //throw;
} }
catch (XArch& e) { catch (XArch& e) {
showError(instance, __argv[0], IDS_INIT_FAILED, e.what().c_str()); showError(instance, __argv[0], IDS_INIT_FAILED, e.what().c_str());
return kExitFailed;
} }
catch (...) { catch (...) {
showError(instance, __argv[0], IDS_UNCAUGHT_EXCEPTION, "<unknown>"); showError(instance, __argv[0], IDS_UNCAUGHT_EXCEPTION, "<unknown>");
throw; //throw;
} }
return kExitFailed;
} }
#elif SYSAPI_UNIX #elif SYSAPI_UNIX

View File

@ -1,153 +0,0 @@
# Microsoft Developer Studio Project File - Name="synergyc" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Application" 0x0101
CFG=synergyc - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE NMAKE /f "synergyc.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "synergyc.mak" CFG="synergyc - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "synergyc - Win32 Release" (based on "Win32 (x86) Application")
!MESSAGE "synergyc - Win32 Debug" (based on "Win32 (x86) Application")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
MTL=midl.exe
RSC=rc.exe
!IF "$(CFG)" == "synergyc - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "Release"
# PROP BASE Intermediate_Dir "Release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\build"
# PROP Intermediate_Dir "..\..\gen\build"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c
# ADD CPP /nologo /MT /W4 /GR /GX /O2 /I "..\..\lib\common" /I "..\..\lib\arch" /I "..\..\lib\base" /I "..\..\lib\io" /I "..\..\lib\mt" /I "..\..\lib\net" /I "..\..\lib\synergy" /I "..\..\lib\platform" /I "..\..\lib\client" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /Fd"..\..\gen\build\synergyc.pdb" /FD /c
# SUBTRACT CPP /YX
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
!ELSEIF "$(CFG)" == "synergyc - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "Debug"
# PROP BASE Intermediate_Dir "Debug"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\debug"
# PROP Intermediate_Dir "..\..\gen\debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c
# ADD CPP /nologo /MTd /W4 /Gm /GR /GX /ZI /Od /I "..\..\lib\common" /I "..\..\lib\arch" /I "..\..\lib\base" /I "..\..\lib\io" /I "..\..\lib\mt" /I "..\..\lib\net" /I "..\..\lib\synergy" /I "..\..\lib\platform" /I "..\..\lib\client" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /Fd"..\..\gen\debug\synergyc.pdb" /FD /GZ /c
# SUBTRACT CPP /YX
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
!ENDIF
# Begin Target
# Name "synergyc - Win32 Release"
# Name "synergyc - Win32 Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File
SOURCE=.\CClientTaskBarReceiver.cpp
# End Source File
# Begin Source File
SOURCE=.\CMSWindowsClientTaskBarReceiver.cpp
# End Source File
# Begin Source File
SOURCE=.\synergyc.cpp
# End Source File
# Begin Source File
SOURCE=.\synergyc.rc
# End Source File
# End Group
# Begin Group "Header Files"
# PROP Default_Filter "h;hpp;hxx;hm;inl"
# Begin Source File
SOURCE=.\CClientTaskBarReceiver.h
# End Source File
# Begin Source File
SOURCE=.\CMSWindowsClientTaskBarReceiver.h
# End Source File
# Begin Source File
SOURCE=.\resource.h
# End Source File
# End Group
# Begin Group "Resource Files"
# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
# Begin Source File
SOURCE=.\synergyc.ico
# End Source File
# Begin Source File
SOURCE=.\tb_error.ico
# End Source File
# Begin Source File
SOURCE=.\tb_idle.ico
# End Source File
# Begin Source File
SOURCE=.\tb_run.ico
# End Source File
# Begin Source File
SOURCE=.\tb_wait.ico
# End Source File
# End Group
# End Target
# End Project

View File

@ -7,7 +7,7 @@
// //
// Generated from the TEXTINCLUDE 2 resource. // Generated from the TEXTINCLUDE 2 resource.
// //
#include "winres.h" #include <winresrc.h>
#if !defined(IDC_STATIC) #if !defined(IDC_STATIC)
#define IDC_STATIC (-1) #define IDC_STATIC (-1)
#endif #endif

View File

@ -34,7 +34,7 @@ CARBON_SOURCE_FILES = \
$(NULL) $(NULL)
EXTRA_DIST = \ EXTRA_DIST = \
synergys.dsp \ nmake.mak \
synergys.ico \ synergys.ico \
tb_error.ico \ tb_error.ico \
tb_idle.ico \ tb_idle.ico \

89
cmd/synergys/nmake.mak Normal file
View File

@ -0,0 +1,89 @@
# synergy -- mouse and keyboard sharing utility
# Copyright (C) 2007 Chris Schoeneman
#
# This package is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# found in the file COPYING that should have accompanied this file.
#
# This package is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
BIN_SYNERGYS_SRC = cmd\synergys
BIN_SYNERGYS_DST = $(BUILD_DST)\$(BIN_SYNERGYS_SRC)
BIN_SYNERGYS_EXE = "$(BUILD_DST)\synergys.exe"
BIN_SYNERGYS_CPP = \
"CServerTaskBarReceiver.cpp" \
"CMSWindowsServerTaskBarReceiver.cpp" \
"synergys.cpp" \
$(NULL)
BIN_SYNERGYS_OBJ = \
"$(BIN_SYNERGYS_DST)\CServerTaskBarReceiver.obj" \
"$(BIN_SYNERGYS_DST)\CMSWindowsServerTaskBarReceiver.obj" \
"$(BIN_SYNERGYS_DST)\synergys.obj" \
$(NULL)
BIN_SYNERGYS_RC = "$(BIN_SYNERGYS_SRC)\synergys.rc"
BIN_SYNERGYS_RES = "$(BIN_SYNERGYS_DST)\synergys.res"
BIN_SYNERGYS_INC = \
/I"lib\common" \
/I"lib\arch" \
/I"lib\base" \
/I"lib\mt" \
/I"lib\io" \
/I"lib\net" \
/I"lib\synergy" \
/I"lib\platform" \
/I"lib\server" \
$(NULL)
BIN_SYNERGYS_LIB = \
$(LIB_SERVER_LIB) \
$(LIB_PLATFORM_LIB) \
$(LIB_SYNERGY_LIB) \
$(LIB_NET_LIB) \
$(LIB_IO_LIB) \
$(LIB_MT_LIB) \
$(LIB_BASE_LIB) \
$(LIB_ARCH_LIB) \
$(LIB_COMMON_LIB) \
$(NULL)
CPP_FILES = $(CPP_FILES) $(BIN_SYNERGYS_CPP)
OBJ_FILES = $(OBJ_FILES) $(BIN_SYNERGYS_OBJ)
PROGRAMS = $(PROGRAMS) $(BIN_SYNERGYS_EXE)
# Need shell functions.
guilibs = $(guilibs) shell32.lib
# Dependency rules
$(BIN_SYNERGYS_OBJ): $(AUTODEP)
!if EXIST($(BIN_SYNERGYS_DST)\deps.mak)
!include $(BIN_SYNERGYS_DST)\deps.mak
!endif
# Build rules. Use batch-mode rules if possible.
!if DEFINED(_NMAKE_VER)
{$(BIN_SYNERGYS_SRC)\}.cpp{$(BIN_SYNERGYS_DST)\}.obj::
!else
{$(BIN_SYNERGYS_SRC)\}.cpp{$(BIN_SYNERGYS_DST)\}.obj:
!endif
@$(ECHO) Compile in $(BIN_SYNERGYS_SRC)
-@$(MKDIR) $(BIN_SYNERGYS_DST) 2>NUL:
$(cpp) $(cppdebug) $(cppflags) $(cppvarsmt) /showIncludes \
$(BIN_SYNERGYS_INC) \
/Fo$(BIN_SYNERGYS_DST)\ \
/Fd$(BIN_SYNERGYS_DST)\src.pdb \
$< | $(AUTODEP) $(BIN_SYNERGYS_SRC) $(BIN_SYNERGYS_DST)
$(BIN_SYNERGYS_RES): $(BIN_SYNERGYS_RC)
@$(ECHO) Compile $(**F)
-@$(MKDIR) $(BIN_SYNERGYS_DST) 2>NUL:
$(rc) $(rcflags) $(rcvars) \
/fo$@ \
$**
$(BIN_SYNERGYS_EXE): $(BIN_SYNERGYS_OBJ) $(BIN_SYNERGYS_RES) $(BIN_SYNERGYS_LIB)
@$(ECHO) Link $(@F)
$(link) $(ldebug) $(guilflags) $(guilibsmt) \
/out:$@ \
$**
$(AUTODEP) $(BIN_SYNERGYS_SRC) $(BIN_SYNERGYS_DST) \
$(BIN_SYNERGYS_OBJ:.obj=.d)

View File

@ -1264,16 +1264,16 @@ WinMain(HINSTANCE instance, HINSTANCE, LPSTR, int)
} }
catch (XBase& e) { catch (XBase& e) {
showError(instance, __argv[0], IDS_UNCAUGHT_EXCEPTION, e.what()); showError(instance, __argv[0], IDS_UNCAUGHT_EXCEPTION, e.what());
throw; //throw;
} }
catch (XArch& e) { catch (XArch& e) {
showError(instance, __argv[0], IDS_INIT_FAILED, e.what().c_str()); showError(instance, __argv[0], IDS_INIT_FAILED, e.what().c_str());
return kExitFailed;
} }
catch (...) { catch (...) {
showError(instance, __argv[0], IDS_UNCAUGHT_EXCEPTION, "<unknown>"); showError(instance, __argv[0], IDS_UNCAUGHT_EXCEPTION, "<unknown>");
throw; //throw;
} }
return kExitFailed;
} }
#elif SYSAPI_UNIX #elif SYSAPI_UNIX

View File

@ -1,153 +0,0 @@
# Microsoft Developer Studio Project File - Name="synergys" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Application" 0x0101
CFG=synergys - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE NMAKE /f "synergys.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "synergys.mak" CFG="synergys - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "synergys - Win32 Release" (based on "Win32 (x86) Application")
!MESSAGE "synergys - Win32 Debug" (based on "Win32 (x86) Application")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
MTL=midl.exe
RSC=rc.exe
!IF "$(CFG)" == "synergys - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "Release"
# PROP BASE Intermediate_Dir "Release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\build"
# PROP Intermediate_Dir "..\..\gen\build"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c
# ADD CPP /nologo /MT /W4 /GR /GX /O2 /I "..\..\lib\common" /I "..\..\lib\arch" /I "..\..\lib\base" /I "..\..\lib\mt" /I "..\..\lib\io" /I "..\..\lib\net" /I "..\..\lib\synergy" /I "..\..\lib\platform" /I "..\..\lib\server" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /Fd"..\..\gen\build\synergys.pdb" /FD /c
# SUBTRACT CPP /YX
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
!ELSEIF "$(CFG)" == "synergys - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "Debug"
# PROP BASE Intermediate_Dir "Debug"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\debug"
# PROP Intermediate_Dir "..\..\gen\debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c
# ADD CPP /nologo /MTd /W4 /Gm /GR /GX /ZI /Od /I "..\..\lib\common" /I "..\..\lib\arch" /I "..\..\lib\base" /I "..\..\lib\mt" /I "..\..\lib\io" /I "..\..\lib\net" /I "..\..\lib\synergy" /I "..\..\lib\platform" /I "..\..\lib\server" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /Fd"..\..\gen\debug\synergys.pdb" /FD /GZ /c
# SUBTRACT CPP /YX
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
!ENDIF
# Begin Target
# Name "synergys - Win32 Release"
# Name "synergys - Win32 Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File
SOURCE=.\CMSWindowsServerTaskBarReceiver.cpp
# End Source File
# Begin Source File
SOURCE=.\CServerTaskBarReceiver.cpp
# End Source File
# Begin Source File
SOURCE=.\synergys.cpp
# End Source File
# Begin Source File
SOURCE=.\synergys.rc
# End Source File
# End Group
# Begin Group "Header Files"
# PROP Default_Filter "h;hpp;hxx;hm;inl"
# Begin Source File
SOURCE=.\CMSWindowsServerTaskBarReceiver.h
# End Source File
# Begin Source File
SOURCE=.\CServerTaskBarReceiver.h
# End Source File
# Begin Source File
SOURCE=.\resource.h
# End Source File
# End Group
# Begin Group "Resource Files"
# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
# Begin Source File
SOURCE=.\synergys.ico
# End Source File
# Begin Source File
SOURCE=.\tb_error.ico
# End Source File
# Begin Source File
SOURCE=.\tb_idle.ico
# End Source File
# Begin Source File
SOURCE=.\tb_run.ico
# End Source File
# Begin Source File
SOURCE=.\tb_wait.ico
# End Source File
# End Group
# End Target
# End Project

View File

@ -7,7 +7,7 @@
// //
// Generated from the TEXTINCLUDE 2 resource. // Generated from the TEXTINCLUDE 2 resource.
// //
#include "winres.h" #include <winresrc.h>
#if !defined(IDC_STATIC) #if !defined(IDC_STATIC)
#define IDC_STATIC (-1) #define IDC_STATIC (-1)
#endif #endif

View File

@ -14,8 +14,7 @@
NULL = NULL =
EXTRA_DIST = \ EXTRA_DIST = \
installer.dsp \ nmake.mak \
installer.mak \
synergy.nsi \ synergy.nsi \
dosify.c \ dosify.c \
$(NULL) $(NULL)

View File

@ -1,114 +0,0 @@
# Microsoft Developer Studio Project File - Name="installer" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) External Target" 0x0106
CFG=installer - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE NMAKE /f "installer.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "installer.mak" CFG="installer - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "installer - Win32 Release" (based on "Win32 (x86) External Target")
!MESSAGE "installer - Win32 Debug" (based on "Win32 (x86) External Target")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
!IF "$(CFG)" == "installer - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "installer___Win32_Release"
# PROP BASE Intermediate_Dir "installer___Win32_Release"
# PROP BASE Cmd_Line "NMAKE /f installer.mak"
# PROP BASE Rebuild_Opt "/a"
# PROP BASE Target_File "installer.exe"
# PROP BASE Bsc_Name "installer.bsc"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "."
# PROP Intermediate_Dir "."
# PROP Cmd_Line "nmake /nologo /f "installer.mak""
# PROP Rebuild_Opt "/a"
# PROP Target_File "..\..\build\SynergyInstaller.exe"
# PROP Bsc_Name ""
# PROP Target_Dir ""
NSIS=makensis
!ELSEIF "$(CFG)" == "installer - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "installer___Win32_Debug"
# PROP BASE Intermediate_Dir "installer___Win32_Debug"
# PROP BASE Cmd_Line "NMAKE /f installer.mak"
# PROP BASE Rebuild_Opt "/a"
# PROP BASE Target_File "installer.exe"
# PROP BASE Bsc_Name "installer.bsc"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
# PROP Intermediate_Dir "."
# PROP Cmd_Line "echo "Can only build installer for Release configuration""
# PROP Rebuild_Opt ""
# PROP Target_File "dummy.exe"
# PROP Bsc_Name ""
# PROP Target_Dir ""
NSIS=makensis
!ENDIF
# Begin Target
# Name "installer - Win32 Release"
# Name "installer - Win32 Debug"
!IF "$(CFG)" == "installer - Win32 Release"
!ELSEIF "$(CFG)" == "installer - Win32 Debug"
!ENDIF
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File
SOURCE=.\dosify.c
# PROP Intermediate_Dir "."
# End Source File
# Begin Source File
SOURCE=.\installer.mak
# PROP Intermediate_Dir "."
# End Source File
# Begin Source File
SOURCE=.\synergy.nsi
# PROP Intermediate_Dir "."
# End Source File
# End Group
# Begin Group "Header Files"
# PROP Default_Filter "h;hpp;hxx;hm;inl"
# End Group
# Begin Group "Resource Files"
# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
# End Group
# End Target
# End Project

View File

@ -1,20 +0,0 @@
NULL=
DEPTH=..\..
NSIS="D:\Program Files\NSIS\makensis"
DOCS = \
COPYING \
ChangeLog \
$(NULL)
default: dosifydocs installer
installer:
$(NSIS) synergy.nsi
dosifydocs: dosify.exe
.\dosify.exe $(DEPTH) . $(DOCS)
dosify.exe: dosify.c
$(CC) /nologo /Yd /Zi /MLd /Fe$@ $**

63
dist/nullsoft/nmake.mak vendored Normal file
View File

@ -0,0 +1,63 @@
# synergy -- mouse and keyboard sharing utility
# Copyright (C) 2007 Chris Schoeneman
#
# This package is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# found in the file COPYING that should have accompanied this file.
#
# This package is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
NSIS = "$(PROGRAMFILES)\NSIS\makensis.exe"
NSIS_FLAGS = /NOCD /V1
BIN_INSTALLER_SRC = dist\nullsoft
BIN_INSTALLER_DST = $(BUILD_DST)\$(BIN_INSTALLER_SRC)
BIN_DOSIFY_EXE = "$(BIN_INSTALLER_DST)\dosify.exe"
BIN_DOSIFY_C = \
"$(BIN_INSTALLER_SRC)\dosify.c" \
$(NULL)
BIN_DOSIFY_OBJ = \
"$(BIN_INSTALLER_DST)\dosify.obj" \
$(NULL)
BIN_INSTALLER_NSI = "$(BIN_INSTALLER_SRC)\synergy.nsi"
BIN_INSTALLER_EXE = "$(BUILD_DST)\SynergyInstaller.exe"
BIN_INSTALLER_DOCS = \
COPYING \
ChangeLog \
$(NULL)
BIN_INSTALLER_DOS_DOCS = \
$(BUILD_DST)\COPYING.txt \
$(BUILD_DST)\ChangeLog.txt \
$(NULL)
C_FILES = $(C_FILES) $(BIN_DOSIFY_C)
OBJ_FILES = $(OBJ_FILES) $(BIN_DOSIFY_OBJ)
OPTPROGRAMS = $(OPTPROGRAMS) $(BIN_DOSIFY_EXE)
# Build rules.
$(BIN_DOSIFY_OBJ): $(BIN_DOSIFY_C)
@$(ECHO) Compile $(BIN_DOSIFY_C)
-@$(MKDIR) $(BIN_INSTALLER_DST) 2>NUL:
$(cc) $(cdebug) $(cflags) $(cvars) /Fo$@ /Fd$(@:.obj=.pdb) $**
$(BIN_DOSIFY_EXE): $(BIN_DOSIFY_OBJ)
@$(ECHO) Link $(@F)
$(link) $(ldebug) $(conlflags) $(conlibsmt) /out:$@ $**
# Convert text files from Unix to DOS format.
$(BIN_INSTALLER_DOS_DOCS): $(BIN_DOSIFY_EXE) $(BIN_INSTALLER_DOCS)
@$(ECHO) Convert text files to DOS format
$(BIN_DOSIFY_EXE) "." "$(BUILD_DST)" $(BIN_INSTALLER_DOCS)
# Allow installers for both debug and release.
$(BIN_INSTALLER_EXE): $(BIN_INSTALLER_NSI) all $(BIN_INSTALLER_DOS_DOCS)
@$(ECHO) Build $(@F)
$(NSIS) $(NSIS_FLAGS) /DOUTPUTDIR=$(@D) /DOUTPUTFILE=$@ $(BIN_INSTALLER_NSI)
installer: $(BIN_INSTALLER_EXE)
debug-installer:
@$(MAKE) /nologo /f $(MAKEFILE) DEBUG=1 installer
release-installer:
@$(MAKE) /nologo /f $(MAKEFILE) NODEBUG=1 installer

View File

@ -7,14 +7,15 @@
;-------------------------------- ;--------------------------------
; Path to root of tree !ifndef OUTPUTDIR
!define DEPTH "..\.." !define OUTPUTDIR "build\Release"
!endif
; The name of the installer ; The name of the installer
Name "Synergy" Name "Synergy"
; The file to write ; The file to write
OutFile "${DEPTH}\build\SynergyInstaller.exe" OutFile "${OUTPUTFILE}"
; The default installation directory ; The default installation directory
InstallDir $PROGRAMFILES\Synergy InstallDir $PROGRAMFILES\Synergy
@ -42,7 +43,7 @@ ComponentText "This will install Synergy on your computer. Select the optional
DirText "Choose a directory to install Synergy to:" DirText "Choose a directory to install Synergy to:"
UninstallText "This will uninstall Synergy from your computer." UninstallText "This will uninstall Synergy from your computer."
LicenseText "Synergy is distributed under the GNU GPL:" LicenseText "Synergy is distributed under the GNU GPL:"
LicenseData "COPYING.txt" LicenseData ${OUTPUTDIR}\COPYING.txt
;-------------------------------- ;--------------------------------
@ -55,38 +56,38 @@ Section "Synergy (required)"
SetOutPath $INSTDIR SetOutPath $INSTDIR
; Put files there ; Put files there
File "${DEPTH}\build\synergy.exe" File "${OUTPUTDIR}\synergy.exe"
File "${DEPTH}\build\synergyc.exe" File "${OUTPUTDIR}\synergyc.exe"
File "${DEPTH}\build\synergys.exe" File "${OUTPUTDIR}\synergys.exe"
File "${DEPTH}\build\*.dll" File "${OUTPUTDIR}\*.dll"
File COPYING.txt File "${OUTPUTDIR}\COPYING.txt"
File ChangeLog.txt File "${OUTPUTDIR}\ChangeLog.txt"
File ${DEPTH}\doc\PORTING File doc\PORTING
File ${DEPTH}\doc\about.html File doc\about.html
File ${DEPTH}\doc\authors.html File doc\authors.html
File ${DEPTH}\doc\autostart.html File doc\autostart.html
File ${DEPTH}\doc\banner.html File doc\banner.html
File ${DEPTH}\doc\compiling.html File doc\compiling.html
File ${DEPTH}\doc\configuration.html File doc\configuration.html
File ${DEPTH}\doc\contact.html File doc\contact.html
File ${DEPTH}\doc\developer.html File doc\developer.html
File ${DEPTH}\doc\faq.html File doc\faq.html
File ${DEPTH}\doc\history.html File doc\history.html
File ${DEPTH}\doc\home.html File doc\home.html
File ${DEPTH}\doc\index.html File doc\index.html
File ${DEPTH}\doc\license.html File doc\license.html
File ${DEPTH}\doc\news.html File doc\news.html
File ${DEPTH}\doc\roadmap.html File doc\roadmap.html
File ${DEPTH}\doc\running.html File doc\running.html
File ${DEPTH}\doc\security.html File doc\security.html
File ${DEPTH}\doc\synergy.css File doc\synergy.css
File ${DEPTH}\doc\tips.html File doc\tips.html
File ${DEPTH}\doc\toc.html File doc\toc.html
File ${DEPTH}\doc\trouble.html File doc\trouble.html
SetOutPath $INSTDIR\images SetOutPath $INSTDIR\images
File ${DEPTH}\doc\images\logo.gif File doc\images\logo.gif
File ${DEPTH}\doc\images\warp.gif File doc\images\warp.gif
; Write the installation path into the registry ; Write the installation path into the registry
WriteRegStr HKLM SOFTWARE\Synergy "Install_Dir" "$INSTDIR" WriteRegStr HKLM SOFTWARE\Synergy "Install_Dir" "$INSTDIR"

View File

@ -54,6 +54,13 @@
<td>&nbsp;</td> <td>&nbsp;</td>
<td>Re-resolving server hostname on each connection</td> <td>Re-resolving server hostname on each connection</td>
</tr> </tr>
<tr>
<td>Marc-Antoine Ruel</td>
<td>&nbsp;</td>
<td><span class="fakelink">maruel@users.sourceforge<span class="hide">.no_spam</span>.net</span></td>
<td>&nbsp;</td>
<td>Visual Studio 2005 port</td>
</tr>
</table> </table>
</p><p> </p><p>
To avoid spam bots, the above email addresses have ".no_spam" To avoid spam bots, the above email addresses have ".no_spam"

View File

@ -60,7 +60,7 @@ CArchDaemonNone::canInstallDaemon(const char*, bool)
} }
bool bool
CArchDaemonNone::isDaemonInstalled(const char* name, bool allUsers) CArchDaemonNone::isDaemonInstalled(const char*, bool)
{ {
return false; return false;
} }

View File

@ -89,8 +89,8 @@ WIN32_SOURCE_FILES = \
$(NULL) $(NULL)
EXTRA_DIST = \ EXTRA_DIST = \
arch.dsp \
CMultibyte.cpp \ CMultibyte.cpp \
nmake.mak \
vsnprintf.cpp \ vsnprintf.cpp \
$(UNIX_SOURCE_FILES) \ $(UNIX_SOURCE_FILES) \
$(WIN32_SOURCE_FILES) \ $(WIN32_SOURCE_FILES) \

View File

@ -1,272 +0,0 @@
# Microsoft Developer Studio Project File - Name="arch" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Static Library" 0x0104
CFG=arch - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE NMAKE /f "arch.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "arch.mak" CFG="arch - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "arch - Win32 Release" (based on "Win32 (x86) Static Library")
!MESSAGE "arch - Win32 Debug" (based on "Win32 (x86) Static Library")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
RSC=rc.exe
!IF "$(CFG)" == "arch - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "Release"
# PROP BASE Intermediate_Dir "Release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\gen\build"
# PROP Intermediate_Dir "..\..\gen\build"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
# ADD CPP /nologo /MT /W4 /GR /GX /O2 /I "..\common" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /Fd"..\..\gen\build\arch.pdb" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
# ADD LIB32 /nologo
!ELSEIF "$(CFG)" == "arch - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "Debug"
# PROP BASE Intermediate_Dir "Debug"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\gen\debug"
# PROP Intermediate_Dir "..\..\gen\debug"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
# ADD CPP /nologo /MTd /W4 /Gm /GR /GX /ZI /Od /I "..\base" /I "..\mt" /I "..\common" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /Fd"..\..\gen\debug\arch.pdb" /FD /GZ /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
# ADD LIB32 /nologo
!ENDIF
# Begin Target
# Name "arch - Win32 Release"
# Name "arch - Win32 Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File
SOURCE=.\CArch.cpp
# End Source File
# Begin Source File
SOURCE=.\CArchConsoleWindows.cpp
# End Source File
# Begin Source File
SOURCE=.\CArchDaemonWindows.cpp
# End Source File
# Begin Source File
SOURCE=.\CArchFileWindows.cpp
# End Source File
# Begin Source File
SOURCE=.\CArchLogWindows.cpp
# End Source File
# Begin Source File
SOURCE=.\CArchMiscWindows.cpp
# End Source File
# Begin Source File
SOURCE=.\CArchMultithreadWindows.cpp
# End Source File
# Begin Source File
SOURCE=.\CArchNetworkWinsock.cpp
# End Source File
# Begin Source File
SOURCE=.\CArchSleepWindows.cpp
# End Source File
# Begin Source File
SOURCE=.\CArchStringWindows.cpp
# End Source File
# Begin Source File
SOURCE=.\CArchSystemWindows.cpp
# End Source File
# Begin Source File
SOURCE=.\CArchTaskBarWindows.cpp
# End Source File
# Begin Source File
SOURCE=.\CArchTimeWindows.cpp
# End Source File
# Begin Source File
SOURCE=.\CMultibyte.cpp
# PROP Exclude_From_Build 1
# End Source File
# Begin Source File
SOURCE=.\vsnprintf.cpp
# PROP Exclude_From_Build 1
# End Source File
# Begin Source File
SOURCE=.\XArch.cpp
# End Source File
# Begin Source File
SOURCE=.\XArchWindows.cpp
# End Source File
# End Group
# Begin Group "Header Files"
# PROP Default_Filter "h;hpp;hxx;hm;inl"
# Begin Source File
SOURCE=.\CArch.h
# End Source File
# Begin Source File
SOURCE=.\CArchConsoleWindows.h
# End Source File
# Begin Source File
SOURCE=.\CArchDaemonWindows.h
# End Source File
# Begin Source File
SOURCE=.\CArchFileWindows.h
# End Source File
# Begin Source File
SOURCE=.\CArchLogWindows.h
# End Source File
# Begin Source File
SOURCE=.\CArchMiscWindows.h
# End Source File
# Begin Source File
SOURCE=.\CArchMultithreadWindows.h
# End Source File
# Begin Source File
SOURCE=.\CArchNetworkWinsock.h
# End Source File
# Begin Source File
SOURCE=.\CArchSleepWindows.h
# End Source File
# Begin Source File
SOURCE=.\CArchStringWindows.h
# End Source File
# Begin Source File
SOURCE=.\CArchSystemWindows.h
# End Source File
# Begin Source File
SOURCE=.\CArchTaskBarWindows.h
# End Source File
# Begin Source File
SOURCE=.\CArchTimeWindows.h
# End Source File
# Begin Source File
SOURCE=.\IArchConsole.h
# End Source File
# Begin Source File
SOURCE=.\IArchDaemon.h
# End Source File
# Begin Source File
SOURCE=.\IArchFile.h
# End Source File
# Begin Source File
SOURCE=.\IArchLog.h
# End Source File
# Begin Source File
SOURCE=.\IArchMultithread.h
# End Source File
# Begin Source File
SOURCE=.\IArchNetwork.h
# End Source File
# Begin Source File
SOURCE=.\IArchSleep.h
# End Source File
# Begin Source File
SOURCE=.\IArchString.h
# End Source File
# Begin Source File
SOURCE=.\IArchSystem.h
# End Source File
# Begin Source File
SOURCE=.\IArchTaskBar.h
# End Source File
# Begin Source File
SOURCE=.\IArchTaskBarReceiver.h
# End Source File
# Begin Source File
SOURCE=.\IArchTime.h
# End Source File
# Begin Source File
SOURCE=.\XArch.h
# End Source File
# Begin Source File
SOURCE=.\XArchWindows.h
# End Source File
# End Group
# End Target
# End Project

84
lib/arch/nmake.mak Normal file
View File

@ -0,0 +1,84 @@
# synergy -- mouse and keyboard sharing utility
# Copyright (C) 2007 Chris Schoeneman
#
# This package is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# found in the file COPYING that should have accompanied this file.
#
# This package is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
LIB_ARCH_SRC = lib\arch
LIB_ARCH_DST = $(BUILD_DST)\$(LIB_ARCH_SRC)
LIB_ARCH_LIB = "$(LIB_ARCH_DST)\arch.lib"
LIB_ARCH_CPP = \
"CArch.cpp" \
"CArchDaemonNone.cpp" \
"XArch.cpp" \
"CArchConsoleWindows.cpp" \
"CArchDaemonWindows.cpp" \
"CArchFileWindows.cpp" \
"CArchLogWindows.cpp" \
"CArchMiscWindows.cpp" \
"CArchMultithreadWindows.cpp" \
"CArchNetworkWinsock.cpp" \
"CArchSleepWindows.cpp" \
"CArchStringWindows.cpp" \
"CArchSystemWindows.cpp" \
"CArchTaskBarWindows.cpp" \
"CArchTimeWindows.cpp" \
"XArchWindows.cpp" \
$(NULL)
LIB_ARCH_OBJ = \
"$(LIB_ARCH_DST)\CArch.obj" \
"$(LIB_ARCH_DST)\CArchDaemonNone.obj" \
"$(LIB_ARCH_DST)\XArch.obj" \
"$(LIB_ARCH_DST)\CArchConsoleWindows.obj" \
"$(LIB_ARCH_DST)\CArchDaemonWindows.obj" \
"$(LIB_ARCH_DST)\CArchFileWindows.obj" \
"$(LIB_ARCH_DST)\CArchLogWindows.obj" \
"$(LIB_ARCH_DST)\CArchMiscWindows.obj" \
"$(LIB_ARCH_DST)\CArchMultithreadWindows.obj" \
"$(LIB_ARCH_DST)\CArchNetworkWinsock.obj" \
"$(LIB_ARCH_DST)\CArchSleepWindows.obj" \
"$(LIB_ARCH_DST)\CArchStringWindows.obj" \
"$(LIB_ARCH_DST)\CArchSystemWindows.obj" \
"$(LIB_ARCH_DST)\CArchTaskBarWindows.obj" \
"$(LIB_ARCH_DST)\CArchTimeWindows.obj" \
"$(LIB_ARCH_DST)\XArchWindows.obj" \
$(NULL)
LIB_ARCH_INC = \
/I"lib\common" \
$(NULL)
CPP_FILES = $(CPP_FILES) $(LIB_ARCH_CPP)
OBJ_FILES = $(OBJ_FILES) $(LIB_ARCH_OBJ)
LIB_FILES = $(LIB_FILES) $(LIB_ARCH_LIB)
# Dependency rules
$(LIB_ARCH_OBJ): $(AUTODEP)
!if EXIST($(LIB_ARCH_DST)\deps.mak)
!include $(LIB_ARCH_DST)\deps.mak
!endif
# Build rules. Use batch-mode rules if possible.
!if DEFINED(_NMAKE_VER)
{$(LIB_ARCH_SRC)\}.cpp{$(LIB_ARCH_DST)\}.obj::
!else
{$(LIB_ARCH_SRC)\}.cpp{$(LIB_ARCH_DST)\}.obj:
!endif
@$(ECHO) Compile in $(LIB_ARCH_SRC)
-@$(MKDIR) $(LIB_ARCH_DST) 2>NUL:
$(cpp) $(cppdebug) $(cppflags) $(cppvarsmt) /showIncludes \
$(LIB_ARCH_INC) \
/Fo$(LIB_ARCH_DST)\ \
/Fd$(LIB_ARCH_LIB:.lib=.pdb) \
$< | $(AUTODEP) $(LIB_ARCH_SRC) $(LIB_ARCH_DST)
$(LIB_ARCH_LIB): $(LIB_ARCH_OBJ)
@$(ECHO) Link $(@F)
$(implib) $(ildebug) $(ilflags) \
/out:$@ \
$**
$(AUTODEP) $(LIB_ARCH_SRC) $(LIB_ARCH_DST) $(**:.obj=.d)

View File

@ -14,7 +14,7 @@
NULL = NULL =
EXTRA_DIST = \ EXTRA_DIST = \
base.dsp \ nmake.mak \
$(NULL) $(NULL)
MAINTAINERCLEANFILES = \ MAINTAINERCLEANFILES = \

View File

@ -1,222 +0,0 @@
# Microsoft Developer Studio Project File - Name="base" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Static Library" 0x0104
CFG=base - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE NMAKE /f "base.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "base.mak" CFG="base - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "base - Win32 Release" (based on "Win32 (x86) Static Library")
!MESSAGE "base - Win32 Debug" (based on "Win32 (x86) Static Library")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
RSC=rc.exe
!IF "$(CFG)" == "base - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "Release"
# PROP BASE Intermediate_Dir "Release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\gen\build"
# PROP Intermediate_Dir "..\..\gen\build"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
# ADD CPP /nologo /MT /W4 /GR /GX /O2 /I "..\common" /I "..\arch" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /Fd"..\..\gen\build\base.pdb" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
# ADD LIB32 /nologo
!ELSEIF "$(CFG)" == "base - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "Debug"
# PROP BASE Intermediate_Dir "Debug"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\gen\debug"
# PROP Intermediate_Dir "..\..\gen\debug"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
# ADD CPP /nologo /MTd /W4 /Gm /GR /GX /ZI /Od /I "..\common" /I "..\arch" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /Fd"..\..\gen\debug\base.pdb" /FD /GZ /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
# ADD LIB32 /nologo
!ENDIF
# Begin Target
# Name "base - Win32 Release"
# Name "base - Win32 Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File
SOURCE=.\CEvent.cpp
# End Source File
# Begin Source File
SOURCE=.\CEventQueue.cpp
# End Source File
# Begin Source File
SOURCE=.\CFunctionEventJob.cpp
# End Source File
# Begin Source File
SOURCE=.\CFunctionJob.cpp
# End Source File
# Begin Source File
SOURCE=.\CLog.cpp
# End Source File
# Begin Source File
SOURCE=.\CSimpleEventQueueBuffer.cpp
# End Source File
# Begin Source File
SOURCE=.\CStopwatch.cpp
# End Source File
# Begin Source File
SOURCE=.\CStringUtil.cpp
# End Source File
# Begin Source File
SOURCE=.\CUnicode.cpp
# End Source File
# Begin Source File
SOURCE=.\IEventQueue.cpp
# End Source File
# Begin Source File
SOURCE=.\LogOutputters.cpp
# End Source File
# Begin Source File
SOURCE=.\XBase.cpp
# End Source File
# End Group
# Begin Group "Header Files"
# PROP Default_Filter "h;hpp;hxx;hm;inl"
# Begin Source File
SOURCE=.\CEvent.h
# End Source File
# Begin Source File
SOURCE=.\CEventQueue.h
# End Source File
# Begin Source File
SOURCE=.\CFunctionEventJob.h
# End Source File
# Begin Source File
SOURCE=.\CFunctionJob.h
# End Source File
# Begin Source File
SOURCE=.\CLog.h
# End Source File
# Begin Source File
SOURCE=.\CPriorityQueue.h
# End Source File
# Begin Source File
SOURCE=.\CSimpleEventQueueBuffer.h
# End Source File
# Begin Source File
SOURCE=.\CStopwatch.h
# End Source File
# Begin Source File
SOURCE=.\CString.h
# End Source File
# Begin Source File
SOURCE=.\CStringUtil.h
# End Source File
# Begin Source File
SOURCE=.\CUnicode.h
# End Source File
# Begin Source File
SOURCE=.\IEventJob.h
# End Source File
# Begin Source File
SOURCE=.\IEventQueue.h
# End Source File
# Begin Source File
SOURCE=.\IEventQueueBuffer.h
# End Source File
# Begin Source File
SOURCE=.\IJob.h
# End Source File
# Begin Source File
SOURCE=.\ILogOutputter.h
# End Source File
# Begin Source File
SOURCE=.\LogOutputters.h
# End Source File
# Begin Source File
SOURCE=.\TMethodEventJob.h
# End Source File
# Begin Source File
SOURCE=.\TMethodJob.h
# End Source File
# Begin Source File
SOURCE=.\XBase.h
# End Source File
# End Group
# End Target
# End Project

77
lib/base/nmake.mak Normal file
View File

@ -0,0 +1,77 @@
# synergy -- mouse and keyboard sharing utility
# Copyright (C) 2007 Chris Schoeneman
#
# This package is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# found in the file COPYING that should have accompanied this file.
#
# This package is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
LIB_BASE_SRC = lib\base
LIB_BASE_DST = $(BUILD_DST)\$(LIB_BASE_SRC)
LIB_BASE_LIB = "$(LIB_BASE_DST)\base.lib"
LIB_BASE_CPP = \
"CEvent.cpp" \
"CEventQueue.cpp" \
"CFunctionEventJob.cpp" \
"CFunctionJob.cpp" \
"CLog.cpp" \
"CSimpleEventQueueBuffer.cpp" \
"CStopwatch.cpp" \
"CStringUtil.cpp" \
"CUnicode.cpp" \
"IEventQueue.cpp" \
"LogOutputters.cpp" \
"XBase.cpp" \
$(NULL)
LIB_BASE_OBJ = \
"$(LIB_BASE_DST)\CEvent.obj" \
"$(LIB_BASE_DST)\CEventQueue.obj" \
"$(LIB_BASE_DST)\CFunctionEventJob.obj" \
"$(LIB_BASE_DST)\CFunctionJob.obj" \
"$(LIB_BASE_DST)\CLog.obj" \
"$(LIB_BASE_DST)\CSimpleEventQueueBuffer.obj" \
"$(LIB_BASE_DST)\CStopwatch.obj" \
"$(LIB_BASE_DST)\CStringUtil.obj" \
"$(LIB_BASE_DST)\CUnicode.obj" \
"$(LIB_BASE_DST)\IEventQueue.obj" \
"$(LIB_BASE_DST)\LogOutputters.obj" \
"$(LIB_BASE_DST)\XBase.obj" \
$(NULL)
LIB_BASE_INC = \
/I"lib\common" \
/I"lib\arch" \
$(NULL)
CPP_FILES = $(CPP_FILES) $(LIB_BASE_CPP)
OBJ_FILES = $(OBJ_FILES) $(LIB_BASE_OBJ)
LIB_FILES = $(LIB_FILES) $(LIB_BASE_LIB)
# Dependency rules
$(LIB_BASE_OBJ): $(AUTODEP)
!if EXIST($(LIB_BASE_DST)\deps.mak)
!include $(LIB_BASE_DST)\deps.mak
!endif
# Build rules. Use batch-mode rules if possible.
!if DEFINED(_NMAKE_VER)
{$(LIB_BASE_SRC)\}.cpp{$(LIB_BASE_DST)\}.obj::
!else
{$(LIB_BASE_SRC)\}.cpp{$(LIB_BASE_DST)\}.obj:
!endif
@$(ECHO) Compile in $(LIB_BASE_SRC)
-@$(MKDIR) $(LIB_BASE_DST) 2>NUL:
$(cpp) $(cppdebug) $(cppflags) $(cppvarsmt) /showIncludes \
$(LIB_BASE_INC) \
/Fo$(LIB_BASE_DST)\ \
/Fd$(LIB_BASE_LIB:.lib=.pdb) \
$< | $(AUTODEP) $(LIB_BASE_SRC) $(LIB_BASE_DST)
$(LIB_BASE_LIB): $(LIB_BASE_OBJ)
@$(ECHO) Link $(@F)
$(implib) $(ildebug) $(ilflags) \
/out:$@ \
$**
$(AUTODEP) $(LIB_BASE_SRC) $(LIB_BASE_DST) $(**:.obj=.d)

View File

@ -14,7 +14,7 @@
NULL = NULL =
EXTRA_DIST = \ EXTRA_DIST = \
client.dsp \ nmake.mak \
$(NULL) $(NULL)
MAINTAINERCLEANFILES = \ MAINTAINERCLEANFILES = \

View File

@ -1,114 +0,0 @@
# Microsoft Developer Studio Project File - Name="client" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Static Library" 0x0104
CFG=client - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE NMAKE /f "client.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "client.mak" CFG="client - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "client - Win32 Release" (based on "Win32 (x86) Static Library")
!MESSAGE "client - Win32 Debug" (based on "Win32 (x86) Static Library")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
RSC=rc.exe
!IF "$(CFG)" == "client - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "Release"
# PROP BASE Intermediate_Dir "Release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\gen\build"
# PROP Intermediate_Dir "..\..\gen\build"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
# ADD CPP /nologo /MT /W4 /GR /GX /O2 /I "..\common" /I "..\arch" /I "..\base" /I "..\io" /I "..\mt" /I "..\net" /I "..\synergy" /I "..\platform" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /Fd"..\..\gen\build\client.pdb" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
# ADD LIB32 /nologo
!ELSEIF "$(CFG)" == "client - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "Debug"
# PROP BASE Intermediate_Dir "Debug"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\gen\debug"
# PROP Intermediate_Dir "..\..\gen\debug"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
# ADD CPP /nologo /MTd /W4 /Gm /GR /GX /ZI /Od /I "..\common" /I "..\arch" /I "..\base" /I "..\io" /I "..\mt" /I "..\net" /I "..\synergy" /I "..\platform" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /Fd"..\..\gen\debug\client.pdb" /FD /GZ /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
# ADD LIB32 /nologo
!ENDIF
# Begin Target
# Name "client - Win32 Release"
# Name "client - Win32 Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File
SOURCE=.\CClient.cpp
# End Source File
# Begin Source File
SOURCE=.\CServerProxy.cpp
# End Source File
# End Group
# Begin Group "Header Files"
# PROP Default_Filter "h;hpp;hxx;hm;inl"
# Begin Source File
SOURCE=.\CClient.h
# End Source File
# Begin Source File
SOURCE=.\CServerProxy.h
# End Source File
# End Group
# Begin Group "Resource Files"
# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
# End Group
# End Target
# End Project

63
lib/client/nmake.mak Normal file
View File

@ -0,0 +1,63 @@
# synergy -- mouse and keyboard sharing utility
# Copyright (C) 2007 Chris Schoeneman
#
# This package is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# found in the file COPYING that should have accompanied this file.
#
# This package is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
LIB_CLIENT_SRC = lib\client
LIB_CLIENT_DST = $(BUILD_DST)\$(LIB_CLIENT_SRC)
LIB_CLIENT_LIB = "$(LIB_CLIENT_DST)\client.lib"
LIB_CLIENT_CPP = \
"CClient.cpp" \
"CServerProxy.cpp" \
$(NULL)
LIB_CLIENT_OBJ = \
"$(LIB_CLIENT_DST)\CClient.obj" \
"$(LIB_CLIENT_DST)\CServerProxy.obj" \
$(NULL)
LIB_CLIENT_INC = \
/I"lib\common" \
/I"lib\arch" \
/I"lib\base" \
/I"lib\mt" \
/I"lib\io" \
/I"lib\net" \
/I"lib\synergy" \
/I"lib\platform" \
$(NULL)
CPP_FILES = $(CPP_FILES) $(LIB_CLIENT_CPP)
OBJ_FILES = $(OBJ_FILES) $(LIB_CLIENT_OBJ)
LIB_FILES = $(LIB_FILES) $(LIB_CLIENT_LIB)
# Dependency rules
$(LIB_CLIENT_OBJ): $(AUTODEP)
!if EXIST($(LIB_CLIENT_DST)\deps.mak)
!include $(LIB_CLIENT_DST)\deps.mak
!endif
# Build rules. Use batch-mode rules if possible.
!if DEFINED(_NMAKE_VER)
{$(LIB_CLIENT_SRC)\}.cpp{$(LIB_CLIENT_DST)\}.obj::
!else
{$(LIB_CLIENT_SRC)\}.cpp{$(LIB_CLIENT_DST)\}.obj:
!endif
@$(ECHO) Compile in $(LIB_CLIENT_SRC)
-@$(MKDIR) $(LIB_CLIENT_DST) 2>NUL:
$(cpp) $(cppdebug) $(cppflags) $(cppvarsmt) /showIncludes \
$(LIB_CLIENT_INC) \
/Fo$(LIB_CLIENT_DST)\ \
/Fd$(LIB_CLIENT_LIB:.lib=.pdb) \
$< | $(AUTODEP) $(LIB_CLIENT_SRC) $(LIB_CLIENT_DST)
$(LIB_CLIENT_LIB): $(LIB_CLIENT_OBJ)
@$(ECHO) Link $(@F)
$(implib) $(ildebug) $(ilflags) \
/out:$@ \
$**
$(AUTODEP) $(LIB_CLIENT_SRC) $(LIB_CLIENT_DST) $(**:.obj=.d)

View File

@ -14,7 +14,7 @@
NULL = NULL =
EXTRA_DIST = \ EXTRA_DIST = \
common.dsp \ nmake.mak \
BasicTypes.h \ BasicTypes.h \
IInterface.h \ IInterface.h \
MacOSXPrecomp.h \ MacOSXPrecomp.h \

View File

@ -1,166 +0,0 @@
# Microsoft Developer Studio Project File - Name="common" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Static Library" 0x0104
CFG=common - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE NMAKE /f "common.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "common.mak" CFG="common - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "common - Win32 Release" (based on "Win32 (x86) Static Library")
!MESSAGE "common - Win32 Debug" (based on "Win32 (x86) Static Library")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
RSC=rc.exe
!IF "$(CFG)" == "common - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "Release"
# PROP BASE Intermediate_Dir "Release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\gen\build"
# PROP Intermediate_Dir "..\..\gen\build"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
# ADD CPP /nologo /MT /W4 /GR /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /Fd"..\..\gen\build\common.pdb" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
# ADD LIB32 /nologo
!ELSEIF "$(CFG)" == "common - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "Debug"
# PROP BASE Intermediate_Dir "Debug"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\gen\debug"
# PROP Intermediate_Dir "..\..\gen\debug"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
# ADD CPP /nologo /MTd /W4 /Gm /GR /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /Fd"..\..\gen\debug\common.pdb" /FD /GZ /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
# ADD LIB32 /nologo
!ENDIF
# Begin Target
# Name "common - Win32 Release"
# Name "common - Win32 Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File
SOURCE=.\Version.cpp
# End Source File
# End Group
# Begin Group "Header Files"
# PROP Default_Filter "h;hpp;hxx;hm;inl"
# Begin Source File
SOURCE=.\BasicTypes.h
# End Source File
# Begin Source File
SOURCE=.\common.h
# End Source File
# Begin Source File
SOURCE=.\IInterface.h
# End Source File
# Begin Source File
SOURCE=.\stdbitset.h
# End Source File
# Begin Source File
SOURCE=.\stddeque.h
# End Source File
# Begin Source File
SOURCE=.\stdfstream.h
# End Source File
# Begin Source File
SOURCE=.\stdistream.h
# End Source File
# Begin Source File
SOURCE=.\stdlist.h
# End Source File
# Begin Source File
SOURCE=.\stdmap.h
# End Source File
# Begin Source File
SOURCE=.\stdostream.h
# End Source File
# Begin Source File
SOURCE=.\stdpost.h
# End Source File
# Begin Source File
SOURCE=.\stdpre.h
# End Source File
# Begin Source File
SOURCE=.\stdset.h
# End Source File
# Begin Source File
SOURCE=.\stdsstream.h
# End Source File
# Begin Source File
SOURCE=.\stdstring.h
# End Source File
# Begin Source File
SOURCE=.\stdvector.h
# End Source File
# Begin Source File
SOURCE=.\Version.h
# End Source File
# End Group
# End Target
# End Project

53
lib/common/nmake.mak Normal file
View File

@ -0,0 +1,53 @@
# synergy -- mouse and keyboard sharing utility
# Copyright (C) 2007 Chris Schoeneman
#
# This package is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# found in the file COPYING that should have accompanied this file.
#
# This package is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
LIB_COMMON_SRC = lib\common
LIB_COMMON_DST = $(BUILD_DST)\$(LIB_COMMON_SRC)
LIB_COMMON_LIB = "$(LIB_COMMON_DST)\common.lib"
LIB_COMMON_CPP = \
Version.cpp \
$(NULL)
LIB_COMMON_OBJ = \
"$(LIB_COMMON_DST)\Version.obj" \
$(NULL)
LIB_COMMON_INC = \
$(NULL)
CPP_FILES = $(CPP_FILES) $(LIB_COMMON_CPP)
OBJ_FILES = $(OBJ_FILES) $(LIB_COMMON_OBJ)
LIB_FILES = $(LIB_FILES) $(LIB_COMMON_LIB)
# Dependency rules
$(LIB_COMMON_OBJ): $(AUTODEP)
!if EXIST($(LIB_COMMON_DST)\deps.mak)
!include $(LIB_COMMON_DST)\deps.mak
!endif
# Build rules. Use batch-mode rules if possible.
!if DEFINED(_NMAKE_VER)
{$(LIB_COMMON_SRC)\}.cpp{$(LIB_COMMON_DST)\}.obj::
!else
{$(LIB_COMMON_SRC)\}.cpp{$(LIB_COMMON_DST)\}.obj:
!endif
@$(ECHO) Compile in $(LIB_COMMON_SRC)
-@$(MKDIR) $(LIB_COMMON_DST) 2>NUL:
$(cpp) $(cppdebug) $(cppflags) $(cppvarsmt) /showIncludes \
$(LIB_COMMON_INC) \
/Fo$(LIB_COMMON_DST)\ \
/Fd$(LIB_COMMON_LIB:.lib=.pdb) \
$< | $(AUTODEP) $(LIB_COMMON_SRC) $(LIB_COMMON_DST)
$(LIB_COMMON_LIB): $(LIB_COMMON_OBJ)
@$(ECHO) Link $(@F)
$(implib) $(ildebug) $(ilflags) \
/out:$@ \
$**
$(AUTODEP) $(LIB_COMMON_SRC) $(LIB_COMMON_DST) $(**:.obj=.d)

View File

@ -14,7 +14,7 @@
NULL = NULL =
EXTRA_DIST = \ EXTRA_DIST = \
io.dsp \ nmake.mak \
$(NULL) $(NULL)
MAINTAINERCLEANFILES = \ MAINTAINERCLEANFILES = \

View File

@ -1,130 +0,0 @@
# Microsoft Developer Studio Project File - Name="io" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Static Library" 0x0104
CFG=io - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE NMAKE /f "io.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "io.mak" CFG="io - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "io - Win32 Release" (based on "Win32 (x86) Static Library")
!MESSAGE "io - Win32 Debug" (based on "Win32 (x86) Static Library")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
RSC=rc.exe
!IF "$(CFG)" == "io - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "Release"
# PROP BASE Intermediate_Dir "Release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\gen\build"
# PROP Intermediate_Dir "..\..\gen\build"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
# ADD CPP /nologo /MT /W4 /GR /GX /O2 /I "..\common" /I "..\arch" /I "..\base" /I "..\mt" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /Fd"..\..\gen\build\io.pdb" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
# ADD LIB32 /nologo
!ELSEIF "$(CFG)" == "io - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "Debug"
# PROP BASE Intermediate_Dir "Debug"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\gen\debug"
# PROP Intermediate_Dir "..\..\gen\debug"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
# ADD CPP /nologo /MTd /W4 /Gm /GR /GX /ZI /Od /I "..\common" /I "..\arch" /I "..\base" /I "..\mt" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /Fd"..\..\gen\debug\io.pdb" /FD /GZ /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
# ADD LIB32 /nologo
!ENDIF
# Begin Target
# Name "io - Win32 Release"
# Name "io - Win32 Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File
SOURCE=.\CStreamBuffer.cpp
# End Source File
# Begin Source File
SOURCE=.\CStreamFilter.cpp
# End Source File
# Begin Source File
SOURCE=.\IStream.cpp
# End Source File
# Begin Source File
SOURCE=.\XIO.cpp
# End Source File
# End Group
# Begin Group "Header Files"
# PROP Default_Filter "h;hpp;hxx;hm;inl"
# Begin Source File
SOURCE=.\CStreamBuffer.h
# End Source File
# Begin Source File
SOURCE=.\CStreamFilter.h
# End Source File
# Begin Source File
SOURCE=.\IStream.h
# End Source File
# Begin Source File
SOURCE=.\IStreamFilterFactory.h
# End Source File
# Begin Source File
SOURCE=.\XIO.h
# End Source File
# End Group
# End Target
# End Project

63
lib/io/nmake.mak Normal file
View File

@ -0,0 +1,63 @@
# synergy -- mouse and keyboard sharing utility
# Copyright (C) 2007 Chris Schoeneman
#
# This package is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# found in the file COPYING that should have accompanied this file.
#
# This package is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
LIB_IO_SRC = lib\io
LIB_IO_DST = $(BUILD_DST)\$(LIB_IO_SRC)
LIB_IO_LIB = "$(LIB_IO_DST)\io.lib"
LIB_IO_CPP = \
"CStreamBuffer.cpp" \
"CStreamFilter.cpp" \
"IStream.cpp" \
"XIO.cpp" \
$(NULL)
LIB_IO_OBJ = \
"$(LIB_IO_DST)\CStreamBuffer.obj" \
"$(LIB_IO_DST)\CStreamFilter.obj" \
"$(LIB_IO_DST)\IStream.obj" \
"$(LIB_IO_DST)\XIO.obj" \
$(NULL)
LIB_IO_INC = \
/I"lib\common" \
/I"lib\arch" \
/I"lib\base" \
/I"lib\mt" \
$(NULL)
CPP_FILES = $(CPP_FILES) $(LIB_IO_CPP)
OBJ_FILES = $(OBJ_FILES) $(LIB_IO_OBJ)
LIB_FILES = $(LIB_FILES) $(LIB_IO_LIB)
# Dependency rules
$(LIB_IO_OBJ): $(AUTODEP)
!if EXIST($(LIB_IO_DST)\deps.mak)
!include $(LIB_IO_DST)\deps.mak
!endif
# Build rules. Use batch-mode rules if possible.
!if DEFINED(_NMAKE_VER)
{$(LIB_IO_SRC)\}.cpp{$(LIB_IO_DST)\}.obj::
!else
{$(LIB_IO_SRC)\}.cpp{$(LIB_IO_DST)\}.obj:
!endif
@$(ECHO) Compile in $(LIB_IO_SRC)
-@$(MKDIR) $(LIB_IO_DST) 2>NUL:
$(cpp) $(cppdebug) $(cppflags) $(cppvarsmt) /showIncludes \
$(LIB_IO_INC) \
/Fo$(LIB_IO_DST)\ \
/Fd$(LIB_IO_LIB:.lib=.pdb) \
$< | $(AUTODEP) $(LIB_IO_SRC) $(LIB_IO_DST)
$(LIB_IO_LIB): $(LIB_IO_OBJ)
@$(ECHO) Link $(@F)
$(implib) $(ildebug) $(ilflags) \
/out:$@ \
$**
$(AUTODEP) $(LIB_IO_SRC) $(LIB_IO_DST) $(**:.obj=.d)

View File

@ -14,7 +14,7 @@
NULL = NULL =
EXTRA_DIST = \ EXTRA_DIST = \
mt.dsp \ nmake.mak \
$(NULL) $(NULL)
MAINTAINERCLEANFILES = \ MAINTAINERCLEANFILES = \

View File

@ -1,138 +0,0 @@
# Microsoft Developer Studio Project File - Name="mt" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Static Library" 0x0104
CFG=mt - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE NMAKE /f "mt.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "mt.mak" CFG="mt - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "mt - Win32 Release" (based on "Win32 (x86) Static Library")
!MESSAGE "mt - Win32 Debug" (based on "Win32 (x86) Static Library")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
RSC=rc.exe
!IF "$(CFG)" == "mt - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "Release"
# PROP BASE Intermediate_Dir "Release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\gen\build"
# PROP Intermediate_Dir "..\..\gen\build"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
# ADD CPP /nologo /MT /W4 /GR /GX /O2 /I "..\common" /I "..\arch" /I "..\base" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /Fd"..\..\gen\build\mt.pdb" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
# ADD LIB32 /nologo
!ELSEIF "$(CFG)" == "mt - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "Debug"
# PROP BASE Intermediate_Dir "Debug"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\gen\debug"
# PROP Intermediate_Dir "..\..\gen\debug"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
# ADD CPP /nologo /MTd /W4 /Gm /GR /GX /ZI /Od /I "..\common" /I "..\arch" /I "..\base" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /Fd"..\..\gen\debug\mt.pdb" /FD /GZ /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
# ADD LIB32 /nologo
!ENDIF
# Begin Target
# Name "mt - Win32 Release"
# Name "mt - Win32 Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File
SOURCE=.\CCondVar.cpp
# End Source File
# Begin Source File
SOURCE=.\CLock.cpp
# End Source File
# Begin Source File
SOURCE=.\CMutex.cpp
# End Source File
# Begin Source File
SOURCE=.\CThread.cpp
# End Source File
# Begin Source File
SOURCE=.\XMT.cpp
# End Source File
# End Group
# Begin Group "Header Files"
# PROP Default_Filter "h;hpp;hxx;hm;inl"
# Begin Source File
SOURCE=.\CCondVar.h
# End Source File
# Begin Source File
SOURCE=.\CLock.h
# End Source File
# Begin Source File
SOURCE=.\CMutex.h
# End Source File
# Begin Source File
SOURCE=.\CThread.h
# End Source File
# Begin Source File
SOURCE=.\XMT.h
# End Source File
# Begin Source File
SOURCE=.\XThread.h
# End Source File
# End Group
# End Target
# End Project

64
lib/mt/nmake.mak Normal file
View File

@ -0,0 +1,64 @@
# synergy -- mouse and keyboard sharing utility
# Copyright (C) 2007 Chris Schoeneman
#
# This package is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# found in the file COPYING that should have accompanied this file.
#
# This package is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
LIB_MT_SRC = lib\mt
LIB_MT_DST = $(BUILD_DST)\$(LIB_MT_SRC)
LIB_MT_LIB = "$(LIB_MT_DST)\mt.lib"
LIB_MT_CPP = \
"CCondVar.cpp" \
"CLock.cpp" \
"CMutex.cpp" \
"CThread.cpp" \
"XMT.cpp" \
$(NULL)
LIB_MT_OBJ = \
"$(LIB_MT_DST)\CCondVar.obj" \
"$(LIB_MT_DST)\CLock.obj" \
"$(LIB_MT_DST)\CMutex.obj" \
"$(LIB_MT_DST)\CThread.obj" \
"$(LIB_MT_DST)\XMT.obj" \
$(NULL)
LIB_MT_INC = \
/I"lib\common" \
/I"lib\arch" \
/I"lib\base" \
$(NULL)
CPP_FILES = $(CPP_FILES) $(LIB_MT_CPP)
OBJ_FILES = $(OBJ_FILES) $(LIB_MT_OBJ)
LIB_FILES = $(LIB_FILES) $(LIB_MT_LIB)
# Dependency rules
$(LIB_MT_OBJ): $(AUTODEP)
!if EXIST($(LIB_MT_DST)\deps.mak)
!include $(LIB_MT_DST)\deps.mak
!endif
# Build rules. Use batch-mode rules if possible.
!if DEFINED(_NMAKE_VER)
{$(LIB_MT_SRC)\}.cpp{$(LIB_MT_DST)\}.obj::
!else
{$(LIB_MT_SRC)\}.cpp{$(LIB_MT_DST)\}.obj:
!endif
@$(ECHO) Compile in $(LIB_MT_SRC)
-@$(MKDIR) $(LIB_MT_DST) 2>NUL:
$(cpp) $(cppdebug) $(cppflags) $(cppvarsmt) /showIncludes \
$(LIB_MT_INC) \
/Fo$(LIB_MT_DST)\ \
/Fd$(LIB_MT_LIB:.lib=.pdb) \
$< | $(AUTODEP) $(LIB_MT_SRC) $(LIB_MT_DST)
$(LIB_MT_LIB): $(LIB_MT_OBJ)
@$(ECHO) Link $(@F)
$(implib) $(ildebug) $(ilflags) \
/out:$@ \
$**
$(AUTODEP) $(LIB_MT_SRC) $(LIB_MT_DST) $(**:.obj=.d)

View File

@ -201,7 +201,12 @@ CSocketMultiplexer::serviceThread(void*)
int status; int status;
try { try {
// check for status // check for status
status = ARCH->pollSocket(&pfds[0], pfds.size(), -1); if (!pfds.empty()) {
status = ARCH->pollSocket(&pfds[0], pfds.size(), -1);
}
else {
status = 0;
}
} }
catch (XArchNetwork& e) { catch (XArchNetwork& e) {
LOG((CLOG_WARN "error in socket multiplexer: %s", e.what().c_str())); LOG((CLOG_WARN "error in socket multiplexer: %s", e.what().c_str()));

View File

@ -123,7 +123,7 @@ CTCPSocket::read(void* buffer, UInt32 n)
if (n > size) { if (n > size) {
n = size; n = size;
} }
if (buffer != NULL) { if (buffer != NULL && n != 0) {
memcpy(buffer, m_inputBuffer.peek(n), n); memcpy(buffer, m_inputBuffer.peek(n), n);
} }
m_inputBuffer.pop(n); m_inputBuffer.pop(n);

View File

@ -14,7 +14,7 @@
NULL = NULL =
EXTRA_DIST = \ EXTRA_DIST = \
net.dsp \ nmake.mak \
$(NULL) $(NULL)
MAINTAINERCLEANFILES = \ MAINTAINERCLEANFILES = \

View File

@ -1,178 +0,0 @@
# Microsoft Developer Studio Project File - Name="net" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Static Library" 0x0104
CFG=net - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE NMAKE /f "net.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "net.mak" CFG="net - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "net - Win32 Release" (based on "Win32 (x86) Static Library")
!MESSAGE "net - Win32 Debug" (based on "Win32 (x86) Static Library")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
RSC=rc.exe
!IF "$(CFG)" == "net - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "Release"
# PROP BASE Intermediate_Dir "Release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\gen\build"
# PROP Intermediate_Dir "..\..\gen\build"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
# ADD CPP /nologo /MT /W4 /GR /GX /O2 /I "..\common" /I "..\arch" /I "..\base" /I "..\io" /I "..\mt" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /Fd"..\..\gen\build\net.pdb" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
# ADD LIB32 /nologo
!ELSEIF "$(CFG)" == "net - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "Debug"
# PROP BASE Intermediate_Dir "Debug"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\gen\debug"
# PROP Intermediate_Dir "..\..\gen\debug"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
# ADD CPP /nologo /MTd /W4 /Gm /GR /GX /ZI /Od /I "..\common" /I "..\arch" /I "..\base" /I "..\io" /I "..\mt" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /Fd"..\..\gen\debug\net.pdb" /FD /GZ /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
# ADD LIB32 /nologo
!ENDIF
# Begin Target
# Name "net - Win32 Release"
# Name "net - Win32 Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File
SOURCE=.\CNetworkAddress.cpp
# End Source File
# Begin Source File
SOURCE=.\CSocketMultiplexer.cpp
# End Source File
# Begin Source File
SOURCE=.\CTCPListenSocket.cpp
# End Source File
# Begin Source File
SOURCE=.\CTCPSocket.cpp
# End Source File
# Begin Source File
SOURCE=.\CTCPSocketFactory.cpp
# End Source File
# Begin Source File
SOURCE=.\IDataSocket.cpp
# End Source File
# Begin Source File
SOURCE=.\IListenSocket.cpp
# End Source File
# Begin Source File
SOURCE=.\ISocket.cpp
# End Source File
# Begin Source File
SOURCE=.\XSocket.cpp
# End Source File
# End Group
# Begin Group "Header Files"
# PROP Default_Filter "h;hpp;hxx;hm;inl"
# Begin Source File
SOURCE=.\CNetworkAddress.h
# End Source File
# Begin Source File
SOURCE=.\CSocketMultiplexer.h
# End Source File
# Begin Source File
SOURCE=.\CTCPListenSocket.h
# End Source File
# Begin Source File
SOURCE=.\CTCPSocket.h
# End Source File
# Begin Source File
SOURCE=.\CTCPSocketFactory.h
# End Source File
# Begin Source File
SOURCE=.\IDataSocket.h
# End Source File
# Begin Source File
SOURCE=.\IListenSocket.h
# End Source File
# Begin Source File
SOURCE=.\ISocket.h
# End Source File
# Begin Source File
SOURCE=.\ISocketFactory.h
# End Source File
# Begin Source File
SOURCE=.\ISocketMultiplexerJob.h
# End Source File
# Begin Source File
SOURCE=.\TSocketMultiplexerMethodJob.h
# End Source File
# Begin Source File
SOURCE=.\XSocket.h
# End Source File
# End Group
# End Target
# End Project

74
lib/net/nmake.mak Normal file
View File

@ -0,0 +1,74 @@
# synergy -- mouse and keyboard sharing utility
# Copyright (C) 2007 Chris Schoeneman
#
# This package is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# found in the file COPYING that should have accompanied this file.
#
# This package is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
LIB_NET_SRC = lib\net
LIB_NET_DST = $(BUILD_DST)\$(LIB_NET_SRC)
LIB_NET_LIB = "$(LIB_NET_DST)\net.lib"
LIB_NET_CPP = \
"CNetworkAddress.cpp" \
"CSocketMultiplexer.cpp" \
"CTCPListenSocket.cpp" \
"CTCPSocket.cpp" \
"CTCPSocketFactory.cpp" \
"IDataSocket.cpp" \
"IListenSocket.cpp" \
"ISocket.cpp" \
"XSocket.cpp" \
$(NULL)
LIB_NET_OBJ = \
"$(LIB_NET_DST)\CNetworkAddress.obj" \
"$(LIB_NET_DST)\CSocketMultiplexer.obj" \
"$(LIB_NET_DST)\CTCPListenSocket.obj" \
"$(LIB_NET_DST)\CTCPSocket.obj" \
"$(LIB_NET_DST)\CTCPSocketFactory.obj" \
"$(LIB_NET_DST)\IDataSocket.obj" \
"$(LIB_NET_DST)\IListenSocket.obj" \
"$(LIB_NET_DST)\ISocket.obj" \
"$(LIB_NET_DST)\XSocket.obj" \
$(NULL)
LIB_NET_INC = \
/I"lib\common" \
/I"lib\arch" \
/I"lib\base" \
/I"lib\mt" \
/I"lib\io" \
$(NULL)
CPP_FILES = $(CPP_FILES) $(LIB_NET_CPP)
OBJ_FILES = $(OBJ_FILES) $(LIB_NET_OBJ)
LIB_FILES = $(LIB_FILES) $(LIB_NET_LIB)
# Dependency rules
$(LIB_NET_OBJ): $(AUTODEP)
!if EXIST($(LIB_NET_DST)\deps.mak)
!include $(LIB_NET_DST)\deps.mak
!endif
# Build rules. Use batch-mode rules if possible.
!if DEFINED(_NMAKE_VER)
{$(LIB_NET_SRC)\}.cpp{$(LIB_NET_DST)\}.obj::
!else
{$(LIB_NET_SRC)\}.cpp{$(LIB_NET_DST)\}.obj:
!endif
@$(ECHO) Compile in $(LIB_NET_SRC)
-@$(MKDIR) $(LIB_NET_DST) 2>NUL:
$(cpp) $(cppdebug) $(cppflags) $(cppvarsmt) /showIncludes \
$(LIB_NET_INC) \
/Fo$(LIB_NET_DST)\ \
/Fd$(LIB_NET_LIB:.lib=.pdb) \
$< | $(AUTODEP) $(LIB_NET_SRC) $(LIB_NET_DST)
$(LIB_NET_LIB): $(LIB_NET_OBJ)
@$(ECHO) Link $(@F)
$(implib) $(ildebug) $(ilflags) \
/out:$@ \
$**
$(AUTODEP) $(LIB_NET_SRC) $(LIB_NET_DST) $(**:.obj=.d)

View File

@ -1500,10 +1500,11 @@ CMSWindowsScreen::fixClipboardViewer()
// i'm not sure how that could happen. the m_nextClipboardWindow = NULL // i'm not sure how that could happen. the m_nextClipboardWindow = NULL
// was not in the code that infinite loops and may fix the bug but i // was not in the code that infinite loops and may fix the bug but i
// doubt it. // doubt it.
return; /*
ChangeClipboardChain(m_window, m_nextClipboardWindow); ChangeClipboardChain(m_window, m_nextClipboardWindow);
m_nextClipboardWindow = NULL; m_nextClipboardWindow = NULL;
m_nextClipboardWindow = SetClipboardViewer(m_window); m_nextClipboardWindow = SetClipboardViewer(m_window);
*/
} }
void void

View File

@ -15,6 +15,20 @@
#include "CSynergyHook.h" #include "CSynergyHook.h"
#include "ProtocolTypes.h" #include "ProtocolTypes.h"
#include <zmouse.h> #include <zmouse.h>
#include <tchar.h>
#if _MSC_VER >= 1400
// VS2005 hack - we don't use assert here because we don't want to link with the CRT.
#undef assert
#if _DEBUG
#define assert(_X_) if (!(_X_)) __debugbreak()
#else
#define assert(_X_) __noop()
#endif
// VS2005 is a bit more smart than VC6 and optimize simple copy loop to
// intrinsic memcpy.
#pragma function(memcpy)
#endif
// //
// debugging compile flag. when not zero the server doesn't grab // debugging compile flag. when not zero the server doesn't grab
@ -766,6 +780,79 @@ DllMain(HINSTANCE instance, DWORD reason, LPVOID)
extern "C" { extern "C" {
// VS2005 hack to not link with the CRT
#if _MSC_VER >= 1400
BOOL WINAPI _DllMainCRTStartup(
HINSTANCE instance, DWORD reason, LPVOID lpreserved)
{
return DllMain(instance, reason, lpreserved);
}
// VS2005 is a bit more bright than VC6 and optimize simple copy loop to
// intrinsic memcpy.
void * __cdecl memcpy(void * _Dst, const void * _Src, size_t _MaxCount)
{
void * _DstBackup = _Dst;
switch (_MaxCount & 3) {
case 3:
((char*)_Dst)[0] = ((char*)_Src)[0];
++(char*&)_Dst;
++(char*&)_Src;
--_MaxCount;
case 2:
((char*)_Dst)[0] = ((char*)_Src)[0];
++(char*&)_Dst;
++(char*&)_Src;
--_MaxCount;
case 1:
((char*)_Dst)[0] = ((char*)_Src)[0];
++(char*&)_Dst;
++(char*&)_Src;
--_MaxCount;
break;
case 0:
break;
default:
__assume(0);
break;
}
// I think it's faster on intel to deference than modify the pointer.
const size_t max = _MaxCount / sizeof(UINT_PTR);
for (size_t i = 0; i < max; ++i) {
((UINT_PTR*)_Dst)[i] = ((UINT_PTR*)_Src)[i];
}
(UINT_PTR*&)_Dst += max;
(UINT_PTR*&)_Src += max;
switch (_MaxCount & 3) {
case 3:
((char*)_Dst)[0] = ((char*)_Src)[0];
++(char*&)_Dst;
++(char*&)_Src;
case 2:
((char*)_Dst)[0] = ((char*)_Src)[0];
++(char*&)_Dst;
++(char*&)_Src;
case 1:
((char*)_Dst)[0] = ((char*)_Src)[0];
++(char*&)_Dst;
++(char*&)_Src;
break;
case 0:
break;
default:
__assume(0);
break;
}
return _DstBackup;
}
#endif
int int
init(DWORD threadID) init(DWORD threadID)
{ {
@ -786,7 +873,7 @@ init(DWORD threadID)
// clean up after old process. the system should've already // clean up after old process. the system should've already
// removed the hooks so we just need to reset our state. // removed the hooks so we just need to reset our state.
g_hinstance = GetModuleHandle("synrgyhk"); g_hinstance = GetModuleHandle(_T("synrgyhk"));
g_processID = GetCurrentProcessId(); g_processID = GetCurrentProcessId();
g_wheelSupport = kWheelNone; g_wheelSupport = kWheelNone;
g_threadID = 0; g_threadID = 0;

View File

@ -92,9 +92,7 @@ CARBON_SOURCE_FILES = \
$(NULL) $(NULL)
EXTRA_DIST = \ EXTRA_DIST = \
makehook.dsp \ nmake.mak \
platform.dsp \
synrgyhk.dsp \
$(XWINDOWS_SOURCE_FILES) \ $(XWINDOWS_SOURCE_FILES) \
$(MSWINDOWS_SOURCE_FILES) \ $(MSWINDOWS_SOURCE_FILES) \
$(MSWINDOWS_HOOK_SOURCE_FILES) \ $(MSWINDOWS_HOOK_SOURCE_FILES) \

View File

@ -1,63 +0,0 @@
# Microsoft Developer Studio Project File - Name="makehook" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Generic Project" 0x010a
CFG=makehook - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE NMAKE /f "makehook.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "makehook.mak" CFG="makehook - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "makehook - Win32 Release" (based on "Win32 (x86) Generic Project")
!MESSAGE "makehook - Win32 Debug" (based on "Win32 (x86) Generic Project")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
MTL=midl.exe
!IF "$(CFG)" == "makehook - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "Release"
# PROP BASE Intermediate_Dir "Release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\build"
# PROP Intermediate_Dir "..\..\gen\build"
# PROP Target_Dir ""
!ELSEIF "$(CFG)" == "makehook - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "Debug"
# PROP BASE Intermediate_Dir "Debug"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\debug"
# PROP Intermediate_Dir "..\..\gen\debug"
# PROP Target_Dir ""
!ENDIF
# Begin Target
# Name "makehook - Win32 Release"
# Name "makehook - Win32 Debug"
# End Target
# End Project

119
lib/platform/nmake.mak Normal file
View File

@ -0,0 +1,119 @@
# synergy -- mouse and keyboard sharing utility
# Copyright (C) 2007 Chris Schoeneman
#
# This package is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# found in the file COPYING that should have accompanied this file.
#
# This package is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
LIB_PLATFORM_SRC = lib\platform
LIB_PLATFORM_DST = $(BUILD_DST)\$(LIB_PLATFORM_SRC)
LIB_PLATFORM_LIB = "$(LIB_PLATFORM_DST)\platform.lib"
LIB_PLATFORM_CPP = \
"CMSWindowsClipboard.cpp" \
"CMSWindowsClipboardAnyTextConverter.cpp" \
"CMSWindowsClipboardBitmapConverter.cpp" \
"CMSWindowsClipboardHTMLConverter.cpp" \
"CMSWindowsClipboardTextConverter.cpp" \
"CMSWindowsClipboardUTF16Converter.cpp" \
"CMSWindowsDesks.cpp" \
"CMSWindowsEventQueueBuffer.cpp" \
"CMSWindowsKeyState.cpp" \
"CMSWindowsScreen.cpp" \
"CMSWindowsScreenSaver.cpp" \
"CMSWindowsUtil.cpp" \
$(NULL)
LIB_PLATFORM_OBJ = \
"$(LIB_PLATFORM_DST)\CMSWindowsClipboard.obj" \
"$(LIB_PLATFORM_DST)\CMSWindowsClipboardAnyTextConverter.obj" \
"$(LIB_PLATFORM_DST)\CMSWindowsClipboardBitmapConverter.obj" \
"$(LIB_PLATFORM_DST)\CMSWindowsClipboardHTMLConverter.obj" \
"$(LIB_PLATFORM_DST)\CMSWindowsClipboardTextConverter.obj" \
"$(LIB_PLATFORM_DST)\CMSWindowsClipboardUTF16Converter.obj" \
"$(LIB_PLATFORM_DST)\CMSWindowsDesks.obj" \
"$(LIB_PLATFORM_DST)\CMSWindowsEventQueueBuffer.obj" \
"$(LIB_PLATFORM_DST)\CMSWindowsKeyState.obj" \
"$(LIB_PLATFORM_DST)\CMSWindowsScreen.obj" \
"$(LIB_PLATFORM_DST)\CMSWindowsScreenSaver.obj" \
"$(LIB_PLATFORM_DST)\CMSWindowsUtil.obj" \
$(NULL)
LIB_PLATFORM_HOOK_CPP = \
"$(LIB_PLATFORM_SRC)\CSynergyHook.cpp" \
$(NULL)
LIB_PLATFORM_HOOK_OBJ = \
"$(LIB_PLATFORM_DST)\CSynergyHook.obj" \
$(NULL)
LIB_PLATFORM_HOOK_DLL = "$(BUILD_DST)\synrgyhk.dll"
LIB_PLATFORM_INC = \
/I"lib\common" \
/I"lib\arch" \
/I"lib\base" \
/I"lib\mt" \
/I"lib\io" \
/I"lib\net" \
/I"lib\synergy" \
$(NULL)
CPP_FILES = $(CPP_FILES) $(LIB_PLATFORM_CPP)
OBJ_FILES = $(OBJ_FILES) $(LIB_PLATFORM_OBJ)
LIB_FILES = $(LIB_FILES) $(LIB_PLATFORM_LIB) $(LIB_PLATFORM_HOOK_DLL)
# Hook should be as small as possible.
cpphookdebug = $(cppdebug:-Ox=-O1)
# Don't do security checks or run time error checking on hook.
cpphookflags = $(cppflags:-GS=)
cpphookdebug = $(cpphookdebug:/GZ=)
cpphookdebug = $(cpphookdebug:/RTC1=)
# Dependency rules
$(LIB_PLATFORM_OBJ): $(AUTODEP)
!if EXIST($(LIB_PLATFORM_DST)\deps.mak)
!include $(LIB_PLATFORM_DST)\deps.mak
!endif
# Build rules. Use batch-mode rules if possible.
!if DEFINED(_NMAKE_VER)
{$(LIB_PLATFORM_SRC)\}.cpp{$(LIB_PLATFORM_DST)\}.obj::
!else
{$(LIB_PLATFORM_SRC)\}.cpp{$(LIB_PLATFORM_DST)\}.obj:
!endif
@$(ECHO) Compile in $(LIB_PLATFORM_SRC)
-@$(MKDIR) $(LIB_PLATFORM_DST) 2>NUL:
$(cpp) $(cppdebug) $(cppflags) $(cppvarsmt) /showIncludes \
$(LIB_PLATFORM_INC) \
/Fo$(LIB_PLATFORM_DST)\ \
/Fd$(LIB_PLATFORM_LIB:.lib=.pdb) \
$< | $(AUTODEP) $(LIB_PLATFORM_SRC) $(LIB_PLATFORM_DST)
$(LIB_PLATFORM_LIB): $(LIB_PLATFORM_OBJ)
@$(ECHO) Link $(@F)
$(implib) $(ildebug) $(ilflags) \
/out:$@ \
$**
$(AUTODEP) $(LIB_PLATFORM_SRC) $(LIB_PLATFORM_DST) \
$(LIB_PLATFORM_OBJ:.obj=.d) $(LIB_PLATFORM_HOOK_OBJ:.obj=.d)
# Hook build rules
$(LIB_PLATFORM_HOOK_OBJ): \
$(LIB_PLATFORM_HOOK_CPP) $(LIB_PLATFORM_HOOK_CPP:.cpp=.h)
@$(ECHO) Compile $(LIB_PLATFORM_HOOK_CPP)
-@$(MKDIR) $(LIB_PLATFORM_DST) 2>NUL:
$(cpp) $(cpphookdebug) $(cpphookflags) $(cppvarsmt) /showIncludes \
-D_DLL -D_USRDLL -DSYNRGYHK_EXPORTS \
$(LIB_PLATFORM_INC) \
/Fo$(LIB_PLATFORM_DST)\ \
/Fd$(@:.obj=.pdb) \
$(LIB_PLATFORM_HOOK_CPP) | \
$(AUTODEP) $(LIB_PLATFORM_SRC) $(LIB_PLATFORM_DST)
$(LIB_PLATFORM_HOOK_DLL): $(LIB_PLATFORM_HOOK_OBJ)
@$(ECHO) Link $(@F)
$(link) $(ldebug) $(lflags) $(guilibsmt) \
/entry:"DllMain$(DLLENTRY)" /dll \
/out:$@ \
$**
$(AUTODEP) $(LIB_PLATFORM_SRC) $(LIB_PLATFORM_DST) \
$(LIB_PLATFORM_OBJ:.obj=.d) $(LIB_PLATFORM_HOOK_OBJ:.obj=.d)

View File

@ -1,190 +0,0 @@
# Microsoft Developer Studio Project File - Name="platform" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Static Library" 0x0104
CFG=platform - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE NMAKE /f "platform.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "platform.mak" CFG="platform - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "platform - Win32 Release" (based on "Win32 (x86) Static Library")
!MESSAGE "platform - Win32 Debug" (based on "Win32 (x86) Static Library")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
RSC=rc.exe
!IF "$(CFG)" == "platform - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "Release"
# PROP BASE Intermediate_Dir "Release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\gen\build"
# PROP Intermediate_Dir "..\..\gen\build"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
# ADD CPP /nologo /MT /W4 /GR /GX /O2 /I "..\common" /I "..\arch" /I "..\base" /I "..\mt" /I "..\io" /I "..\synergy" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /Fd"..\..\gen\build\platform.pdb" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
# ADD LIB32 /nologo
!ELSEIF "$(CFG)" == "platform - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "Debug"
# PROP BASE Intermediate_Dir "Debug"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\gen\debug"
# PROP Intermediate_Dir "..\..\gen\debug"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
# ADD CPP /nologo /MTd /W4 /Gm /GR /GX /ZI /Od /I "..\common" /I "..\arch" /I "..\base" /I "..\mt" /I "..\io" /I "..\synergy" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /Fd"..\..\gen\debug\platform.pdb" /FD /GZ /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
# ADD LIB32 /nologo
!ENDIF
# Begin Target
# Name "platform - Win32 Release"
# Name "platform - Win32 Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File
SOURCE=.\CMSWindowsClipboard.cpp
# End Source File
# Begin Source File
SOURCE=.\CMSWindowsClipboardAnyTextConverter.cpp
# End Source File
# Begin Source File
SOURCE=.\CMSWindowsClipboardBitmapConverter.cpp
# End Source File
# Begin Source File
SOURCE=.\CMSWindowsClipboardHTMLConverter.cpp
# End Source File
# Begin Source File
SOURCE=.\CMSWindowsClipboardTextConverter.cpp
# End Source File
# Begin Source File
SOURCE=.\CMSWindowsClipboardUTF16Converter.cpp
# End Source File
# Begin Source File
SOURCE=.\CMSWindowsDesks.cpp
# End Source File
# Begin Source File
SOURCE=.\CMSWindowsEventQueueBuffer.cpp
# End Source File
# Begin Source File
SOURCE=.\CMSWindowsKeyState.cpp
# End Source File
# Begin Source File
SOURCE=.\CMSWindowsScreen.cpp
# End Source File
# Begin Source File
SOURCE=.\CMSWindowsScreenSaver.cpp
# End Source File
# Begin Source File
SOURCE=.\CMSWindowsUtil.cpp
# End Source File
# End Group
# Begin Group "Header Files"
# PROP Default_Filter "h;hpp;hxx;hm;inl"
# Begin Source File
SOURCE=.\CMSWindowsClipboard.h
# End Source File
# Begin Source File
SOURCE=.\CMSWindowsClipboardAnyTextConverter.h
# End Source File
# Begin Source File
SOURCE=.\CMSWindowsClipboardBitmapConverter.h
# End Source File
# Begin Source File
SOURCE=.\CMSWindowsClipboardHTMLConverter.h
# End Source File
# Begin Source File
SOURCE=.\CMSWindowsClipboardTextConverter.h
# End Source File
# Begin Source File
SOURCE=.\CMSWindowsClipboardUTF16Converter.h
# End Source File
# Begin Source File
SOURCE=.\CMSWindowsDesks.h
# End Source File
# Begin Source File
SOURCE=.\CMSWindowsEventQueueBuffer.h
# End Source File
# Begin Source File
SOURCE=.\CMSWindowsKeyState.h
# End Source File
# Begin Source File
SOURCE=.\CMSWindowsScreen.h
# End Source File
# Begin Source File
SOURCE=.\CMSWindowsScreenSaver.h
# End Source File
# Begin Source File
SOURCE=.\CMSWindowsUtil.h
# End Source File
# End Group
# End Target
# End Project

View File

@ -1,116 +0,0 @@
# Microsoft Developer Studio Project File - Name="synrgyhk" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
CFG=synrgyhk - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE NMAKE /f "synrgyhk.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "synrgyhk.mak" CFG="synrgyhk - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "synrgyhk - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "synrgyhk - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
MTL=midl.exe
RSC=rc.exe
!IF "$(CFG)" == "synrgyhk - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "Release"
# PROP BASE Intermediate_Dir "Release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\build"
# PROP Intermediate_Dir "..\..\gen\build"
# PROP Ignore_Export_Lib 1
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SYNRGYHK_EXPORTS" /YX /FD /c
# ADD CPP /nologo /MT /W4 /GR /GX /O1 /I "..\common" /I "..\arch" /I "..\base" /I "..\net" /I "..\synergy" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SYNRGYHK_EXPORTS" /Fd"..\..\gen\build\synrgyhk.pdb" /FD /c
# SUBTRACT CPP /YX
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /entry:"DllMain" /dll /machine:I386 /nodefaultlib
# SUBTRACT LINK32 /verbose
!ELSEIF "$(CFG)" == "synrgyhk - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "Debug"
# PROP BASE Intermediate_Dir "Debug"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\debug"
# PROP Intermediate_Dir "..\..\gen\debug"
# PROP Ignore_Export_Lib 1
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SYNRGYHK_EXPORTS" /YX /FD /GZ /c
# ADD CPP /nologo /MTd /W4 /Gm /GR /GX /ZI /Od /I "..\common" /I "..\arch" /I "..\base" /I "..\net" /I "..\synergy" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SYNRGYHK_EXPORTS" /Fd"..\..\gen\debug\synrgyhk.pdb" /FD /GZ /c
# SUBTRACT CPP /YX
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
# SUBTRACT LINK32 /nodefaultlib
!ENDIF
# Begin Target
# Name "synrgyhk - Win32 Release"
# Name "synrgyhk - Win32 Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File
SOURCE=.\CSynergyHook.cpp
# ADD CPP /D _WIN32_WINNT=0x0400
# End Source File
# End Group
# Begin Group "Header Files"
# PROP Default_Filter "h;hpp;hxx;hm;inl"
# Begin Source File
SOURCE=.\CSynergyHook.h
# End Source File
# End Group
# Begin Group "Resource Files"
# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
# End Group
# End Target
# End Project

View File

@ -14,7 +14,7 @@
NULL = NULL =
EXTRA_DIST = \ EXTRA_DIST = \
server.dsp \ nmake.mak \
$(NULL) $(NULL)
MAINTAINERCLEANFILES = \ MAINTAINERCLEANFILES = \

83
lib/server/nmake.mak Normal file
View File

@ -0,0 +1,83 @@
# synergy -- mouse and keyboard sharing utility
# Copyright (C) 2007 Chris Schoeneman
#
# This package is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# found in the file COPYING that should have accompanied this file.
#
# This package is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
LIB_SERVER_SRC = lib\server
LIB_SERVER_DST = $(BUILD_DST)\$(LIB_SERVER_SRC)
LIB_SERVER_LIB = "$(LIB_SERVER_DST)\server.lib"
LIB_SERVER_CPP = \
"CBaseClientProxy.cpp" \
"CClientListener.cpp" \
"CClientProxy.cpp" \
"CClientProxy1_0.cpp" \
"CClientProxy1_1.cpp" \
"CClientProxy1_2.cpp" \
"CClientProxy1_3.cpp" \
"CClientProxyUnknown.cpp" \
"CConfig.cpp" \
"CInputFilter.cpp" \
"CPrimaryClient.cpp" \
"CServer.cpp" \
$(NULL)
LIB_SERVER_OBJ = \
"$(LIB_SERVER_DST)\CBaseClientProxy.obj" \
"$(LIB_SERVER_DST)\CClientListener.obj" \
"$(LIB_SERVER_DST)\CClientProxy.obj" \
"$(LIB_SERVER_DST)\CClientProxy1_0.obj" \
"$(LIB_SERVER_DST)\CClientProxy1_1.obj" \
"$(LIB_SERVER_DST)\CClientProxy1_2.obj" \
"$(LIB_SERVER_DST)\CClientProxy1_3.obj" \
"$(LIB_SERVER_DST)\CClientProxyUnknown.obj" \
"$(LIB_SERVER_DST)\CConfig.obj" \
"$(LIB_SERVER_DST)\CInputFilter.obj" \
"$(LIB_SERVER_DST)\CPrimaryClient.obj" \
"$(LIB_SERVER_DST)\CServer.obj" \
$(NULL)
LIB_SERVER_INC = \
/I"lib\common" \
/I"lib\arch" \
/I"lib\base" \
/I"lib\mt" \
/I"lib\io" \
/I"lib\net" \
/I"lib\synergy" \
/I"lib\platform" \
$(NULL)
CPP_FILES = $(CPP_FILES) $(LIB_SERVER_CPP)
OBJ_FILES = $(OBJ_FILES) $(LIB_SERVER_OBJ)
LIB_FILES = $(LIB_FILES) $(LIB_SERVER_LIB)
# Dependency rules
$(LIB_SERVER_OBJ): $(AUTODEP)
!if EXIST($(LIB_SERVER_DST)\deps.mak)
!include $(LIB_SERVER_DST)\deps.mak
!endif
# Build rules. Use batch-mode rules if possible.
!if DEFINED(_NMAKE_VER)
{$(LIB_SERVER_SRC)\}.cpp{$(LIB_SERVER_DST)\}.obj::
!else
{$(LIB_SERVER_SRC)\}.cpp{$(LIB_SERVER_DST)\}.obj:
!endif
@$(ECHO) Compile in $(LIB_SERVER_SRC)
-@$(MKDIR) $(LIB_SERVER_DST) 2>NUL:
$(cpp) $(cppdebug) $(cppflags) $(cppvarsmt) /showIncludes \
$(LIB_SERVER_INC) \
/Fo$(LIB_SERVER_DST)\ \
/Fd$(LIB_SERVER_LIB:.lib=.pdb) \
$< | $(AUTODEP) $(LIB_SERVER_SRC) $(LIB_SERVER_DST)
$(LIB_SERVER_LIB): $(LIB_SERVER_OBJ)
@$(ECHO) Link $(@F)
$(implib) $(ildebug) $(ilflags) \
/out:$@ \
$**
$(AUTODEP) $(LIB_SERVER_SRC) $(LIB_SERVER_DST) $(**:.obj=.d)

View File

@ -1,194 +0,0 @@
# Microsoft Developer Studio Project File - Name="server" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Static Library" 0x0104
CFG=server - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE NMAKE /f "server.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "server.mak" CFG="server - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "server - Win32 Release" (based on "Win32 (x86) Static Library")
!MESSAGE "server - Win32 Debug" (based on "Win32 (x86) Static Library")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
RSC=rc.exe
!IF "$(CFG)" == "server - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "Release"
# PROP BASE Intermediate_Dir "Release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\gen\build"
# PROP Intermediate_Dir "..\..\gen\build"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
# ADD CPP /nologo /MT /W4 /GR /GX /O2 /I "..\common" /I "..\arch" /I "..\base" /I "..\mt" /I "..\io" /I "..\net" /I "..\synergy" /I "..\platform" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /Fd"..\..\gen\build\server.pdb" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
# ADD LIB32 /nologo
!ELSEIF "$(CFG)" == "server - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "Debug"
# PROP BASE Intermediate_Dir "Debug"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\gen\debug"
# PROP Intermediate_Dir "..\..\gen\debug"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
# ADD CPP /nologo /MTd /W4 /Gm /GR /GX /ZI /Od /I "..\common" /I "..\arch" /I "..\base" /I "..\mt" /I "..\io" /I "..\net" /I "..\synergy" /I "..\platform" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /Fd"..\..\gen\debug\server.pdb" /FD /GZ /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
# ADD LIB32 /nologo
!ENDIF
# Begin Target
# Name "server - Win32 Release"
# Name "server - Win32 Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File
SOURCE=.\CBaseClientProxy.cpp
# End Source File
# Begin Source File
SOURCE=.\CClientListener.cpp
# End Source File
# Begin Source File
SOURCE=.\CClientProxy.cpp
# End Source File
# Begin Source File
SOURCE=.\CClientProxy1_0.cpp
# End Source File
# Begin Source File
SOURCE=.\CClientProxy1_1.cpp
# End Source File
# Begin Source File
SOURCE=.\CClientProxy1_2.cpp
# End Source File
# Begin Source File
SOURCE=.\CClientProxy1_3.cpp
# End Source File
# Begin Source File
SOURCE=.\CClientProxyUnknown.cpp
# End Source File
# Begin Source File
SOURCE=.\CConfig.cpp
# End Source File
# Begin Source File
SOURCE=.\CInputFilter.cpp
# End Source File
# Begin Source File
SOURCE=.\CPrimaryClient.cpp
# End Source File
# Begin Source File
SOURCE=.\CServer.cpp
# End Source File
# End Group
# Begin Group "Header Files"
# PROP Default_Filter "h;hpp;hxx;hm;inl"
# Begin Source File
SOURCE=.\CBaseClientProxy.h
# End Source File
# Begin Source File
SOURCE=.\CClientListener.h
# End Source File
# Begin Source File
SOURCE=.\CClientProxy.h
# End Source File
# Begin Source File
SOURCE=.\CClientProxy1_0.h
# End Source File
# Begin Source File
SOURCE=.\CClientProxy1_1.h
# End Source File
# Begin Source File
SOURCE=.\CClientProxy1_2.h
# End Source File
# Begin Source File
SOURCE=.\CClientProxy1_3.h
# End Source File
# Begin Source File
SOURCE=.\CClientProxyUnknown.h
# End Source File
# Begin Source File
SOURCE=.\CConfig.h
# End Source File
# Begin Source File
SOURCE=.\CInputFilter.h
# End Source File
# Begin Source File
SOURCE=.\CPrimaryClient.h
# End Source File
# Begin Source File
SOURCE=.\CServer.h
# End Source File
# End Group
# Begin Group "Resource Files"
# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
# End Group
# End Target
# End Project

View File

@ -14,7 +14,7 @@
NULL = NULL =
EXTRA_DIST = \ EXTRA_DIST = \
libsynergy.dsp \ nmake.mak \
$(NULL) $(NULL)
MAINTAINERCLEANFILES = \ MAINTAINERCLEANFILES = \

View File

@ -1,246 +0,0 @@
# Microsoft Developer Studio Project File - Name="libsynergy" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Static Library" 0x0104
CFG=libsynergy - Win32 Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE NMAKE /f "libsynergy.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "libsynergy.mak" CFG="libsynergy - Win32 Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "libsynergy - Win32 Release" (based on "Win32 (x86) Static Library")
!MESSAGE "libsynergy - Win32 Debug" (based on "Win32 (x86) Static Library")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
RSC=rc.exe
!IF "$(CFG)" == "libsynergy - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "Release"
# PROP BASE Intermediate_Dir "Release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\gen\build"
# PROP Intermediate_Dir "..\..\gen\build"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
# ADD CPP /nologo /MT /W4 /GR /GX /O2 /I "..\common" /I "..\arch" /I "..\base" /I "..\io" /I "..\mt" /I "..\net" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /Fd"..\..\gen\build\libsynergy.pdb" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
# ADD LIB32 /nologo
!ELSEIF "$(CFG)" == "libsynergy - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "Debug"
# PROP BASE Intermediate_Dir "Debug"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\gen\debug"
# PROP Intermediate_Dir "..\..\gen\debug"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
# ADD CPP /nologo /MTd /W4 /Gm /GR /GX /ZI /Od /I "..\common" /I "..\arch" /I "..\base" /I "..\io" /I "..\mt" /I "..\net" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /Fd"..\..\gen\debug\libsynergy.pdb" /FD /GZ /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
# ADD LIB32 /nologo
!ENDIF
# Begin Target
# Name "libsynergy - Win32 Release"
# Name "libsynergy - Win32 Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File
SOURCE=.\CClipboard.cpp
# End Source File
# Begin Source File
SOURCE=.\CKeyMap.cpp
# End Source File
# Begin Source File
SOURCE=.\CKeyState.cpp
# End Source File
# Begin Source File
SOURCE=.\CPacketStreamFilter.cpp
# End Source File
# Begin Source File
SOURCE=.\CPlatformScreen.cpp
# End Source File
# Begin Source File
SOURCE=.\CProtocolUtil.cpp
# End Source File
# Begin Source File
SOURCE=.\CScreen.cpp
# End Source File
# Begin Source File
SOURCE=.\IClipboard.cpp
# End Source File
# Begin Source File
SOURCE=.\IKeyState.cpp
# End Source File
# Begin Source File
SOURCE=.\IPrimaryScreen.cpp
# End Source File
# Begin Source File
SOURCE=.\IScreen.cpp
# End Source File
# Begin Source File
SOURCE=.\KeyTypes.cpp
# End Source File
# Begin Source File
SOURCE=.\ProtocolTypes.cpp
# End Source File
# Begin Source File
SOURCE=.\XScreen.cpp
# End Source File
# Begin Source File
SOURCE=.\XSynergy.cpp
# End Source File
# End Group
# Begin Group "Header Files"
# PROP Default_Filter "h;hpp;hxx;hm;inl"
# Begin Source File
SOURCE=.\CClipboard.h
# End Source File
# Begin Source File
SOURCE=.\CKeyMap.h
# End Source File
# Begin Source File
SOURCE=.\CKeyState.h
# End Source File
# Begin Source File
SOURCE=.\ClipboardTypes.h
# End Source File
# Begin Source File
SOURCE=.\CPacketStreamFilter.h
# End Source File
# Begin Source File
SOURCE=.\CPlatformScreen.h
# End Source File
# Begin Source File
SOURCE=.\CProtocolUtil.h
# End Source File
# Begin Source File
SOURCE=.\CScreen.h
# End Source File
# Begin Source File
SOURCE=.\IClient.h
# End Source File
# Begin Source File
SOURCE=.\IClipboard.h
# End Source File
# Begin Source File
SOURCE=.\IKeyState.h
# End Source File
# Begin Source File
SOURCE=.\IPlatformScreen.h
# End Source File
# Begin Source File
SOURCE=.\IPrimaryScreen.h
# End Source File
# Begin Source File
SOURCE=.\IScreen.h
# End Source File
# Begin Source File
SOURCE=.\IScreenSaver.h
# End Source File
# Begin Source File
SOURCE=.\ISecondaryScreen.h
# End Source File
# Begin Source File
SOURCE=.\KeyTypes.h
# End Source File
# Begin Source File
SOURCE=.\MouseTypes.h
# End Source File
# Begin Source File
SOURCE=.\OptionTypes.h
# End Source File
# Begin Source File
SOURCE=.\ProtocolTypes.h
# End Source File
# Begin Source File
SOURCE=.\XScreen.h
# End Source File
# Begin Source File
SOURCE=.\XSynergy.h
# End Source File
# End Group
# Begin Group "Resource Files"
# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
# End Group
# End Target
# End Project

87
lib/synergy/nmake.mak Normal file
View File

@ -0,0 +1,87 @@
# synergy -- mouse and keyboard sharing utility
# Copyright (C) 2007 Chris Schoeneman
#
# This package is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# found in the file COPYING that should have accompanied this file.
#
# This package is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
LIB_SYNERGY_SRC = lib\synergy
LIB_SYNERGY_DST = $(BUILD_DST)\$(LIB_SYNERGY_SRC)
LIB_SYNERGY_LIB = "$(LIB_SYNERGY_DST)\libsynergy.lib"
LIB_SYNERGY_CPP = \
"CClipboard.cpp" \
"CKeyMap.cpp" \
"CKeyState.cpp" \
"CPacketStreamFilter.cpp" \
"CPlatformScreen.cpp" \
"CProtocolUtil.cpp" \
"CScreen.cpp" \
"IClipboard.cpp" \
"IKeyState.cpp" \
"IPrimaryScreen.cpp" \
"IScreen.cpp" \
"KeyTypes.cpp" \
"ProtocolTypes.cpp" \
"XScreen.cpp" \
"XSynergy.cpp" \
$(NULL)
LIB_SYNERGY_OBJ = \
"$(LIB_SYNERGY_DST)\CClipboard.obj" \
"$(LIB_SYNERGY_DST)\CKeyMap.obj" \
"$(LIB_SYNERGY_DST)\CKeyState.obj" \
"$(LIB_SYNERGY_DST)\CPacketStreamFilter.obj" \
"$(LIB_SYNERGY_DST)\CPlatformScreen.obj" \
"$(LIB_SYNERGY_DST)\CProtocolUtil.obj" \
"$(LIB_SYNERGY_DST)\CScreen.obj" \
"$(LIB_SYNERGY_DST)\IClipboard.obj" \
"$(LIB_SYNERGY_DST)\IKeyState.obj" \
"$(LIB_SYNERGY_DST)\IPrimaryScreen.obj" \
"$(LIB_SYNERGY_DST)\IScreen.obj" \
"$(LIB_SYNERGY_DST)\KeyTypes.obj" \
"$(LIB_SYNERGY_DST)\ProtocolTypes.obj" \
"$(LIB_SYNERGY_DST)\XScreen.obj" \
"$(LIB_SYNERGY_DST)\XSynergy.obj" \
$(NULL)
LIB_SYNERGY_INC = \
/I"lib\common" \
/I"lib\arch" \
/I"lib\base" \
/I"lib\mt" \
/I"lib\io" \
/I"lib\net" \
$(NULL)
CPP_FILES = $(CPP_FILES) $(LIB_SYNERGY_CPP)
OBJ_FILES = $(OBJ_FILES) $(LIB_SYNERGY_OBJ)
LIB_FILES = $(LIB_FILES) $(LIB_SYNERGY_LIB)
# Dependency rules
$(LIB_SYNERGY_OBJ): $(AUTODEP)
!if EXIST($(LIB_SYNERGY_DST)\deps.mak)
!include $(LIB_SYNERGY_DST)\deps.mak
!endif
# Build rules. Use batch-mode rules if possible.
!if DEFINED(_NMAKE_VER)
{$(LIB_SYNERGY_SRC)\}.cpp{$(LIB_SYNERGY_DST)\}.obj::
!else
{$(LIB_SYNERGY_SRC)\}.cpp{$(LIB_SYNERGY_DST)\}.obj:
!endif
@$(ECHO) Compile in $(LIB_SYNERGY_SRC)
-@$(MKDIR) $(LIB_SYNERGY_DST) 2>NUL:
$(cpp) $(cppdebug) $(cppflags) $(cppvarsmt) /showIncludes \
$(LIB_SYNERGY_INC) \
/Fo$(LIB_SYNERGY_DST)\ \
/Fd$(LIB_SYNERGY_LIB:.lib=.pdb) \
$< | $(AUTODEP) $(LIB_SYNERGY_SRC) $(LIB_SYNERGY_DST)
$(LIB_SYNERGY_LIB): $(LIB_SYNERGY_OBJ)
@$(ECHO) Link $(@F)
$(implib) $(ildebug) $(ilflags) \
/out:$@ \
$**
$(AUTODEP) $(LIB_SYNERGY_SRC) $(LIB_SYNERGY_DST) $(**:.obj=.d)

145
nmake.mak Normal file
View File

@ -0,0 +1,145 @@
# synergy -- mouse and keyboard sharing utility
# Copyright (C) 2007 Chris Schoeneman
#
# This package is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# found in the file COPYING that should have accompanied this file.
#
# This package is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
# Name of this file for recursive make
MAKEFILE = nmake.mak
# Default build is release is NODEBUG is defined, debug otherwise.
!if !DEFINED(DEBUG)
NODEBUG = 1
!else
!undef NODEBUG
!endif
# Build all by default
default: all
# Redefine implicit rule suffixes
.SUFFIXES:
.SUFFIXES: .cpp .rc .obj
# Shut up
.SILENT:
# Include system macros
#APPVER = 5.0
#TARGETOS = WINNT
!include <win32.mak>
# Be explicit about C++ compiler
cpp = $(cc)
cppdebug = $(cdebug)
cppflags = $(cflags)
cppvarsmt = $(cvarsmt)
# Library tool options
ildebug =
ilflags = /nologo
# Handy macro for defining list macros
NULL =
# System commands
ECHO = echo
MKDIR = mkdir
RM = del /f
RMR = rmdir /q /s
# Local build utilities
UTIL_DIR = win32util
AUTODEP = "$(UTIL_DIR)\autodep.exe"
# Destination for intermediate build targets
BUILD_DIR = build
BUILD_DEBUG_DIR = $(BUILD_DIR)\Debug
BUILD_RELEASE_DIR = $(BUILD_DIR)\Release
!if DEFINED(NODEBUG)
BUILD_DST = $(BUILD_RELEASE_DIR)
!else
BUILD_DST = $(BUILD_DEBUG_DIR)
!endif
# Compiler argument changes
cflags = $(cflags:-W3=-W4) /WX
cflags = $(cflags) -D_CRT_SECURE_NO_DEPRECATE
cflags = $(cflags) /GR
!if !DEFINED(OLDCOMPILER)
cflags = $(cflags) /EHsc
!else
cflags = $(cflags) /GX
!endif
!if !DEFINED(NODEBUG)
!if !DEFINED(OLDCOMPILER)
cdebug = $(cdebug) /RTC1
!else
cdebug = $(cdebug) /GZ
!endif
!endif
# Initialize variables for library and program makefiles
C_FILES =
CPP_FILES =
OBJ_FILES =
LIB_FILES =
PROGRAMS =
OPTPROGRAMS = $(AUTODEP)
# Include subdirectory makefiles
!include lib\common\$(MAKEFILE)
!include lib\arch\$(MAKEFILE)
!include lib\base\$(MAKEFILE)
!include lib\mt\$(MAKEFILE)
!include lib\io\$(MAKEFILE)
!include lib\net\$(MAKEFILE)
!include lib\synergy\$(MAKEFILE)
!include lib\platform\$(MAKEFILE)
!include lib\client\$(MAKEFILE)
!include lib\server\$(MAKEFILE)
!include cmd\synergyc\$(MAKEFILE)
!include cmd\synergys\$(MAKEFILE)
!include cmd\launcher\$(MAKEFILE)
!include dist\nullsoft\$(MAKEFILE)
# Collect library and program variables
INTERMEDIATES = $(OBJ_FILES) $(AUTODEP:.exe=.obj)
TARGETS = $(LIB_FILES) $(PROGRAMS)
OPTTARGETS = $(OPTPROGRAMS)
# Build release by reinvoking make with NODEBUG defined
release:
@$(MAKE) /nologo /f $(MAKEFILE) NODEBUG=1
# Build debug by reinvoking make with DEBUG defined
debug:
@$(MAKE) /nologo /f $(MAKEFILE) DEBUG=1
# Build all targets
all: $(TARGETS)
# Clean intermediate targets
clean:
-$(RMR) $(BUILD_DEBUG_DIR)
-$(RMR) $(BUILD_RELEASE_DIR)
# Clean all targets
clobber: clean
-$(RMR) $(BUILD_DIR)
# Utility command build rules
$(AUTODEP): $(AUTODEP:.exe=.cpp)
!if DEFINED(NODEBUG)
@$(ECHO) Build $(@F)
$(cpp) $(cppdebug) $(cppflags) $(cppvars) /Fo"$(**:.cpp=.obj)" $**
$(link) $(ldebug) $(conflags) -out:$@ $(**:.cpp=.obj) $(conlibs)
!else
@$(MAKE) /nologo /f $(MAKEFILE) NODEBUG=1 $@
!endif

View File

@ -1,332 +0,0 @@
Microsoft Developer Studio Workspace File, Format Version 6.00
# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
###############################################################################
Project: "all"=".\all.dsp" - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
Begin Project Dependency
Project_Dep_Name launcher
End Project Dependency
}}}
###############################################################################
Project: "arch"=".\lib\arch\arch.dsp" - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "base"=".\lib\base\base.dsp" - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "client"=".\lib\client\client.dsp" - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "common"=".\lib\common\common.dsp" - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "exec"=".\cmd\exec.dsp" - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
Begin Project Dependency
Project_Dep_Name synergyc
End Project Dependency
Begin Project Dependency
Project_Dep_Name synergys
End Project Dependency
}}}
###############################################################################
Project: "installer"=".\DIST\NULLSOFT\installer.dsp" - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "io"=".\lib\io\io.dsp" - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "launcher"=".\cmd\launcher\launcher.dsp" - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
Begin Project Dependency
Project_Dep_Name common
End Project Dependency
Begin Project Dependency
Project_Dep_Name arch
End Project Dependency
Begin Project Dependency
Project_Dep_Name base
End Project Dependency
Begin Project Dependency
Project_Dep_Name exec
End Project Dependency
Begin Project Dependency
Project_Dep_Name io
End Project Dependency
Begin Project Dependency
Project_Dep_Name libsynergy
End Project Dependency
Begin Project Dependency
Project_Dep_Name mt
End Project Dependency
Begin Project Dependency
Project_Dep_Name net
End Project Dependency
Begin Project Dependency
Project_Dep_Name platform
End Project Dependency
Begin Project Dependency
Project_Dep_Name server
End Project Dependency
}}}
###############################################################################
Project: "libsynergy"=".\lib\synergy\libsynergy.dsp" - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "makehook"=".\lib\platform\makehook.dsp" - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
Begin Project Dependency
Project_Dep_Name synrgyhk
End Project Dependency
}}}
###############################################################################
Project: "mt"=".\lib\mt\mt.dsp" - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "net"=".\lib\net\net.dsp" - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "platform"=".\lib\platform\platform.dsp" - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "server"=".\lib\server\server.dsp" - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "synergyc"=".\cmd\synergyc\synergyc.dsp" - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
Begin Project Dependency
Project_Dep_Name common
End Project Dependency
Begin Project Dependency
Project_Dep_Name arch
End Project Dependency
Begin Project Dependency
Project_Dep_Name base
End Project Dependency
Begin Project Dependency
Project_Dep_Name io
End Project Dependency
Begin Project Dependency
Project_Dep_Name mt
End Project Dependency
Begin Project Dependency
Project_Dep_Name net
End Project Dependency
Begin Project Dependency
Project_Dep_Name libsynergy
End Project Dependency
Begin Project Dependency
Project_Dep_Name platform
End Project Dependency
Begin Project Dependency
Project_Dep_Name client
End Project Dependency
}}}
###############################################################################
Project: "synergys"=".\cmd\synergys\synergys.dsp" - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
Begin Project Dependency
Project_Dep_Name common
End Project Dependency
Begin Project Dependency
Project_Dep_Name arch
End Project Dependency
Begin Project Dependency
Project_Dep_Name base
End Project Dependency
Begin Project Dependency
Project_Dep_Name io
End Project Dependency
Begin Project Dependency
Project_Dep_Name mt
End Project Dependency
Begin Project Dependency
Project_Dep_Name net
End Project Dependency
Begin Project Dependency
Project_Dep_Name libsynergy
End Project Dependency
Begin Project Dependency
Project_Dep_Name platform
End Project Dependency
Begin Project Dependency
Project_Dep_Name makehook
End Project Dependency
Begin Project Dependency
Project_Dep_Name server
End Project Dependency
}}}
###############################################################################
Project: "synrgyhk"=".\lib\platform\synrgyhk.dsp" - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Global:
Package=<5>
{{{
}}}
Package=<3>
{{{
}}}
###############################################################################

File diff suppressed because it is too large Load Diff

149
win32util/autodep.cpp Normal file
View File

@ -0,0 +1,149 @@
#include <fstream>
#include <iostream>
#include <locale>
#include <set>
#include <string>
using namespace std;
static
string
baseName(const string& filename)
{
return filename.substr(0, filename.rfind('.'));
}
static
int
writeMakefile(const string& dstdir, const set<string>& depFilenames)
{
string makeFilename = dstdir + "\\deps.mak";
ofstream makeFile(makeFilename.c_str());
if (!makeFile) {
cerr << "Can't open '" << makeFilename << "' for writing" << endl;
return 1;
}
for (set<string>::const_iterator i = depFilenames.begin();
i != depFilenames.end(); ++i) {
makeFile << "!if EXIST(\"" << *i << "\")" << endl;
makeFile << "!include \"" << *i << "\"" << endl;
makeFile << "!endif" << endl;
}
return 0;
}
static
void
writeDependencies(
const string& filename,
const string& srcdir,
const string& dstdir,
const set<string>& paths)
{
string basename = baseName(filename);
string depFilename = dstdir + "\\" + basename + ".d";
ofstream depFile(depFilename.c_str());
if (!depFile) {
cerr << "Can't open '" << depFilename << "' for writing" << endl;
return;
}
// Write dependencies rule for filename
depFile << "\"" << dstdir << "\\" << basename << ".obj\": \"" <<
srcdir << "\\" << filename << "\" \\" << endl;
for (set<string>::const_iterator i = paths.begin(); i != paths.end(); ++i) {
depFile << "\t\"" << *i << "\" \\" << endl;
}
depFile << "\t$(NULL)" << endl;
}
static
int
writeDepfiles(const string& srcdir, const string& dstdir)
{
const string includeLine = "Note: including file:";
// Parse stdin
string line;
string filename;
set<string> paths;
locale loc = locale::classic();
const ctype<char>& ct = use_facet<ctype<char> >(loc);
while (getline(cin, line)) {
bool echo = true;
// Check for include line
if (line.compare(0, includeLine.length(), includeLine) == 0) {
// Strip includeLine and leading spaces
line.erase(0, line.find_first_not_of(" ", includeLine.length()));
if (line.length() == 0) {
continue;
}
// Uppercase all drive letters
if (line.length() > 2 && line[1] == ':') {
line[0] = ct.toupper(line[0]);
}
// Record path
paths.insert(line);
echo = false;
}
// Maybe a source filename
else if (line.rfind(".cpp") == line.length() - 4) {
// Write dependencies for previous source file
if (filename.length() != 0) {
writeDependencies(filename, srcdir, dstdir, paths);
paths.clear();
}
filename = line;
}
// Otherwise other output
else {
// do nothing
}
if (echo) {
cout << line << endl;
}
}
// Write dependencies for last source file
if (filename.length() != 0) {
writeDependencies(filename, srcdir, dstdir, paths);
paths.clear();
}
return 0;
}
int
main(int argc, char** argv)
{
if (argc < 3) {
cerr << "usage: " << argv[0] <<
" <src-directory> <dst-directory> [<depfiles>]" << endl;
return 1;
}
string srcdir = argv[1];
string dstdir = argv[2];
// If depfiles were supplied then create a makefile in outdir to load
// all of them.
int result;
if (argc > 3) {
set<string> depFilenames(argv + 3, argv + argc);
result = writeMakefile(dstdir, depFilenames);
}
// Otherwise parse stdin and create a depfile for each listed file
else {
result = writeDepfiles(srcdir, dstdir);
}
return result;
}