[tor-commits] [torbrowser/master] Win: Fix qmake path setting for Vidalia's build

[erinn@xxxxxxxxxxxxxx]

commit 098270c72b78537324bb9a229902e45d84df4466
Author: Sebastian Hahn <sebastian@xxxxxxxxxxxxxx>
Date:   Tue May 1 18:02:25 2012 +0200

    Win: Fix qmake path setting for Vidalia's build
---
 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 200d6d2..855e211 100644
--- a/build-scripts/windows.mk
+++ b/build-scripts/windows.mk
@@ -78,7 +78,7 @@ build-qt: build-zlib build-openssl $(QT_DIR)
 	cd $(QT_DIR) && make install
 	touch $(STAMP_DIR)/build-qt
 
-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)
+VIDALIA_OPTS=-DCMAKE_EXE_LINKER_FLAGS="-static-libstdc++ -Wl,--nxcompat -Wl,--dynamicbase" -DWIN2K=1 -DQT_QMAKE_EXECUTABLE=/c/Qt/$(QT_VER)/bin/qmake -DCMAKE_BUILD_TYPE=minsizerel -DMINGW_BINARY_DIR=$(MING) -DOPENSSL_BINARY_DIR=$(OPENSSL) -DWIX_BINARY_DIR=$(WIX_LIB)
 # XXX Once we build qt on windows, we'll want to add build-qt here
 build-vidalia: build-openssl $(VIDALIA_DIR)
 	-mkdir $(VIDALIA_DIR)/build



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