summaryrefslogtreecommitdiff
path: root/src/common
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-09-09 10:27:41 -0400
committerNick Mathewson <nickm@torproject.org>2014-09-09 10:27:41 -0400
commit29979082286cc8fa4dadf4e1fcbe85a1aa58d757 (patch)
treed2b7ff746cd90f4cba0664bc446e3116d6d21ad6 /src/common
parentad0ae89b3c872ee89f4bd6096e650d4e2c855330 (diff)
parent8391c96091e8e86c43954302df0b188ec1e5490d (diff)
downloadtor-29979082286cc8fa4dadf4e1fcbe85a1aa58d757.tar.gz
tor-29979082286cc8fa4dadf4e1fcbe85a1aa58d757.zip
Merge remote-tracking branch 'origin/maint-0.2.5'
Diffstat (limited to 'src/common')
-rw-r--r--src/common/Makefile.nmake9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/common/Makefile.nmake b/src/common/Makefile.nmake
index 0ebeaaaf71..b8c5dd4fea 100644
--- a/src/common/Makefile.nmake
+++ b/src/common/Makefile.nmake
@@ -1,12 +1,13 @@
all: libor.lib libor-crypto.lib libor-event.lib
-CFLAGS = /I ..\win32 /I ..\..\..\build-alpha\include /I ..\ext
+CFLAGS = /O2 /MT /I ..\win32 /I ..\..\..\build-alpha\include /I ..\common \
+ /I ..\ext
-LIBOR_OBJECTS = address.obj compat.obj container.obj di_ops.obj \
- log.obj memarea.obj mempool.obj procmon.obj util.obj \
+LIBOR_OBJECTS = address.obj backtrace.obj compat.obj container.obj di_ops.obj \
+ log.obj memarea.obj mempool.obj procmon.obj sandbox.obj util.obj \
util_codedigest.obj
-LIBOR_CRYPTO_OBJECTS = aes.obj crypto.obj torgzip.obj tortls.obj \
+LIBOR_CRYPTO_OBJECTS = aes.obj crypto.obj crypto_format.obj torgzip.obj tortls.obj \
crypto_curve25519.obj curve25519-donna.obj
LIBOR_EVENT_OBJECTS = compat_libevent.obj