diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-08-01 12:36:59 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-08-01 12:36:59 -0400 |
| commit | e802199cb3a2ebb4c09eaf4949e279acd3b46fc8 (patch) | |
| tree | dd7f9967cc185487620e34692611f3d0b7b88a4b /src/common | |
| parent | 9d77f24cf5032c4a1dbf64ec2e25d7debf3758ed (diff) | |
| download | tor-e802199cb3a2ebb4c09eaf4949e279acd3b46fc8.tar tor-e802199cb3a2ebb4c09eaf4949e279acd3b46fc8.tar.gz | |
Initial patch to build Tor with msvc and nmake
We'll still need to tweak it so that it looks for includes and
libraries somewhere more sensible than "where we happened to find
them on Erinn's system"; so that tests and tools get built too;
so that it's a bit documented; and so that we actually try running
the output.
Work done with Erinn Clark.
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/Makefile.am | 2 | ||||
| -rw-r--r-- | src/common/Makefile.nmake | 20 | ||||
| -rw-r--r-- | src/common/torgzip.c | 4 | ||||
| -rw-r--r-- | src/common/util.c | 6 |
4 files changed, 24 insertions, 8 deletions
diff --git a/src/common/Makefile.am b/src/common/Makefile.am index 48218491b..2244fe58d 100644 --- a/src/common/Makefile.am +++ b/src/common/Makefile.am @@ -1,7 +1,7 @@ noinst_LIBRARIES = libor.a libor-crypto.a libor-event.a -EXTRA_DIST = common_sha1.i sha256.c +EXTRA_DIST = common_sha1.i sha256.c Makefile.nmake #CFLAGS = -Wall -Wpointer-arith -O2 diff --git a/src/common/Makefile.nmake b/src/common/Makefile.nmake new file mode 100644 index 000000000..c8b598866 --- /dev/null +++ b/src/common/Makefile.nmake @@ -0,0 +1,20 @@ +all: libor.lib libor-crypto.lib libor-event.lib
+
+CFLAGS = /I ..\win32 /I ..\..\..\build-alpha\include
+
+LIBOR_OBJECTS = address.obj compat.obj container.obj di_ops.obj \
+ log.obj memarea.obj mempool.obj procmon.obj util.obj \
+ util_codedigest.obj
+
+LIBOR_CRYPTO_OBJECTS = aes.obj crypto.obj torgzip.obj tortls.obj
+
+LIBOR_EVENT_OBJECTS = compat_libevent.obj
+
+libor.lib: $(LIBOR_OBJECTS)
+ lib $(LIBOR_OBJECTS) /out:libor.lib
+
+libor-crypto.lib: $(LIBOR_CRYPTO_OBJECTS)
+ lib $(LIBOR_CRYPTO_OBJECTS) /out:libor-crypto.lib
+
+libor-event.lib: $(LIBOR_EVENT_OBJECTS)
+ lib $(LIBOR_EVENT_OBJECTS) /out:libor-event.lib
diff --git a/src/common/torgzip.c b/src/common/torgzip.c index 2937c67de..ae7d7cfc0 100644 --- a/src/common/torgzip.c +++ b/src/common/torgzip.c @@ -43,11 +43,7 @@ #define off64_t int64_t #endif -#ifdef _MSC_VER -#include "..\..\contrib\zlib\zlib.h" -#else #include <zlib.h> -#endif /** Set to 1 if zlib is a version that supports gzip; set to 0 if it doesn't; * set to -1 if we haven't checked yet. */ diff --git a/src/common/util.c b/src/common/util.c index 15b6e7130..601f2be3e 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -14,6 +14,9 @@ #define _GNU_SOURCE #include "orconfig.h" +#ifdef HAVE_FCNTL_H +#include <fcntl.h> +#endif #define UTIL_PRIVATE #include "util.h" #include "torlog.h" @@ -68,9 +71,6 @@ #ifdef HAVE_SYS_FCNTL_H #include <sys/fcntl.h> #endif -#ifdef HAVE_FCNTL_H -#include <fcntl.h> -#endif #ifdef HAVE_TIME_H #include <time.h> #endif |