[tor-commits] [torbrowser/master] add build options to make vidalia use DEP/ASLR on windows

[erinn at torproject.org]

commit 689b151a56a5ba4e547dc8d168142078ce40248e
Author: Erinn Clark <erinn at torproject.org>
Date:   Thu Sep 29 00:41:55 2011 +0100

    add build options to make vidalia use DEP/ASLR on windows
---
 build-scripts/windows.mk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk
index 09299a2..741887c 100644
--- a/build-scripts/windows.mk
+++ b/build-scripts/windows.mk
@@ -82,7 +82,7 @@ build-openssl:
 	cd $(OPENSSL_DIR) && make install
 
 VIDALIA_DIR=$(FETCH_DIR)/vidalia-$(VIDALIA_VER)
-VIDALIA_OPTS=-DCMAKE_EXE_LINKER_FLAGS="-static-libstdc++" -DWIN2K=1 -DQT_MAKE_EXECUTABLE=/c/Qt/$(QT_VER)/bin/qmake -DCMAKE_BUILD_TYPE=minsizerel -DMINGW_BINARY_DIR=$(MING) -DOPENSSL_BINARY_DIR=$(OPENSSL) -DWIX_BINARY_DIR=$(WIX_LIB)
+VIDALIA_OPTS=-DCMAKE_EXE_LINKER_FLAGS="-static-libstdc++ -Wl,--nxcompat -Wl,--dynamicbase" -DWIN2K=1 -DQT_MAKE_EXECUTABLE=/c/Qt/$(QT_VER)/bin/qmake -DCMAKE_BUILD_TYPE=minsizerel -DMINGW_BINARY_DIR=$(MING) -DOPENSSL_BINARY_DIR=$(OPENSSL) -DWIX_BINARY_DIR=$(WIX_LIB)
 build-vidalia:
 	-mkdir $(VIDALIA_DIR)/build
 	cd $(VIDALIA_DIR)/build && cmake -G "MSYS Makefiles" $(VIDALIA_OPTS) ..