[tor-commits] [torbrowser/maint-2.2] tighten up windows build options for libevent and tor so they can always find openssl's dlls

[erinn@xxxxxxxxxxxxxx]

commit 75ac9322046be92d0ce547caf0e5b6fd6478856d
Author: Erinn Clark <erinn@xxxxxxxxxxxxxx>
Date:   Wed Oct 26 01:51:06 2011 +0100

    tighten up windows build options for libevent and tor so they can always find openssl's dlls
---
 build-scripts/windows.mk |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk
index 4a2de3d..f37a748 100644
--- a/build-scripts/windows.mk
+++ b/build-scripts/windows.mk
@@ -90,8 +90,8 @@ build-vidalia:
 	cd $(VIDALIA_DIR)/build && make
 
 LIBEVENT_DIR=$(FETCH_DIR)/libevent-$(LIBEVENT_VER)
-LIBEVENT_CFLAGS="-O -g"
-LIBEVENT_LDFLAGS="-Wl,--nxcompat -Wl,--dynamicbase"
+LIBEVENT_CFLAGS="-I$(BUILT_DIR)/include -O -g"
+LIBEVENT_LDFLAGS="-L$(BUILT_DIR)/lib -L$(BUILT_DIR)/bin -Wl,--nxcompat -Wl,--dynamicbase"
 LIBEVENT_OPTS=--prefix=$(BUILT_DIR) --enable-static --disable-shared --disable-dependency-tracking
 build-libevent:
 	cd $(LIBEVENT_DIR) && CFLAGS=$(LIBEVENT_CFLAGS) LDFLAGS=$(LIBEVENT_LDFLAGS) ./configure $(LIBEVENT_OPTS)
@@ -100,7 +100,7 @@ build-libevent:
 
 TOR_DIR=$(FETCH_DIR)/tor-$(TOR_VER)
 TOR_CFLAGS="-O -g -I$(BUILT_DIR)/include"
-TOR_LDFLAGS="-L$(BUILT_DIR)/lib"
+TOR_LDFLAGS="-L$(BUILT_DIR)/lib -L$(BUILT_DIR)/bin"
 TOR_OPTS=--enable-static-libevent --with-libevent-dir=$(BUILT_DIR)/lib --prefix=$(BUILT_DIR)
 build-tor:
 	cd $(TOR_DIR) && CFLAGS=$(TOR_CFLAGS) LDFLAGS=$(TOR_LDFLAGS) ./configure $(TOR_OPTS)

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits