diff --git a/Makefile.am b/Makefile.am index 52c2c014..ab3bf2b0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,13 +4,6 @@ DEPTH = . EXTRA_DIST = SUBDIRS = \ - base \ - mt \ - io \ - http \ - net \ - synergy \ - platform \ - client \ - server \ + lib \ + cmd \ $(NULL) diff --git a/client/Makefile.am b/client/Makefile.am deleted file mode 100644 index 5c06a480..00000000 --- a/client/Makefile.am +++ /dev/null @@ -1,38 +0,0 @@ -## Process this file with automake to produce Makefile.in -NULL = -DEPTH = .. - -bin_PROGRAMS = synergy -synergy_SOURCES = \ - CClient.cpp \ - CSecondaryScreen.cpp \ - CServerProxy.cpp \ - CXWindowsSecondaryScreen.cpp \ - client.cpp \ - CClient.h \ - CSecondaryScreen.h \ - CServerProxy.h \ - CXWindowsSecondaryScreen.h \ - $(NULL) -synergy_LDADD = \ - $(DEPTH)/platform/libplatform.a \ - $(DEPTH)/synergy/libsynergy.a \ - $(DEPTH)/net/libnet.a \ - $(DEPTH)/io/libio.a \ - $(DEPTH)/mt/libmt.a \ - $(DEPTH)/base/libbase.a \ - $(X_LIBS) \ - $(X_PRE_LIBS) \ - -lXtst \ - -lXext \ - -lX11 \ - $(X_EXTRA_LIBS) \ - $(NULL) -INCLUDES = \ - -I$(DEPTH)/base \ - -I$(DEPTH)/mt \ - -I$(DEPTH)/io \ - -I$(DEPTH)/net \ - -I$(DEPTH)/synergy \ - -I$(DEPTH)/platform \ - $(NULL) diff --git a/cmd/Makefile.am b/cmd/Makefile.am new file mode 100644 index 00000000..7219f8ee --- /dev/null +++ b/cmd/Makefile.am @@ -0,0 +1,9 @@ +## Process this file with automake to produce Makefile.in +NULL = +DEPTH = .. + +EXTRA_DIST = +SUBDIRS = \ + synergy \ + synergyd \ + $(NULL) diff --git a/cmd/synergy/Makefile.am b/cmd/synergy/Makefile.am new file mode 100644 index 00000000..3b48a5a5 --- /dev/null +++ b/cmd/synergy/Makefile.am @@ -0,0 +1,32 @@ +## Process this file with automake to produce Makefile.in +NULL = +DEPTH = ../.. + +bin_PROGRAMS = synergy +synergy_SOURCES = \ + synergy.cpp \ + $(NULL) +synergy_LDADD = \ + $(DEPTH)/lib/client/libclient.a \ + $(DEPTH)/lib/platform/libplatform.a \ + $(DEPTH)/lib/synergy/libsynergy.a \ + $(DEPTH)/lib/net/libnet.a \ + $(DEPTH)/lib/io/libio.a \ + $(DEPTH)/lib/mt/libmt.a \ + $(DEPTH)/lib/base/libbase.a \ + $(X_LIBS) \ + $(X_PRE_LIBS) \ + -lXtst \ + -lXext \ + -lX11 \ + $(X_EXTRA_LIBS) \ + $(NULL) +INCLUDES = \ + -I$(DEPTH)/lib/base \ + -I$(DEPTH)/lib/mt \ + -I$(DEPTH)/lib/io \ + -I$(DEPTH)/lib/net \ + -I$(DEPTH)/lib/synergy \ + -I$(DEPTH)/lib/platform \ + -I$(DEPTH)/lib/client \ + $(NULL) diff --git a/client/resource.h b/cmd/synergy/resource.h similarity index 100% rename from client/resource.h rename to cmd/synergy/resource.h diff --git a/client/client.cpp b/cmd/synergy/synergy.cpp similarity index 100% rename from client/client.cpp rename to cmd/synergy/synergy.cpp diff --git a/client/client.dsp b/cmd/synergy/synergy.dsp similarity index 70% rename from client/client.dsp rename to cmd/synergy/synergy.dsp index d48c3aaf..991cdc26 100644 --- a/client/client.dsp +++ b/cmd/synergy/synergy.dsp @@ -1,24 +1,24 @@ -# Microsoft Developer Studio Project File - Name="client" - Package Owner=<4> +# Microsoft Developer Studio Project File - Name="synergy" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Application" 0x0101 -CFG=client - Win32 Debug +CFG=synergy - 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 NMAKE /f "synergy.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 NMAKE /f "synergy.mak" CFG="synergy - Win32 Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "client - Win32 Release" (based on "Win32 (x86) Application") -!MESSAGE "client - Win32 Debug" (based on "Win32 (x86) Application") +!MESSAGE "synergy - Win32 Release" (based on "Win32 (x86) Application") +!MESSAGE "synergy - Win32 Debug" (based on "Win32 (x86) Application") !MESSAGE # Begin Project @@ -29,7 +29,7 @@ CPP=cl.exe MTL=midl.exe RSC=rc.exe -!IF "$(CFG)" == "client - Win32 Release" +!IF "$(CFG)" == "synergy - Win32 Release" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 @@ -38,12 +38,12 @@ RSC=rc.exe # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "../Release" +# PROP Output_Dir "../../Release" # PROP Intermediate_Dir "Release" # 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 /GX /O2 /I "..\base" /I "..\io" /I "..\mt" /I "..\net" /I "..\synergy" /I "..\platform" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /FD /c +# ADD CPP /nologo /MT /W4 /GX /O2 /I "..\base" /I "..\io" /I "..\mt" /I "..\net" /I "..\synergy" /I "..\platform" /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 /c # SUBTRACT CPP /YX # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 @@ -54,9 +54,9 @@ BSC32=bscmake.exe # 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:"../Release/synergy.exe" +# 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)" == "client - Win32 Debug" +!ELSEIF "$(CFG)" == "synergy - Win32 Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 @@ -65,12 +65,12 @@ LINK32=link.exe # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "../Debug" +# PROP Output_Dir "../../Debug" # PROP Intermediate_Dir "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 /GX /ZI /Od /I "..\base" /I "..\io" /I "..\mt" /I "..\net" /I "..\synergy" /I "..\platform" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /FD /GZ /c +# ADD CPP /nologo /MTd /W4 /Gm /GX /ZI /Od /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 /GZ /c # SUBTRACT CPP /YX # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 @@ -81,40 +81,24 @@ BSC32=bscmake.exe # 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 +# 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 "client - Win32 Release" -# Name "client - Win32 Debug" +# Name "synergy - Win32 Release" +# Name "synergy - 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 +SOURCE=.\synergy.cpp # End Source File # Begin Source File -SOURCE=.\client.cpp -# End Source File -# Begin Source File - -SOURCE=.\client.rc -# End Source File -# Begin Source File - -SOURCE=.\CMSWindowsSecondaryScreen.cpp -# End Source File -# Begin Source File - -SOURCE=.\CSecondaryScreen.cpp -# End Source File -# Begin Source File - -SOURCE=.\CServerProxy.cpp +SOURCE=.\synergy.rc # End Source File # End Group # Begin Group "Header Files" @@ -122,22 +106,6 @@ SOURCE=.\CServerProxy.cpp # PROP Default_Filter "h;hpp;hxx;hm;inl" # Begin Source File -SOURCE=.\CClient.h -# End Source File -# Begin Source File - -SOURCE=.\CMSWindowsSecondaryScreen.h -# End Source File -# Begin Source File - -SOURCE=.\CSecondaryScreen.h -# End Source File -# Begin Source File - -SOURCE=.\CServerProxy.h -# End Source File -# Begin Source File - SOURCE=.\resource.h # End Source File # End Group diff --git a/client/client.rc b/cmd/synergy/synergy.rc similarity index 100% rename from client/client.rc rename to cmd/synergy/synergy.rc diff --git a/cmd/synergyd/Makefile.am b/cmd/synergyd/Makefile.am new file mode 100644 index 00000000..e0a424b2 --- /dev/null +++ b/cmd/synergyd/Makefile.am @@ -0,0 +1,34 @@ +## Process this file with automake to produce Makefile.in +NULL = +DEPTH = ../.. + +bin_PROGRAMS = synergyd +synergyd_SOURCES = \ + synergyd.cpp \ + $(NULL) +synergyd_LDADD = \ + $(DEPTH)/lib/server/libserver.a \ + $(DEPTH)/lib/platform/libplatform.a \ + $(DEPTH)/lib/synergy/libsynergy.a \ + $(DEPTH)/lib/net/libnet.a \ + $(DEPTH)/lib/http/libhttp.a \ + $(DEPTH)/lib/io/libio.a \ + $(DEPTH)/lib/mt/libmt.a \ + $(DEPTH)/lib/base/libbase.a \ + $(X_LIBS) \ + $(X_PRE_LIBS) \ + -lXtst \ + -lXext \ + -lX11 \ + $(X_EXTRA_LIBS) \ + $(NULL) +INCLUDES = \ + -I$(DEPTH)/lib/base \ + -I$(DEPTH)/lib/mt \ + -I$(DEPTH)/lib/io \ + -I$(DEPTH)/lib/http \ + -I$(DEPTH)/lib/net \ + -I$(DEPTH)/lib/synergy \ + -I$(DEPTH)/lib/platform \ + -I$(DEPTH)/lib/server \ + $(NULL) diff --git a/server/resource.h b/cmd/synergyd/resource.h similarity index 100% rename from server/resource.h rename to cmd/synergyd/resource.h diff --git a/server/server.cpp b/cmd/synergyd/synergyd.cpp similarity index 100% rename from server/server.cpp rename to cmd/synergyd/synergyd.cpp diff --git a/server/server.dsp b/cmd/synergyd/synergyd.dsp similarity index 60% rename from server/server.dsp rename to cmd/synergyd/synergyd.dsp index 61acba15..f7665026 100644 --- a/server/server.dsp +++ b/cmd/synergyd/synergyd.dsp @@ -1,24 +1,24 @@ -# Microsoft Developer Studio Project File - Name="server" - Package Owner=<4> +# Microsoft Developer Studio Project File - Name="synergyd" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Application" 0x0101 -CFG=server - Win32 Debug +CFG=synergyd - 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 NMAKE /f "synergyd.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 NMAKE /f "synergyd.mak" CFG="synergyd - Win32 Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "server - Win32 Release" (based on "Win32 (x86) Application") -!MESSAGE "server - Win32 Debug" (based on "Win32 (x86) Application") +!MESSAGE "synergyd - Win32 Release" (based on "Win32 (x86) Application") +!MESSAGE "synergyd - Win32 Debug" (based on "Win32 (x86) Application") !MESSAGE # Begin Project @@ -29,7 +29,7 @@ CPP=cl.exe MTL=midl.exe RSC=rc.exe -!IF "$(CFG)" == "server - Win32 Release" +!IF "$(CFG)" == "synergyd - Win32 Release" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 @@ -38,12 +38,12 @@ RSC=rc.exe # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "../Release" +# PROP Output_Dir "../../Release" # PROP Intermediate_Dir "Release" # 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 /GX /O2 /I "..\base" /I "..\mt" /I "..\io" /I "..\http" /I "..\net" /I "..\synergy" /I "..\platform" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /FD /c +# ADD CPP /nologo /MT /W4 /GX /O2 /I "..\..\lib\base" /I "..\..\lib\mt" /I "..\..\lib\io" /I "..\..\lib\http" /I "..\..\lib\net" /I "..\..\lib\synergy" /I "..\..\lib\platform" /I "..\..\lib\server" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /FD /c # SUBTRACT CPP /YX # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 @@ -54,9 +54,9 @@ BSC32=bscmake.exe # 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:"../Release/synergyd.exe" +# 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)" == "server - Win32 Debug" +!ELSEIF "$(CFG)" == "synergyd - Win32 Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 @@ -65,12 +65,12 @@ LINK32=link.exe # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "../Debug" +# PROP Output_Dir "../../Debug" # PROP Intermediate_Dir "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 /GX /ZI /Od /I "..\base" /I "..\mt" /I "..\io" /I "..\http" /I "..\net" /I "..\synergy" /I "..\platform" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /FD /GZ /c +# ADD CPP /nologo /MTd /W4 /Gm /GX /ZI /Od /I "..\..\lib\base" /I "..\..\lib\mt" /I "..\..\lib\io" /I "..\..\lib\http" /I "..\..\lib\net" /I "..\..\lib\synergy" /I "..\..\lib\platform" /I "..\..\lib\server" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /FD /GZ /c # SUBTRACT CPP /YX # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 @@ -81,56 +81,24 @@ BSC32=bscmake.exe # 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/synergyd.exe" /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 "server - Win32 Release" -# Name "server - Win32 Debug" +# Name "synergyd - Win32 Release" +# Name "synergyd - Win32 Debug" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" # Begin Source File -SOURCE=.\CClientProxy.cpp +SOURCE=.\synergyd.cpp # End Source File # Begin Source File -SOURCE=.\CClientProxy1_0.cpp -# End Source File -# Begin Source File - -SOURCE=.\CConfig.cpp -# End Source File -# Begin Source File - -SOURCE=.\CHTTPServer.cpp -# End Source File -# Begin Source File - -SOURCE=.\CMSWindowsPrimaryScreen.cpp -# End Source File -# Begin Source File - -SOURCE=.\CPrimaryClient.cpp -# End Source File -# Begin Source File - -SOURCE=.\CPrimaryScreen.cpp -# End Source File -# Begin Source File - -SOURCE=.\CServer.cpp -# End Source File -# Begin Source File - -SOURCE=.\server.cpp -# End Source File -# Begin Source File - -SOURCE=.\server.rc +SOURCE=.\synergyd.rc # End Source File # End Group # Begin Group "Header Files" @@ -138,38 +106,6 @@ SOURCE=.\server.rc # PROP Default_Filter "h;hpp;hxx;hm;inl" # Begin Source File -SOURCE=.\CClientProxy.h -# End Source File -# Begin Source File - -SOURCE=.\CClientProxy1_0.h -# End Source File -# Begin Source File - -SOURCE=.\CConfig.h -# End Source File -# Begin Source File - -SOURCE=.\CHTTPServer.h -# End Source File -# Begin Source File - -SOURCE=.\CMSWindowsPrimaryScreen.h -# End Source File -# Begin Source File - -SOURCE=.\CPrimaryClient.h -# End Source File -# Begin Source File - -SOURCE=.\CPrimaryScreen.h -# End Source File -# Begin Source File - -SOURCE=.\CServer.h -# End Source File -# Begin Source File - SOURCE=.\resource.h # End Source File # End Group diff --git a/server/server.rc b/cmd/synergyd/synergyd.rc similarity index 100% rename from server/server.rc rename to cmd/synergyd/synergyd.rc diff --git a/configure.in b/configure.in index 5c43b047..69a99df6 100644 --- a/configure.in +++ b/configure.in @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT(base/common.h) +AC_INIT(lib/base/common.h) AM_CONFIG_HEADER(config.h) AC_CONFIG_AUX_DIR(config) AM_INIT_AUTOMAKE(synergy, 0.5) @@ -60,14 +60,18 @@ CC="$PTHREAD_CC" AC_OUTPUT([ Makefile -base/Makefile -mt/Makefile -io/Makefile -http/Makefile -net/Makefile -synergy/Makefile -platform/Makefile -client/Makefile -server/Makefile +lib/Makefile +lib/base/Makefile +lib/mt/Makefile +lib/io/Makefile +lib/http/Makefile +lib/net/Makefile +lib/synergy/Makefile +lib/platform/Makefile +lib/client/Makefile +lib/server/Makefile +cmd/Makefile +cmd/synergy/Makefile +cmd/synergyd/Makefile ]) diff --git a/io/Makefile.am b/io/Makefile.am deleted file mode 100644 index 897daf14..00000000 --- a/io/Makefile.am +++ /dev/null @@ -1,25 +0,0 @@ -## Process this file with automake to produce Makefile.in -NULL = -DEPTH = .. - -noinst_LIBRARIES = libio.a -libio_a_SOURCES = \ - CBufferedInputStream.cpp \ - CBufferedOutputStream.cpp \ - CInputStreamFilter.cpp \ - COutputStreamFilter.cpp \ - CStreamBuffer.cpp \ - XIO.cpp \ - CBufferedInputStream.h \ - CBufferedOutputStream.h \ - CInputStreamFilter.h \ - COutputStreamFilter.h \ - CStreamBuffer.h \ - IInputStream.h \ - IOutputStream.h \ - XIO.h \ - $(NULL) -INCLUDES = \ - -I$(DEPTH)/base \ - -I$(DEPTH)/mt \ - $(NULL) diff --git a/lib/Makefile.am b/lib/Makefile.am new file mode 100644 index 00000000..0892a6b7 --- /dev/null +++ b/lib/Makefile.am @@ -0,0 +1,16 @@ +## Process this file with automake to produce Makefile.in +NULL = +DEPTH = .. + +EXTRA_DIST = +SUBDIRS = \ + base \ + mt \ + io \ + http \ + net \ + synergy \ + platform \ + client \ + server \ + $(NULL) diff --git a/base/BasicTypes.h b/lib/base/BasicTypes.h similarity index 100% rename from base/BasicTypes.h rename to lib/base/BasicTypes.h diff --git a/base/CFunctionJob.cpp b/lib/base/CFunctionJob.cpp similarity index 100% rename from base/CFunctionJob.cpp rename to lib/base/CFunctionJob.cpp diff --git a/base/CFunctionJob.h b/lib/base/CFunctionJob.h similarity index 100% rename from base/CFunctionJob.h rename to lib/base/CFunctionJob.h diff --git a/base/CLog.cpp b/lib/base/CLog.cpp similarity index 100% rename from base/CLog.cpp rename to lib/base/CLog.cpp diff --git a/base/CLog.h b/lib/base/CLog.h similarity index 100% rename from base/CLog.h rename to lib/base/CLog.h diff --git a/base/CStopwatch.cpp b/lib/base/CStopwatch.cpp similarity index 100% rename from base/CStopwatch.cpp rename to lib/base/CStopwatch.cpp diff --git a/base/CStopwatch.h b/lib/base/CStopwatch.h similarity index 100% rename from base/CStopwatch.h rename to lib/base/CStopwatch.h diff --git a/base/CString.cpp b/lib/base/CString.cpp similarity index 99% rename from base/CString.cpp rename to lib/base/CString.cpp index f6d30794..8854df6d 100644 --- a/base/CString.cpp +++ b/lib/base/CString.cpp @@ -1,4 +1,5 @@ #include "CString.h" +#include "common.h" #include "stdvector.h" #include #include diff --git a/base/CString.h b/lib/base/CString.h similarity index 100% rename from base/CString.h rename to lib/base/CString.h diff --git a/base/CUnicode.cpp b/lib/base/CUnicode.cpp similarity index 100% rename from base/CUnicode.cpp rename to lib/base/CUnicode.cpp diff --git a/base/CUnicode.h b/lib/base/CUnicode.h similarity index 100% rename from base/CUnicode.h rename to lib/base/CUnicode.h diff --git a/base/IInterface.h b/lib/base/IInterface.h similarity index 100% rename from base/IInterface.h rename to lib/base/IInterface.h diff --git a/base/IJob.h b/lib/base/IJob.h similarity index 100% rename from base/IJob.h rename to lib/base/IJob.h diff --git a/base/Makefile.am b/lib/base/Makefile.am similarity index 97% rename from base/Makefile.am rename to lib/base/Makefile.am index fe67d1ce..82f537e8 100644 --- a/base/Makefile.am +++ b/lib/base/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in NULL = -DEPTH = .. +DEPTH = ../.. noinst_LIBRARIES = libbase.a libbase_a_SOURCES = \ diff --git a/base/TMethodJob.h b/lib/base/TMethodJob.h similarity index 100% rename from base/TMethodJob.h rename to lib/base/TMethodJob.h diff --git a/base/XBase.cpp b/lib/base/XBase.cpp similarity index 100% rename from base/XBase.cpp rename to lib/base/XBase.cpp diff --git a/base/XBase.h b/lib/base/XBase.h similarity index 100% rename from base/XBase.h rename to lib/base/XBase.h diff --git a/base/base.dsp b/lib/base/base.dsp similarity index 100% rename from base/base.dsp rename to lib/base/base.dsp diff --git a/base/common.h b/lib/base/common.h similarity index 100% rename from base/common.h rename to lib/base/common.h diff --git a/base/stdfstream.h b/lib/base/stdfstream.h similarity index 100% rename from base/stdfstream.h rename to lib/base/stdfstream.h diff --git a/base/stdistream.h b/lib/base/stdistream.h similarity index 100% rename from base/stdistream.h rename to lib/base/stdistream.h diff --git a/base/stdlist.h b/lib/base/stdlist.h similarity index 100% rename from base/stdlist.h rename to lib/base/stdlist.h diff --git a/base/stdmap.h b/lib/base/stdmap.h similarity index 100% rename from base/stdmap.h rename to lib/base/stdmap.h diff --git a/base/stdostream.h b/lib/base/stdostream.h similarity index 100% rename from base/stdostream.h rename to lib/base/stdostream.h diff --git a/base/stdpost.h b/lib/base/stdpost.h similarity index 100% rename from base/stdpost.h rename to lib/base/stdpost.h diff --git a/base/stdpre.h b/lib/base/stdpre.h similarity index 100% rename from base/stdpre.h rename to lib/base/stdpre.h diff --git a/base/stdset.h b/lib/base/stdset.h similarity index 100% rename from base/stdset.h rename to lib/base/stdset.h diff --git a/base/stdsstream.h b/lib/base/stdsstream.h similarity index 100% rename from base/stdsstream.h rename to lib/base/stdsstream.h diff --git a/base/stdvector.h b/lib/base/stdvector.h similarity index 100% rename from base/stdvector.h rename to lib/base/stdvector.h diff --git a/client/CClient.cpp b/lib/client/CClient.cpp similarity index 100% rename from client/CClient.cpp rename to lib/client/CClient.cpp diff --git a/client/CClient.h b/lib/client/CClient.h similarity index 100% rename from client/CClient.h rename to lib/client/CClient.h diff --git a/client/CMSWindowsSecondaryScreen.cpp b/lib/client/CMSWindowsSecondaryScreen.cpp similarity index 100% rename from client/CMSWindowsSecondaryScreen.cpp rename to lib/client/CMSWindowsSecondaryScreen.cpp diff --git a/client/CMSWindowsSecondaryScreen.h b/lib/client/CMSWindowsSecondaryScreen.h similarity index 100% rename from client/CMSWindowsSecondaryScreen.h rename to lib/client/CMSWindowsSecondaryScreen.h diff --git a/client/CSecondaryScreen.cpp b/lib/client/CSecondaryScreen.cpp similarity index 100% rename from client/CSecondaryScreen.cpp rename to lib/client/CSecondaryScreen.cpp diff --git a/client/CSecondaryScreen.h b/lib/client/CSecondaryScreen.h similarity index 100% rename from client/CSecondaryScreen.h rename to lib/client/CSecondaryScreen.h diff --git a/client/CServerProxy.cpp b/lib/client/CServerProxy.cpp similarity index 100% rename from client/CServerProxy.cpp rename to lib/client/CServerProxy.cpp diff --git a/client/CServerProxy.h b/lib/client/CServerProxy.h similarity index 100% rename from client/CServerProxy.h rename to lib/client/CServerProxy.h diff --git a/client/CXWindowsSecondaryScreen.cpp b/lib/client/CXWindowsSecondaryScreen.cpp similarity index 100% rename from client/CXWindowsSecondaryScreen.cpp rename to lib/client/CXWindowsSecondaryScreen.cpp diff --git a/client/CXWindowsSecondaryScreen.h b/lib/client/CXWindowsSecondaryScreen.h similarity index 100% rename from client/CXWindowsSecondaryScreen.h rename to lib/client/CXWindowsSecondaryScreen.h diff --git a/lib/client/Makefile.am b/lib/client/Makefile.am new file mode 100644 index 00000000..42001eae --- /dev/null +++ b/lib/client/Makefile.am @@ -0,0 +1,23 @@ +## Process this file with automake to produce Makefile.in +NULL = +DEPTH = ../.. + +noinst_LIBRARIES = libclient.a +libclient_a_SOURCES = \ + CClient.cpp \ + CSecondaryScreen.cpp \ + CServerProxy.cpp \ + CXWindowsSecondaryScreen.cpp \ + CClient.h \ + CSecondaryScreen.h \ + CServerProxy.h \ + CXWindowsSecondaryScreen.h \ + $(NULL) +INCLUDES = \ + -I$(DEPTH)/lib/base \ + -I$(DEPTH)/lib/mt \ + -I$(DEPTH)/lib/io \ + -I$(DEPTH)/lib/net \ + -I$(DEPTH)/lib/synergy \ + -I$(DEPTH)/lib/platform \ + $(NULL) diff --git a/http/CHTTPProtocol.cpp b/lib/http/CHTTPProtocol.cpp similarity index 100% rename from http/CHTTPProtocol.cpp rename to lib/http/CHTTPProtocol.cpp diff --git a/http/CHTTPProtocol.h b/lib/http/CHTTPProtocol.h similarity index 100% rename from http/CHTTPProtocol.h rename to lib/http/CHTTPProtocol.h diff --git a/http/Makefile.am b/lib/http/Makefile.am similarity index 73% rename from http/Makefile.am rename to lib/http/Makefile.am index 08404a0a..cee66bf8 100644 --- a/http/Makefile.am +++ b/lib/http/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in NULL = -DEPTH = .. +DEPTH = ../.. noinst_LIBRARIES = libhttp.a libhttp_a_SOURCES = \ @@ -10,7 +10,7 @@ libhttp_a_SOURCES = \ XHTTP.h \ $(NULL) INCLUDES = \ - -I$(DEPTH)/base \ - -I$(DEPTH)/mt \ - -I$(DEPTH)/io \ + -I$(DEPTH)/lib/base \ + -I$(DEPTH)/lib/mt \ + -I$(DEPTH)/lib/io \ $(NULL) diff --git a/http/XHTTP.cpp b/lib/http/XHTTP.cpp similarity index 100% rename from http/XHTTP.cpp rename to lib/http/XHTTP.cpp diff --git a/http/XHTTP.h b/lib/http/XHTTP.h similarity index 100% rename from http/XHTTP.h rename to lib/http/XHTTP.h diff --git a/http/http.dsp b/lib/http/http.dsp similarity index 100% rename from http/http.dsp rename to lib/http/http.dsp diff --git a/io/CBufferedInputStream.cpp b/lib/io/CBufferedInputStream.cpp similarity index 100% rename from io/CBufferedInputStream.cpp rename to lib/io/CBufferedInputStream.cpp diff --git a/io/CBufferedInputStream.h b/lib/io/CBufferedInputStream.h similarity index 100% rename from io/CBufferedInputStream.h rename to lib/io/CBufferedInputStream.h diff --git a/io/CBufferedOutputStream.cpp b/lib/io/CBufferedOutputStream.cpp similarity index 100% rename from io/CBufferedOutputStream.cpp rename to lib/io/CBufferedOutputStream.cpp diff --git a/io/CBufferedOutputStream.h b/lib/io/CBufferedOutputStream.h similarity index 100% rename from io/CBufferedOutputStream.h rename to lib/io/CBufferedOutputStream.h diff --git a/io/CInputStreamFilter.cpp b/lib/io/CInputStreamFilter.cpp similarity index 100% rename from io/CInputStreamFilter.cpp rename to lib/io/CInputStreamFilter.cpp diff --git a/io/CInputStreamFilter.h b/lib/io/CInputStreamFilter.h similarity index 100% rename from io/CInputStreamFilter.h rename to lib/io/CInputStreamFilter.h diff --git a/io/COutputStreamFilter.cpp b/lib/io/COutputStreamFilter.cpp similarity index 100% rename from io/COutputStreamFilter.cpp rename to lib/io/COutputStreamFilter.cpp diff --git a/io/COutputStreamFilter.h b/lib/io/COutputStreamFilter.h similarity index 100% rename from io/COutputStreamFilter.h rename to lib/io/COutputStreamFilter.h diff --git a/io/CStreamBuffer.cpp b/lib/io/CStreamBuffer.cpp similarity index 100% rename from io/CStreamBuffer.cpp rename to lib/io/CStreamBuffer.cpp diff --git a/io/CStreamBuffer.h b/lib/io/CStreamBuffer.h similarity index 100% rename from io/CStreamBuffer.h rename to lib/io/CStreamBuffer.h diff --git a/io/IInputStream.h b/lib/io/IInputStream.h similarity index 100% rename from io/IInputStream.h rename to lib/io/IInputStream.h diff --git a/io/IOutputStream.h b/lib/io/IOutputStream.h similarity index 100% rename from io/IOutputStream.h rename to lib/io/IOutputStream.h diff --git a/lib/io/Makefile.am b/lib/io/Makefile.am new file mode 100644 index 00000000..67ff14a8 --- /dev/null +++ b/lib/io/Makefile.am @@ -0,0 +1,25 @@ +## Process this file with automake to produce Makefile.in +NULL = +DEPTH = ../.. + +noinst_LIBRARIES = libio.a +libio_a_SOURCES = \ + CBufferedInputStream.cpp \ + CBufferedOutputStream.cpp \ + CInputStreamFilter.cpp \ + COutputStreamFilter.cpp \ + CStreamBuffer.cpp \ + XIO.cpp \ + CBufferedInputStream.h \ + CBufferedOutputStream.h \ + CInputStreamFilter.h \ + COutputStreamFilter.h \ + CStreamBuffer.h \ + IInputStream.h \ + IOutputStream.h \ + XIO.h \ + $(NULL) +INCLUDES = \ + -I$(DEPTH)/lib/base \ + -I$(DEPTH)/lib/mt \ + $(NULL) diff --git a/io/XIO.cpp b/lib/io/XIO.cpp similarity index 100% rename from io/XIO.cpp rename to lib/io/XIO.cpp diff --git a/io/XIO.h b/lib/io/XIO.h similarity index 100% rename from io/XIO.h rename to lib/io/XIO.h diff --git a/io/io.dsp b/lib/io/io.dsp similarity index 100% rename from io/io.dsp rename to lib/io/io.dsp diff --git a/mt/CCondVar.cpp b/lib/mt/CCondVar.cpp similarity index 100% rename from mt/CCondVar.cpp rename to lib/mt/CCondVar.cpp diff --git a/mt/CCondVar.h b/lib/mt/CCondVar.h similarity index 100% rename from mt/CCondVar.h rename to lib/mt/CCondVar.h diff --git a/mt/CLock.cpp b/lib/mt/CLock.cpp similarity index 100% rename from mt/CLock.cpp rename to lib/mt/CLock.cpp diff --git a/mt/CLock.h b/lib/mt/CLock.h similarity index 100% rename from mt/CLock.h rename to lib/mt/CLock.h diff --git a/mt/CMutex.cpp b/lib/mt/CMutex.cpp similarity index 100% rename from mt/CMutex.cpp rename to lib/mt/CMutex.cpp diff --git a/mt/CMutex.h b/lib/mt/CMutex.h similarity index 100% rename from mt/CMutex.h rename to lib/mt/CMutex.h diff --git a/mt/CThread.cpp b/lib/mt/CThread.cpp similarity index 100% rename from mt/CThread.cpp rename to lib/mt/CThread.cpp diff --git a/mt/CThread.h b/lib/mt/CThread.h similarity index 100% rename from mt/CThread.h rename to lib/mt/CThread.h diff --git a/mt/CThreadRep.cpp b/lib/mt/CThreadRep.cpp similarity index 100% rename from mt/CThreadRep.cpp rename to lib/mt/CThreadRep.cpp diff --git a/mt/CThreadRep.h b/lib/mt/CThreadRep.h similarity index 100% rename from mt/CThreadRep.h rename to lib/mt/CThreadRep.h diff --git a/mt/CTimerThread.cpp b/lib/mt/CTimerThread.cpp similarity index 100% rename from mt/CTimerThread.cpp rename to lib/mt/CTimerThread.cpp diff --git a/mt/CTimerThread.h b/lib/mt/CTimerThread.h similarity index 100% rename from mt/CTimerThread.h rename to lib/mt/CTimerThread.h diff --git a/mt/Makefile.am b/lib/mt/Makefile.am similarity index 90% rename from mt/Makefile.am rename to lib/mt/Makefile.am index e7f69865..a3c4b165 100644 --- a/mt/Makefile.am +++ b/lib/mt/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in NULL = -DEPTH = .. +DEPTH = ../.. noinst_LIBRARIES = libmt.a libmt_a_SOURCES = \ @@ -19,5 +19,5 @@ libmt_a_SOURCES = \ XThread.h \ $(NULL) INCLUDES = \ - -I$(DEPTH)/base \ + -I$(DEPTH)/lib/base \ $(NULL) diff --git a/mt/XThread.h b/lib/mt/XThread.h similarity index 100% rename from mt/XThread.h rename to lib/mt/XThread.h diff --git a/mt/mt.dsp b/lib/mt/mt.dsp similarity index 100% rename from mt/mt.dsp rename to lib/mt/mt.dsp diff --git a/net/CNetwork.cpp b/lib/net/CNetwork.cpp similarity index 100% rename from net/CNetwork.cpp rename to lib/net/CNetwork.cpp diff --git a/net/CNetwork.h b/lib/net/CNetwork.h similarity index 100% rename from net/CNetwork.h rename to lib/net/CNetwork.h diff --git a/net/CNetworkAddress.cpp b/lib/net/CNetworkAddress.cpp similarity index 100% rename from net/CNetworkAddress.cpp rename to lib/net/CNetworkAddress.cpp diff --git a/net/CNetworkAddress.h b/lib/net/CNetworkAddress.h similarity index 100% rename from net/CNetworkAddress.h rename to lib/net/CNetworkAddress.h diff --git a/net/CTCPListenSocket.cpp b/lib/net/CTCPListenSocket.cpp similarity index 100% rename from net/CTCPListenSocket.cpp rename to lib/net/CTCPListenSocket.cpp diff --git a/net/CTCPListenSocket.h b/lib/net/CTCPListenSocket.h similarity index 100% rename from net/CTCPListenSocket.h rename to lib/net/CTCPListenSocket.h diff --git a/net/CTCPSocket.cpp b/lib/net/CTCPSocket.cpp similarity index 100% rename from net/CTCPSocket.cpp rename to lib/net/CTCPSocket.cpp diff --git a/net/CTCPSocket.h b/lib/net/CTCPSocket.h similarity index 100% rename from net/CTCPSocket.h rename to lib/net/CTCPSocket.h diff --git a/net/IDataSocket.h b/lib/net/IDataSocket.h similarity index 100% rename from net/IDataSocket.h rename to lib/net/IDataSocket.h diff --git a/net/IListenSocket.h b/lib/net/IListenSocket.h similarity index 100% rename from net/IListenSocket.h rename to lib/net/IListenSocket.h diff --git a/net/ISocket.h b/lib/net/ISocket.h similarity index 100% rename from net/ISocket.h rename to lib/net/ISocket.h diff --git a/net/Makefile.am b/lib/net/Makefile.am similarity index 84% rename from net/Makefile.am rename to lib/net/Makefile.am index 5262f015..f12a316f 100644 --- a/net/Makefile.am +++ b/lib/net/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in NULL = -DEPTH = .. +DEPTH = ../.. noinst_LIBRARIES = libnet.a libnet_a_SOURCES = \ @@ -21,7 +21,7 @@ libnet_a_SOURCES = \ XSocket.h \ $(NULL) INCLUDES = \ - -I$(DEPTH)/base \ - -I$(DEPTH)/mt \ - -I$(DEPTH)/io \ + -I$(DEPTH)/lib/base \ + -I$(DEPTH)/lib/mt \ + -I$(DEPTH)/lib/io \ $(NULL) diff --git a/net/XNetwork.cpp b/lib/net/XNetwork.cpp similarity index 100% rename from net/XNetwork.cpp rename to lib/net/XNetwork.cpp diff --git a/net/XNetwork.h b/lib/net/XNetwork.h similarity index 100% rename from net/XNetwork.h rename to lib/net/XNetwork.h diff --git a/net/XSocket.cpp b/lib/net/XSocket.cpp similarity index 100% rename from net/XSocket.cpp rename to lib/net/XSocket.cpp diff --git a/net/XSocket.h b/lib/net/XSocket.h similarity index 100% rename from net/XSocket.h rename to lib/net/XSocket.h diff --git a/net/net.dsp b/lib/net/net.dsp similarity index 100% rename from net/net.dsp rename to lib/net/net.dsp diff --git a/platform/CMSWindowsClipboard.cpp b/lib/platform/CMSWindowsClipboard.cpp similarity index 100% rename from platform/CMSWindowsClipboard.cpp rename to lib/platform/CMSWindowsClipboard.cpp diff --git a/platform/CMSWindowsClipboard.h b/lib/platform/CMSWindowsClipboard.h similarity index 100% rename from platform/CMSWindowsClipboard.h rename to lib/platform/CMSWindowsClipboard.h diff --git a/platform/CMSWindowsClipboardAnyTextConverter.cpp b/lib/platform/CMSWindowsClipboardAnyTextConverter.cpp similarity index 100% rename from platform/CMSWindowsClipboardAnyTextConverter.cpp rename to lib/platform/CMSWindowsClipboardAnyTextConverter.cpp diff --git a/platform/CMSWindowsClipboardAnyTextConverter.h b/lib/platform/CMSWindowsClipboardAnyTextConverter.h similarity index 100% rename from platform/CMSWindowsClipboardAnyTextConverter.h rename to lib/platform/CMSWindowsClipboardAnyTextConverter.h diff --git a/platform/CMSWindowsClipboardTextConverter.cpp b/lib/platform/CMSWindowsClipboardTextConverter.cpp similarity index 100% rename from platform/CMSWindowsClipboardTextConverter.cpp rename to lib/platform/CMSWindowsClipboardTextConverter.cpp diff --git a/platform/CMSWindowsClipboardTextConverter.h b/lib/platform/CMSWindowsClipboardTextConverter.h similarity index 100% rename from platform/CMSWindowsClipboardTextConverter.h rename to lib/platform/CMSWindowsClipboardTextConverter.h diff --git a/platform/CMSWindowsClipboardUTF16Converter.cpp b/lib/platform/CMSWindowsClipboardUTF16Converter.cpp similarity index 100% rename from platform/CMSWindowsClipboardUTF16Converter.cpp rename to lib/platform/CMSWindowsClipboardUTF16Converter.cpp diff --git a/platform/CMSWindowsClipboardUTF16Converter.h b/lib/platform/CMSWindowsClipboardUTF16Converter.h similarity index 100% rename from platform/CMSWindowsClipboardUTF16Converter.h rename to lib/platform/CMSWindowsClipboardUTF16Converter.h diff --git a/platform/CMSWindowsScreen.cpp b/lib/platform/CMSWindowsScreen.cpp similarity index 100% rename from platform/CMSWindowsScreen.cpp rename to lib/platform/CMSWindowsScreen.cpp diff --git a/platform/CMSWindowsScreen.h b/lib/platform/CMSWindowsScreen.h similarity index 100% rename from platform/CMSWindowsScreen.h rename to lib/platform/CMSWindowsScreen.h diff --git a/platform/CMSWindowsScreenSaver.cpp b/lib/platform/CMSWindowsScreenSaver.cpp similarity index 100% rename from platform/CMSWindowsScreenSaver.cpp rename to lib/platform/CMSWindowsScreenSaver.cpp diff --git a/platform/CMSWindowsScreenSaver.h b/lib/platform/CMSWindowsScreenSaver.h similarity index 100% rename from platform/CMSWindowsScreenSaver.h rename to lib/platform/CMSWindowsScreenSaver.h diff --git a/platform/CPlatform.cpp b/lib/platform/CPlatform.cpp similarity index 100% rename from platform/CPlatform.cpp rename to lib/platform/CPlatform.cpp diff --git a/platform/CPlatform.h b/lib/platform/CPlatform.h similarity index 100% rename from platform/CPlatform.h rename to lib/platform/CPlatform.h diff --git a/platform/CSynergyHook.cpp b/lib/platform/CSynergyHook.cpp similarity index 100% rename from platform/CSynergyHook.cpp rename to lib/platform/CSynergyHook.cpp diff --git a/platform/CSynergyHook.h b/lib/platform/CSynergyHook.h similarity index 100% rename from platform/CSynergyHook.h rename to lib/platform/CSynergyHook.h diff --git a/platform/CUnixPlatform.cpp b/lib/platform/CUnixPlatform.cpp similarity index 100% rename from platform/CUnixPlatform.cpp rename to lib/platform/CUnixPlatform.cpp diff --git a/platform/CUnixPlatform.h b/lib/platform/CUnixPlatform.h similarity index 100% rename from platform/CUnixPlatform.h rename to lib/platform/CUnixPlatform.h diff --git a/platform/CWin32Platform.cpp b/lib/platform/CWin32Platform.cpp similarity index 100% rename from platform/CWin32Platform.cpp rename to lib/platform/CWin32Platform.cpp diff --git a/platform/CWin32Platform.h b/lib/platform/CWin32Platform.h similarity index 100% rename from platform/CWin32Platform.h rename to lib/platform/CWin32Platform.h diff --git a/platform/CXWindowsClipboard.cpp b/lib/platform/CXWindowsClipboard.cpp similarity index 100% rename from platform/CXWindowsClipboard.cpp rename to lib/platform/CXWindowsClipboard.cpp diff --git a/platform/CXWindowsClipboard.h b/lib/platform/CXWindowsClipboard.h similarity index 100% rename from platform/CXWindowsClipboard.h rename to lib/platform/CXWindowsClipboard.h diff --git a/platform/CXWindowsClipboardTextConverter.cpp b/lib/platform/CXWindowsClipboardTextConverter.cpp similarity index 100% rename from platform/CXWindowsClipboardTextConverter.cpp rename to lib/platform/CXWindowsClipboardTextConverter.cpp diff --git a/platform/CXWindowsClipboardTextConverter.h b/lib/platform/CXWindowsClipboardTextConverter.h similarity index 100% rename from platform/CXWindowsClipboardTextConverter.h rename to lib/platform/CXWindowsClipboardTextConverter.h diff --git a/platform/CXWindowsClipboardUCS2Converter.cpp b/lib/platform/CXWindowsClipboardUCS2Converter.cpp similarity index 100% rename from platform/CXWindowsClipboardUCS2Converter.cpp rename to lib/platform/CXWindowsClipboardUCS2Converter.cpp diff --git a/platform/CXWindowsClipboardUCS2Converter.h b/lib/platform/CXWindowsClipboardUCS2Converter.h similarity index 100% rename from platform/CXWindowsClipboardUCS2Converter.h rename to lib/platform/CXWindowsClipboardUCS2Converter.h diff --git a/platform/CXWindowsClipboardUTF8Converter.cpp b/lib/platform/CXWindowsClipboardUTF8Converter.cpp similarity index 100% rename from platform/CXWindowsClipboardUTF8Converter.cpp rename to lib/platform/CXWindowsClipboardUTF8Converter.cpp diff --git a/platform/CXWindowsClipboardUTF8Converter.h b/lib/platform/CXWindowsClipboardUTF8Converter.h similarity index 100% rename from platform/CXWindowsClipboardUTF8Converter.h rename to lib/platform/CXWindowsClipboardUTF8Converter.h diff --git a/platform/CXWindowsScreen.cpp b/lib/platform/CXWindowsScreen.cpp similarity index 100% rename from platform/CXWindowsScreen.cpp rename to lib/platform/CXWindowsScreen.cpp diff --git a/platform/CXWindowsScreen.h b/lib/platform/CXWindowsScreen.h similarity index 100% rename from platform/CXWindowsScreen.h rename to lib/platform/CXWindowsScreen.h diff --git a/platform/CXWindowsScreenSaver.cpp b/lib/platform/CXWindowsScreenSaver.cpp similarity index 100% rename from platform/CXWindowsScreenSaver.cpp rename to lib/platform/CXWindowsScreenSaver.cpp diff --git a/platform/CXWindowsScreenSaver.h b/lib/platform/CXWindowsScreenSaver.h similarity index 100% rename from platform/CXWindowsScreenSaver.h rename to lib/platform/CXWindowsScreenSaver.h diff --git a/platform/CXWindowsUtil.cpp b/lib/platform/CXWindowsUtil.cpp similarity index 100% rename from platform/CXWindowsUtil.cpp rename to lib/platform/CXWindowsUtil.cpp diff --git a/platform/CXWindowsUtil.h b/lib/platform/CXWindowsUtil.h similarity index 100% rename from platform/CXWindowsUtil.h rename to lib/platform/CXWindowsUtil.h diff --git a/platform/IMSWindowsScreenEventHandler.h b/lib/platform/IMSWindowsScreenEventHandler.h similarity index 100% rename from platform/IMSWindowsScreenEventHandler.h rename to lib/platform/IMSWindowsScreenEventHandler.h diff --git a/platform/IPlatform.h b/lib/platform/IPlatform.h similarity index 100% rename from platform/IPlatform.h rename to lib/platform/IPlatform.h diff --git a/platform/Makefile.am b/lib/platform/Makefile.am similarity index 88% rename from platform/Makefile.am rename to lib/platform/Makefile.am index 4257ecbd..516961c1 100644 --- a/platform/Makefile.am +++ b/lib/platform/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in NULL = -DEPTH = .. +DEPTH = ../.. # FIXME -- add CUnixPlatform.cpp as an unbuilt source noinst_LIBRARIES = libplatform.a @@ -25,7 +25,7 @@ libplatform_a_SOURCES = \ IPlatform.h \ $(NULL) INCLUDES = \ - -I$(DEPTH)/base \ - -I$(DEPTH)/mt \ - -I$(DEPTH)/synergy \ + -I$(DEPTH)/lib/base \ + -I$(DEPTH)/lib/mt \ + -I$(DEPTH)/lib/synergy \ $(NULL) diff --git a/platform/makehook.dsp b/lib/platform/makehook.dsp similarity index 100% rename from platform/makehook.dsp rename to lib/platform/makehook.dsp diff --git a/platform/platform.dsp b/lib/platform/platform.dsp similarity index 100% rename from platform/platform.dsp rename to lib/platform/platform.dsp diff --git a/platform/synrgyhk.dsp b/lib/platform/synrgyhk.dsp similarity index 98% rename from platform/synrgyhk.dsp rename to lib/platform/synrgyhk.dsp index 42dbb32e..df4809e7 100644 --- a/platform/synrgyhk.dsp +++ b/lib/platform/synrgyhk.dsp @@ -38,7 +38,7 @@ RSC=rc.exe # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "../Release" +# PROP Output_Dir "../../Release" # PROP Intermediate_Dir "ReleaseHook" # 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 @@ -64,7 +64,7 @@ LINK32=link.exe # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "../Debug" +# PROP Output_Dir "../../Debug" # PROP Intermediate_Dir "DebugHook" # 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 diff --git a/server/CClientProxy.cpp b/lib/server/CClientProxy.cpp similarity index 100% rename from server/CClientProxy.cpp rename to lib/server/CClientProxy.cpp diff --git a/server/CClientProxy.h b/lib/server/CClientProxy.h similarity index 100% rename from server/CClientProxy.h rename to lib/server/CClientProxy.h diff --git a/server/CClientProxy1_0.cpp b/lib/server/CClientProxy1_0.cpp similarity index 100% rename from server/CClientProxy1_0.cpp rename to lib/server/CClientProxy1_0.cpp diff --git a/server/CClientProxy1_0.h b/lib/server/CClientProxy1_0.h similarity index 100% rename from server/CClientProxy1_0.h rename to lib/server/CClientProxy1_0.h diff --git a/server/CConfig.cpp b/lib/server/CConfig.cpp similarity index 100% rename from server/CConfig.cpp rename to lib/server/CConfig.cpp diff --git a/server/CConfig.h b/lib/server/CConfig.h similarity index 100% rename from server/CConfig.h rename to lib/server/CConfig.h diff --git a/server/CHTTPServer.cpp b/lib/server/CHTTPServer.cpp similarity index 100% rename from server/CHTTPServer.cpp rename to lib/server/CHTTPServer.cpp diff --git a/server/CHTTPServer.h b/lib/server/CHTTPServer.h similarity index 100% rename from server/CHTTPServer.h rename to lib/server/CHTTPServer.h diff --git a/server/CMSWindowsPrimaryScreen.cpp b/lib/server/CMSWindowsPrimaryScreen.cpp similarity index 100% rename from server/CMSWindowsPrimaryScreen.cpp rename to lib/server/CMSWindowsPrimaryScreen.cpp diff --git a/server/CMSWindowsPrimaryScreen.h b/lib/server/CMSWindowsPrimaryScreen.h similarity index 100% rename from server/CMSWindowsPrimaryScreen.h rename to lib/server/CMSWindowsPrimaryScreen.h diff --git a/server/CPrimaryClient.cpp b/lib/server/CPrimaryClient.cpp similarity index 100% rename from server/CPrimaryClient.cpp rename to lib/server/CPrimaryClient.cpp diff --git a/server/CPrimaryClient.h b/lib/server/CPrimaryClient.h similarity index 100% rename from server/CPrimaryClient.h rename to lib/server/CPrimaryClient.h diff --git a/server/CPrimaryScreen.cpp b/lib/server/CPrimaryScreen.cpp similarity index 100% rename from server/CPrimaryScreen.cpp rename to lib/server/CPrimaryScreen.cpp diff --git a/server/CPrimaryScreen.h b/lib/server/CPrimaryScreen.h similarity index 100% rename from server/CPrimaryScreen.h rename to lib/server/CPrimaryScreen.h diff --git a/server/CServer.cpp b/lib/server/CServer.cpp similarity index 100% rename from server/CServer.cpp rename to lib/server/CServer.cpp diff --git a/server/CServer.h b/lib/server/CServer.h similarity index 100% rename from server/CServer.h rename to lib/server/CServer.h diff --git a/server/CXWindowsPrimaryScreen.cpp b/lib/server/CXWindowsPrimaryScreen.cpp similarity index 100% rename from server/CXWindowsPrimaryScreen.cpp rename to lib/server/CXWindowsPrimaryScreen.cpp diff --git a/server/CXWindowsPrimaryScreen.h b/lib/server/CXWindowsPrimaryScreen.h similarity index 100% rename from server/CXWindowsPrimaryScreen.h rename to lib/server/CXWindowsPrimaryScreen.h diff --git a/lib/server/Makefile.am b/lib/server/Makefile.am new file mode 100644 index 00000000..36f6e393 --- /dev/null +++ b/lib/server/Makefile.am @@ -0,0 +1,32 @@ +## Process this file with automake to produce Makefile.in +NULL = +DEPTH = ../.. + +noinst_LIBRARIES = libserver.a +libserver_a_SOURCES = \ + CClientProxy.cpp \ + CClientProxy1_0.cpp \ + CConfig.cpp \ + CHTTPServer.cpp \ + CPrimaryClient.cpp \ + CPrimaryScreen.cpp \ + CServer.cpp \ + CXWindowsPrimaryScreen.cpp \ + CClientProxy.h \ + CClientProxy1_0.h \ + CConfig.h \ + CHTTPServer.h \ + CPrimaryClient.h \ + CPrimaryScreen.h \ + CServer.h \ + CXWindowsPrimaryScreen.h \ + $(NULL) +INCLUDES = \ + -I$(DEPTH)/lib/base \ + -I$(DEPTH)/lib/mt \ + -I$(DEPTH)/lib/io \ + -I$(DEPTH)/lib/http \ + -I$(DEPTH)/lib/net \ + -I$(DEPTH)/lib/synergy \ + -I$(DEPTH)/lib/platform \ + $(NULL) diff --git a/synergy/CClipboard.cpp b/lib/synergy/CClipboard.cpp similarity index 100% rename from synergy/CClipboard.cpp rename to lib/synergy/CClipboard.cpp diff --git a/synergy/CClipboard.h b/lib/synergy/CClipboard.h similarity index 100% rename from synergy/CClipboard.h rename to lib/synergy/CClipboard.h diff --git a/synergy/CInputPacketStream.cpp b/lib/synergy/CInputPacketStream.cpp similarity index 100% rename from synergy/CInputPacketStream.cpp rename to lib/synergy/CInputPacketStream.cpp diff --git a/synergy/CInputPacketStream.h b/lib/synergy/CInputPacketStream.h similarity index 100% rename from synergy/CInputPacketStream.h rename to lib/synergy/CInputPacketStream.h diff --git a/synergy/COutputPacketStream.cpp b/lib/synergy/COutputPacketStream.cpp similarity index 100% rename from synergy/COutputPacketStream.cpp rename to lib/synergy/COutputPacketStream.cpp diff --git a/synergy/COutputPacketStream.h b/lib/synergy/COutputPacketStream.h similarity index 100% rename from synergy/COutputPacketStream.h rename to lib/synergy/COutputPacketStream.h diff --git a/synergy/CProtocolUtil.cpp b/lib/synergy/CProtocolUtil.cpp similarity index 100% rename from synergy/CProtocolUtil.cpp rename to lib/synergy/CProtocolUtil.cpp diff --git a/synergy/CProtocolUtil.h b/lib/synergy/CProtocolUtil.h similarity index 100% rename from synergy/CProtocolUtil.h rename to lib/synergy/CProtocolUtil.h diff --git a/synergy/CTCPSocketFactory.cpp b/lib/synergy/CTCPSocketFactory.cpp similarity index 100% rename from synergy/CTCPSocketFactory.cpp rename to lib/synergy/CTCPSocketFactory.cpp diff --git a/synergy/CTCPSocketFactory.h b/lib/synergy/CTCPSocketFactory.h similarity index 100% rename from synergy/CTCPSocketFactory.h rename to lib/synergy/CTCPSocketFactory.h diff --git a/synergy/ClipboardTypes.h b/lib/synergy/ClipboardTypes.h similarity index 100% rename from synergy/ClipboardTypes.h rename to lib/synergy/ClipboardTypes.h diff --git a/synergy/IClient.h b/lib/synergy/IClient.h similarity index 100% rename from synergy/IClient.h rename to lib/synergy/IClient.h diff --git a/synergy/IClipboard.h b/lib/synergy/IClipboard.h similarity index 100% rename from synergy/IClipboard.h rename to lib/synergy/IClipboard.h diff --git a/synergy/IPrimaryScreenReceiver.h b/lib/synergy/IPrimaryScreenReceiver.h similarity index 100% rename from synergy/IPrimaryScreenReceiver.h rename to lib/synergy/IPrimaryScreenReceiver.h diff --git a/synergy/IScreen.h b/lib/synergy/IScreen.h similarity index 100% rename from synergy/IScreen.h rename to lib/synergy/IScreen.h diff --git a/synergy/IScreenEventHandler.h b/lib/synergy/IScreenEventHandler.h similarity index 100% rename from synergy/IScreenEventHandler.h rename to lib/synergy/IScreenEventHandler.h diff --git a/synergy/IScreenReceiver.h b/lib/synergy/IScreenReceiver.h similarity index 100% rename from synergy/IScreenReceiver.h rename to lib/synergy/IScreenReceiver.h diff --git a/synergy/IScreenSaver.h b/lib/synergy/IScreenSaver.h similarity index 100% rename from synergy/IScreenSaver.h rename to lib/synergy/IScreenSaver.h diff --git a/synergy/IServer.h b/lib/synergy/IServer.h similarity index 100% rename from synergy/IServer.h rename to lib/synergy/IServer.h diff --git a/synergy/ISocketFactory.h b/lib/synergy/ISocketFactory.h similarity index 100% rename from synergy/ISocketFactory.h rename to lib/synergy/ISocketFactory.h diff --git a/synergy/KeyTypes.h b/lib/synergy/KeyTypes.h similarity index 100% rename from synergy/KeyTypes.h rename to lib/synergy/KeyTypes.h diff --git a/synergy/Makefile.am b/lib/synergy/Makefile.am similarity index 87% rename from synergy/Makefile.am rename to lib/synergy/Makefile.am index 9522e1cc..55adf09e 100644 --- a/synergy/Makefile.am +++ b/lib/synergy/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in NULL = -DEPTH = .. +DEPTH = ../.. noinst_LIBRARIES = libsynergy.a libsynergy_a_SOURCES = \ @@ -34,8 +34,8 @@ libsynergy_a_SOURCES = \ XSynergy.h \ $(NULL) INCLUDES = \ - -I$(DEPTH)/base \ - -I$(DEPTH)/mt \ - -I$(DEPTH)/io \ - -I$(DEPTH)/net \ + -I$(DEPTH)/lib/base \ + -I$(DEPTH)/lib/mt \ + -I$(DEPTH)/lib/io \ + -I$(DEPTH)/lib/net \ $(NULL) diff --git a/synergy/MouseTypes.h b/lib/synergy/MouseTypes.h similarity index 100% rename from synergy/MouseTypes.h rename to lib/synergy/MouseTypes.h diff --git a/synergy/ProtocolTypes.h b/lib/synergy/ProtocolTypes.h similarity index 100% rename from synergy/ProtocolTypes.h rename to lib/synergy/ProtocolTypes.h diff --git a/synergy/Version.h b/lib/synergy/Version.h similarity index 100% rename from synergy/Version.h rename to lib/synergy/Version.h diff --git a/synergy/XScreen.cpp b/lib/synergy/XScreen.cpp similarity index 100% rename from synergy/XScreen.cpp rename to lib/synergy/XScreen.cpp diff --git a/synergy/XScreen.h b/lib/synergy/XScreen.h similarity index 100% rename from synergy/XScreen.h rename to lib/synergy/XScreen.h diff --git a/synergy/XSynergy.cpp b/lib/synergy/XSynergy.cpp similarity index 100% rename from synergy/XSynergy.cpp rename to lib/synergy/XSynergy.cpp diff --git a/synergy/XSynergy.h b/lib/synergy/XSynergy.h similarity index 100% rename from synergy/XSynergy.h rename to lib/synergy/XSynergy.h diff --git a/synergy/synergy.dsp b/lib/synergy/libsynergy.dsp similarity index 89% rename from synergy/synergy.dsp rename to lib/synergy/libsynergy.dsp index eac75dde..99cc99ac 100644 --- a/synergy/synergy.dsp +++ b/lib/synergy/libsynergy.dsp @@ -1,4 +1,4 @@ -# Microsoft Developer Studio Project File - Name="synergy" - Package Owner=<4> +# Microsoft Developer Studio Project File - Name="libsynergy" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** @@ -8,17 +8,17 @@ CFG=synergy - 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 "synergy.mak". +!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 "synergy.mak" CFG="synergy - Win32 Debug" +!MESSAGE NMAKE /f "libsynergy.mak" CFG="libsynergy - Win32 Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "synergy - Win32 Release" (based on "Win32 (x86) Static Library") -!MESSAGE "synergy - Win32 Debug" (based on "Win32 (x86) Static Library") +!MESSAGE "libsynergy - Win32 Release" (based on "Win32 (x86) Static Library") +!MESSAGE "libsynergy - Win32 Debug" (based on "Win32 (x86) Static Library") !MESSAGE # Begin Project @@ -28,7 +28,7 @@ CFG=synergy - Win32 Debug CPP=cl.exe RSC=rc.exe -!IF "$(CFG)" == "synergy - Win32 Release" +!IF "$(CFG)" == "libsynergy - Win32 Release" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 @@ -52,7 +52,7 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo # ADD LIB32 /nologo -!ELSEIF "$(CFG)" == "synergy - Win32 Debug" +!ELSEIF "$(CFG)" == "libsynergy - Win32 Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 @@ -80,8 +80,8 @@ LIB32=link.exe -lib # Begin Target -# Name "synergy - Win32 Release" -# Name "synergy - Win32 Debug" +# 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" diff --git a/server/Makefile.am b/server/Makefile.am deleted file mode 100644 index bcab55a3..00000000 --- a/server/Makefile.am +++ /dev/null @@ -1,48 +0,0 @@ -## Process this file with automake to produce Makefile.in -NULL = -DEPTH = .. - -bin_PROGRAMS = synergyd -synergyd_SOURCES = \ - CClientProxy.cpp \ - CClientProxy1_0.cpp \ - CConfig.cpp \ - CHTTPServer.cpp \ - CPrimaryClient.cpp \ - CPrimaryScreen.cpp \ - CServer.cpp \ - CXWindowsPrimaryScreen.cpp \ - server.cpp \ - CClientProxy.h \ - CClientProxy1_0.h \ - CConfig.h \ - CHTTPServer.h \ - CPrimaryClient.h \ - CPrimaryScreen.h \ - CServer.h \ - CXWindowsPrimaryScreen.h \ - $(NULL) -synergyd_LDADD = \ - $(DEPTH)/platform/libplatform.a \ - $(DEPTH)/synergy/libsynergy.a \ - $(DEPTH)/net/libnet.a \ - $(DEPTH)/http/libhttp.a \ - $(DEPTH)/io/libio.a \ - $(DEPTH)/mt/libmt.a \ - $(DEPTH)/base/libbase.a \ - $(X_LIBS) \ - $(X_PRE_LIBS) \ - -lXtst \ - -lXext \ - -lX11 \ - $(X_EXTRA_LIBS) \ - $(NULL) -INCLUDES = \ - -I$(DEPTH)/base \ - -I$(DEPTH)/mt \ - -I$(DEPTH)/io \ - -I$(DEPTH)/http \ - -I$(DEPTH)/net \ - -I$(DEPTH)/synergy \ - -I$(DEPTH)/platform \ - $(NULL) diff --git a/synergy.dsw b/synergy.dsw index 2ba5beae..efbf7453 100644 --- a/synergy.dsw +++ b/synergy.dsw @@ -12,16 +12,16 @@ Package=<5> Package=<4> {{{ Begin Project Dependency - Project_Dep_Name client + Project_Dep_Name synergy End Project Dependency Begin Project Dependency - Project_Dep_Name server + Project_Dep_Name synergyd End Project Dependency }}} ############################################################################### -Project: "base"=.\base\base.dsp - Package Owner=<4> +Project: "base"=.\lib\base\base.dsp - Package Owner=<4> Package=<5> {{{ @@ -33,7 +33,106 @@ Package=<4> ############################################################################### -Project: "client"=.\client\client.dsp - Package Owner=<4> +Project: "client"=.\lib\client\client.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Project: "http"=.\lib\HTTP\http.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Project: "io"=.\lib\io\io.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: "synergy"=.\cmd\synergy\synergy.dsp - Package Owner=<4> Package=<5> {{{ @@ -54,91 +153,19 @@ Package=<4> Project_Dep_Name net End Project Dependency Begin Project Dependency - Project_Dep_Name synergy + Project_Dep_Name libsynergy End Project Dependency Begin Project Dependency Project_Dep_Name platform End Project Dependency -}}} - -############################################################################### - -Project: "http"=.\HTTP\http.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "io"=.\io\io.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "makehook"=.\platform\makehook.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ Begin Project Dependency - Project_Dep_Name synrgyhk + Project_Dep_Name client End Project Dependency }}} ############################################################################### -Project: "mt"=.\mt\mt.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "net"=.\net\net.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "platform"=.\platform\platform.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "server"=.\server\server.dsp - Package Owner=<4> +Project: "synergyd"=.\cmd\synergyd\synergyd.dsp - Package Owner=<4> Package=<5> {{{ @@ -162,7 +189,7 @@ Package=<4> Project_Dep_Name net End Project Dependency Begin Project Dependency - Project_Dep_Name synergy + Project_Dep_Name libsynergy End Project Dependency Begin Project Dependency Project_Dep_Name platform @@ -170,11 +197,14 @@ Package=<4> Begin Project Dependency Project_Dep_Name makehook End Project Dependency + Begin Project Dependency + Project_Dep_Name server + End Project Dependency }}} ############################################################################### -Project: "synergy"=.\synergy\synergy.dsp - Package Owner=<4> +Project: "libsynergy"=.\lib\synergy\libsynergy.dsp - Package Owner=<4> Package=<5> {{{ @@ -186,7 +216,7 @@ Package=<4> ############################################################################### -Project: "synrgyhk"=.\platform\synrgyhk.dsp - Package Owner=<4> +Project: "synrgyhk"=.\lib\platform\synrgyhk.dsp - Package Owner=<4> Package=<5> {{{