Ticket #13081: fix-vs-build-win.txt

File fix-vs-build-win.txt, 3.6 KB (added by NewEraCracker, 5 years ago)
Line 
1diff -uNraw tor-0.2.5.6-alpha/Makefile.nmake tor-0.2.5.6-alpha.new/Makefile.nmake
2--- tor-0.2.5.6-alpha/Makefile.nmake    Sat Jun 21 21:16:03 2014
3+++ tor-0.2.5.6-alpha.new/Makefile.nmake        Mon Sep  8 02:50:26 2014
4@@ -1,6 +1,8 @@
5 all:
6        cd src/common
7        $(MAKE) /F Makefile.nmake
8+       cd ../../src/ext
9+       $(MAKE) /F Makefile.nmake
10        cd ../../src/or
11        $(MAKE) /F Makefile.nmake
12        cd ../../src/test
13@@ -9,6 +11,8 @@
14 clean:
15        cd src/common
16        $(MAKE) /F Makefile.nmake clean
17+       cd ../../src/ext
18+       $(MAKE) /F Makefile.nmake clean
19        cd ../../src/or
20        $(MAKE) /F Makefile.nmake clean
21        cd ../../src/test
22diff -uNraw tor-0.2.5.6-alpha/src/common/Makefile.nmake tor-0.2.5.6-alpha.new/src/common/Makefile.nmake
23--- tor-0.2.5.6-alpha/src/common/Makefile.nmake Sat Jun 21 21:16:03 2014
24+++ tor-0.2.5.6-alpha.new/src/common/Makefile.nmake     Mon Sep  8 02:52:30 2014
25@@ -1,12 +1,13 @@
26 all: libor.lib libor-crypto.lib libor-event.lib
27 
28-CFLAGS = /I ..\win32 /I ..\..\..\build-alpha\include /I ..\ext
29+CFLAGS = /O2 /MT /I ..\win32 /I ..\..\..\build-alpha\include /I ..\common \
30+    /I ..\ext
31 
32-LIBOR_OBJECTS = address.obj compat.obj container.obj di_ops.obj \
33-       log.obj memarea.obj mempool.obj procmon.obj util.obj \
34+LIBOR_OBJECTS = address.obj backtrace.obj compat.obj container.obj di_ops.obj \
35+       log.obj memarea.obj mempool.obj procmon.obj sandbox.obj util.obj \
36        util_codedigest.obj
37 
38-LIBOR_CRYPTO_OBJECTS = aes.obj crypto.obj torgzip.obj tortls.obj \
39+LIBOR_CRYPTO_OBJECTS = aes.obj crypto.obj crypto_format.obj torgzip.obj tortls.obj \
40        crypto_curve25519.obj curve25519-donna.obj
41 
42 LIBOR_EVENT_OBJECTS = compat_libevent.obj
43diff -uNraw tor-0.2.5.6-alpha/src/ext/Makefile.nmake tor-0.2.5.6-alpha.new/src/ext/Makefile.nmake
44--- tor-0.2.5.6-alpha/src/ext/Makefile.nmake    Thu Jan  1 00:00:00 1970
45+++ tor-0.2.5.6-alpha.new/src/ext/Makefile.nmake        Mon Sep  8 02:42:28 2014
46@@ -0,0 +1,12 @@
47+all: csiphash.lib
48+
49+CFLAGS = /O2 /MT /I ..\win32 /I ..\..\..\build-alpha\include /I ..\common \
50+    /I ..\ext
51+
52+CSIPHASH_OBJECTS = csiphash.obj
53+
54+csiphash.lib: $(CSIPHASH_OBJECTS)
55+       lib $(CSIPHASH_OBJECTS) $(CURVE25519_DONNA_OBJECTS) /out:csiphash.lib
56+
57+clean:
58+       del *.obj *.lib
59diff -uNraw tor-0.2.5.6-alpha/src/or/Makefile.nmake tor-0.2.5.6-alpha.new/src/or/Makefile.nmake
60--- tor-0.2.5.6-alpha/src/or/Makefile.nmake     Sat Jun 21 21:16:03 2014
61+++ tor-0.2.5.6-alpha.new/src/or/Makefile.nmake Mon Sep  8 02:51:42 2014
62@@ -1,6 +1,6 @@
63 all: tor.exe
64 
65-CFLAGS = /I ..\win32 /I ..\..\..\build-alpha\include /I ..\common \
66+CFLAGS = /O2 /MT /I ..\win32 /I ..\..\..\build-alpha\include /I ..\common \
67     /I ..\ext
68 
69 LIBS = ..\..\..\build-alpha\lib\libevent.lib \
70@@ -15,6 +15,7 @@
71   buffers.obj \
72   channel.obj \
73   channeltls.obj \
74+  circpathbias.obj \
75   circuitbuild.obj \
76   circuitlist.obj \
77   circuitmux.obj \
78@@ -35,6 +36,7 @@
79   dirvote.obj \
80   dns.obj \
81   dnsserv.obj \
82+  ext_orport.obj \
83   fp_pair.obj \
84   entrynodes.obj \
85   geoip.obj \
86@@ -69,7 +71,7 @@
87        lib $(LIBTOR_OBJECTS) /out:$@
88 
89 tor.exe: libtor.lib tor_main.obj
90-       $(CC) $(CFLAGS) $(LIBS) libtor.lib ..\common\*.lib tor_main.obj /Fe$@
91+       $(CC) $(CFLAGS) $(LIBS) libtor.lib ..\common\*.lib ..\ext\*.lib tor_main.obj /Fe$@
92 
93 clean:
94-       del $(LIBTOR_OBJECTS) *.lib tor.exe
95+       del $(LIBTOR_OBJECTS) tor_main.obj *.lib tor.exe
96diff -uNraw tor-0.2.5.6-alpha/src/win32/orconfig.h tor-0.2.5.6-alpha.new/src/win32/orconfig.h
97--- tor-0.2.5.6-alpha/src/win32/orconfig.h      Mon Jul 28 10:00:13 2014
98+++ tor-0.2.5.6-alpha.new/src/win32/orconfig.h  Mon Sep  8 02:54:44 2014
99@@ -257,3 +257,11 @@
100 #define USE_CURVE25519_DONNA
101 
102 #define ENUM_VALS_ARE_SIGNED 1
103+
104+#ifndef STDOUT_FILENO
105+#define STDOUT_FILENO 1
106+#endif
107+
108+#ifndef STDERR_FILENO
109+#define STDERR_FILENO 2
110+#endif