commit 37142a84f895473db35f1213ff30321d7722b15a Author: Shondoit Walker shondoit@gmail.com Date: Tue May 29 23:57:56 2012 +0200
Fix build-vidalia to use the actual given QT location. The addition to PATH is required so that cmake can find the DLLs. --- build-scripts/windows.mk | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 60a5b95..e6d55b0 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -78,8 +78,9 @@ 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_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) +VIDALIA_OPTS=-DCMAKE_EXE_LINKER_FLAGS="-static-libstdc++ -Wl,--nxcompat -Wl,--dynamicbase" -DWIN2K=1 -DQT_QMAKE_EXECUTABLE=$(QT_LIB)/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: PATH+=:$(QT_LIB) build-vidalia: build-openssl $(VIDALIA_DIR) -mkdir $(VIDALIA_DIR)/build cd $(VIDALIA_DIR)/build && cmake -G "MSYS Makefiles" $(VIDALIA_OPTS) ..