[X2Go-Commits] [x2goclient] 01/02: Windows: move building into client_build subdirectory.
git-admin at x2go.org
git-admin at x2go.org
Thu Mar 5 23:38:18 CET 2015
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch feature/cleanup
in repository x2goclient.
commit afece2be82edcc97da34b78aa969c2feaeb5161a
Author: Mihai Moldovan <ionic at ionic.de>
Date: Thu Mar 5 23:31:18 2015 +0100
Windows: move building into client_build subdirectory.
Also needs the changes in buildscripts.git.
---
config_win.bat | 18 ++++++++++++++++--
debian/changelog | 2 ++
x2gohelper/Makefile | 2 +-
3 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/config_win.bat b/config_win.bat
index a96af19..393a887 100755
--- a/config_win.bat
+++ b/config_win.bat
@@ -1,7 +1,21 @@
-mingw32-make distclean
+rmdir /s /q client_build
+rmdir /s /q plugin_build
+
+mingw32-make clean
+
+mkdir client_build
+
+cd client_build
+
lrelease x2goclient.pro
+
set X2GO_CLIENT_TARGET=
-qmake
+
+qmake ..\x2goclient.pro
+
+cd ..
cd x2gohelper
+
mingw32-make clean
+
cd ..
diff --git a/debian/changelog b/debian/changelog
index caa74ac..16e2c13 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -174,6 +174,8 @@ x2goclient (4.0.4.0-0x2go1) UNRELEASED; urgency=low
x2goclient.pro.
- Move ICON definition up before it's actually used in the macx section in
x2goclient.pro.
+ - Windows: move building into client_build subdirectory. Also needs the
+ changes in buildscripts.git.
-- X2Go Release Manager <git-admin at x2go.org> Thu, 19 Feb 2015 13:25:28 +0100
diff --git a/x2gohelper/Makefile b/x2gohelper/Makefile
index ae12ded..bf67ded 100644
--- a/x2gohelper/Makefile
+++ b/x2gohelper/Makefile
@@ -1,4 +1,4 @@
all:
- g++ -mwindows -o ../release/x2gohelper.exe x2gohelper.cpp
+ g++ -mwindows -o ../client_build/release/x2gohelper.exe x2gohelper.cpp
clean:
del ..\release\x2gohelper.exe
--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
More information about the x2go-commits
mailing list