nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-24 04:13:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/maint-0.2.5'

Browse Source
This commit is contained in:
Nick Mathewson 2014-09-09 10:27:41 -04:00
commit 2997908228
6 changed files with 37 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.nmake
View File

@ -1,6 +1,8 @@
all: all:
cd src/common cd src/common
$(MAKE) /F Makefile.nmake $(MAKE) /F Makefile.nmake
cd ../../src/ext
$(MAKE) /F Makefile.nmake
cd ../../src/or cd ../../src/or
$(MAKE) /F Makefile.nmake $(MAKE) /F Makefile.nmake
cd ../../src/test cd ../../src/test
@ -9,6 +11,8 @@ all:
clean: clean:
cd src/common cd src/common
$(MAKE) /F Makefile.nmake clean $(MAKE) /F Makefile.nmake clean
cd ../../src/ext
$(MAKE) /F Makefile.nmake clean
cd ../../src/or cd ../../src/or
$(MAKE) /F Makefile.nmake clean $(MAKE) /F Makefile.nmake clean
cd ../../src/test cd ../../src/test

3
changes/bug13081 Normal file
View File

@ -0,0 +1,3 @@
o Compilation fixes:
- Make the nmake make files work again. Fixes bug 13081. Bugfix on 0.2.5.1-alpha. Patch
from "NewEraCracker".

9
src/common/Makefile.nmake
View File

@ -1,12 +1,13 @@
all: libor.lib libor-crypto.lib libor-event.lib 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 \ LIBOR_OBJECTS = address.obj backtrace.obj compat.obj container.obj di_ops.obj \
log.obj memarea.obj mempool.obj procmon.obj util.obj \ log.obj memarea.obj mempool.obj procmon.obj sandbox.obj util.obj \
util_codedigest.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 crypto_curve25519.obj curve25519-donna.obj
LIBOR_EVENT_OBJECTS = compat_libevent.obj LIBOR_EVENT_OBJECTS = compat_libevent.obj

12
src/ext/Makefile.nmake Normal file
View File

@ -0,0 +1,12 @@
all: csiphash.lib
CFLAGS = /O2 /MT /I ..\win32 /I ..\..\..\build-alpha\include /I ..\common \
/I ..\ext
CSIPHASH_OBJECTS = csiphash.obj
csiphash.lib: $(CSIPHASH_OBJECTS)
lib $(CSIPHASH_OBJECTS) $(CURVE25519_DONNA_OBJECTS) /out:csiphash.lib
clean:
del *.obj *.lib

8
src/or/Makefile.nmake
View File

@ -1,6 +1,6 @@
all: tor.exe all: tor.exe
CFLAGS = /I ..\win32 /I ..\..\..\build-alpha\include /I ..\common \ CFLAGS = /O2 /MT /I ..\win32 /I ..\..\..\build-alpha\include /I ..\common \
/I ..\ext /I ..\ext
LIBS = ..\..\..\build-alpha\lib\libevent.lib \ LIBS = ..\..\..\build-alpha\lib\libevent.lib \
@ -15,6 +15,7 @@ LIBTOR_OBJECTS = \
buffers.obj \ buffers.obj \
channel.obj \ channel.obj \
channeltls.obj \ channeltls.obj \
circpathbias.obj \
circuitbuild.obj \ circuitbuild.obj \
circuitlist.obj \ circuitlist.obj \
circuitmux.obj \ circuitmux.obj \
@ -35,6 +36,7 @@ LIBTOR_OBJECTS = \
dirvote.obj \ dirvote.obj \
dns.obj \ dns.obj \
dnsserv.obj \ dnsserv.obj \
ext_orport.obj \
fp_pair.obj \ fp_pair.obj \
entrynodes.obj \ entrynodes.obj \
geoip.obj \ geoip.obj \
@ -69,7 +71,7 @@ libtor.lib: $(LIBTOR_OBJECTS)
lib $(LIBTOR_OBJECTS) /out:$@ lib $(LIBTOR_OBJECTS) /out:$@
tor.exe: libtor.lib tor_main.obj tor.exe: libtor.lib tor_main.obj
$(CC) $(CFLAGS) $(LIBS) libtor.lib ..\common\*.lib tor_main.obj /Fe$@ $(CC) $(CFLAGS) $(LIBS) libtor.lib ..\common\*.lib ..\ext\*.lib tor_main.obj /Fe$@
clean: clean:
del $(LIBTOR_OBJECTS) *.lib tor.exe del $(LIBTOR_OBJECTS) tor_main.obj *.lib tor.exe

8
src/win32/orconfig.h
View File

@ -248,3 +248,11 @@
#define USE_CURVE25519_DONNA #define USE_CURVE25519_DONNA
#define ENUM_VALS_ARE_SIGNED 1 #define ENUM_VALS_ARE_SIGNED 1
#ifndef STDOUT_FILENO
#define STDOUT_FILENO 1
#endif
#ifndef STDERR_FILENO
#define STDERR_FILENO 2
#endif