Revise project files; make them work

svn:r2858

2 files changed, 351 insertions, 11 deletions

diff --git a/Win32Build/vc6/tor/Tor.dsp b/Win32Build/vc6/tor/Tor.dsp
index 1101777a9..4df3052ec 100755
--- a/Win32Build/vc6/tor/Tor.dsp
+++ b/Win32Build/vc6/tor/Tor.dsp
@@ -39,17 +39,18 @@ RSC=rc.exe
 # PROP Use_Debug_Libraries 0
 # 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 "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\src\win32" /I "c:\openssl\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
 # 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  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:console /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  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:console /machine:I386
+# 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 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:console /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 wsock32.lib ssleay32.lib libeay32.lib /nologo /subsystem:console /machine:I386 /libpath:"c:\openssl\lib\vc"
 
 !ELSEIF  "$(CFG)" == "tor - Win32 Debug"
 
@@ -62,17 +63,18 @@ LINK32=link.exe
 # PROP Use_Debug_Libraries 1
 # 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 "_CONSOLE" /D "_MBCS" /YX /FD /GZ  /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ  /c
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\..\..\src\win32" /I "c:\openssl\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
 # 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  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:console /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  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:console /debug /machine:I386 /pdbtype:sept
+# 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 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:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 wsock32.lib ssleay32.lib libeay32.lib 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:console /debug /machine:I386 /pdbtype:sept /libpath:"c:\openssl\lib\vc"
 
 !ENDIF 
 
@@ -83,10 +85,310 @@ LINK32=link.exe
 # Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Group "common"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\..\src\common\aes.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\src\common\compat.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\src\common\container.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\src\common\crypto.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\src\common\fakepoll.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\src\common\log.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\src\common\log.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\src\common\torgzip.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\src\common\tortls.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\src\common\util.c
+# End Source File
+# End Group
+# Begin Group "zlib"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\..\contrib\zlib\adler32.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\contrib\zlib\compress.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\contrib\zlib\crc32.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\contrib\zlib\crc32.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\contrib\zlib\deflate.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\contrib\zlib\deflate.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\contrib\zlib\gzio.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\contrib\zlib\infback.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\contrib\zlib\inffast.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\contrib\zlib\inffast.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\contrib\zlib\inffixed.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\contrib\zlib\inflate.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\contrib\zlib\inflate.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\contrib\zlib\inftrees.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\contrib\zlib\inftrees.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\contrib\zlib\trees.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\contrib\zlib\trees.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\contrib\zlib\uncompr.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\contrib\zlib\zconf.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\contrib\zlib\zlib.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\contrib\zlib\zutil.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\contrib\zlib\zutil.h
+# End Source File
+# End Group
+# Begin Group "or"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\..\src\or\buffers.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\src\or\circuitbuild.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\src\or\circuitlist.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\src\or\circuituse.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\src\or\command.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\src\or\config.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\src\or\connection.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\src\or\connection_edge.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\src\or\connection_or.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\src\or\control.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\src\or\cpuworker.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\src\or\directory.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\src\or\dirserv.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\src\or\dns.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\src\or\hibernate.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\src\or\main.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\src\or\onion.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\src\or\relay.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\src\or\rendclient.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\src\or\rendcommon.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\src\or\rendmid.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\src\or\rendservice.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\src\or\rephist.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\src\or\router.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\src\or\routerlist.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\src\or\routerparse.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\src\or\tor_main.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\src\or\tree.h
+# End Source File
+# End Group
 # End Group
 # Begin Group "Header Files"
 
 # PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\..\..\src\common\aes.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\src\common\compat.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\src\common\container.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\src\common\crypto.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\src\common\fakepoll.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\src\or\or.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\src\win32\orconfig.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\src\common\test.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\src\common\torgzip.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\src\common\torint.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\src\common\tortls.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\src\common\util.h
+# End Source File
 # End Group
 # Begin Group "Resource Files"
 
diff --git a/Win32Build/vc6/tor_resolve/tor_resolve.dsp b/Win32Build/vc6/tor_resolve/tor_resolve.dsp
index 4a3f84e16..63f406b9e 100755
--- a/Win32Build/vc6/tor_resolve/tor_resolve.dsp
+++ b/Win32Build/vc6/tor_resolve/tor_resolve.dsp
@@ -39,9 +39,10 @@ RSC=rc.exe
 # PROP Use_Debug_Libraries 0
 # 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 "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\src\win32" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
@@ -49,7 +50,7 @@ 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  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:console /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  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:console /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 wsock32.lib /nologo /subsystem:console /machine:I386
 
 !ELSEIF  "$(CFG)" == "tor_resolve - Win32 Debug"
 
@@ -62,9 +63,10 @@ LINK32=link.exe
 # PROP Use_Debug_Libraries 1
 # 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 "_CONSOLE" /D "_MBCS" /YX /FD /GZ  /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ  /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\..\..\src\win32" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ  /c
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
@@ -72,7 +74,7 @@ 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  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:console /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  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:console /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 wsock32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
 
 !ENDIF 
 
@@ -83,10 +85,46 @@ LINK32=link.exe
 # Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\..\src\common\compat.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\src\common\log.c
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\src\tools\tor-resolve.c"
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\src\common\util.c
+# End Source File
 # End Group
 # Begin Group "Header Files"
 
 # PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\..\..\src\common\compat.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\src\common\log.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\src\win32\orconfig.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\src\common\torint.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\src\common\util.h
+# End Source File
 # End Group
 # Begin Group "Resource Files"