xonotic:terencehill/sdl_compilation: a S merge request: Add missing dependency for sdl compilation under mingw32
git-manager created issue #1945 (closed) on 2014-03-27T00:41:32Z:
Add missing dependency for sdl compilation under mingw32
Repository: xonotic/xonotic.git Commit: 35d70b5ce898799d88ae9a44311d212899dd1390 Branch: terencehill/sdl_compilation
Merge commands:
cd .
git checkout master
git reset --hard origin/master
git pull && git diff '35d70b5ce898799d88ae9a44311d212899dd1390'..'origin/terencehill/sdl_compilation'
# please check that the diff you just saw did not contain anything complex that
# needs a new merge request, and review these changes
git merge --edit --log --no-ff 'origin/terencehill/sdl_compilation'
# please make sure this merge worked, and if not, fix merge conflicts and git
# commit BEFORE the next command
#
# also, THIS is the point to do final pre-merge testing
#
# use git reset --hard origin/master to bail out
git push && git push --delete origin 'terencehill/sdl_compilation'
Diffstat:
misc/tools/all/xonotic.subr | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
Revision log:
commit 35d70b5ce898799d88ae9a44311d212899dd1390
Author: terencehill
Commit: terencehill
Add missing dependency for sdl compilation under mingw32
User agreed to the license.
Diff:
diff --git a/misc/tools/all/xonotic.subr b/misc/tools/all/xonotic.subr
index 96a82a3..f24a051 100644
--- a/misc/tools/all/xonotic.subr
+++ b/misc/tools/all/xonotic.subr
@@ -105,6 +105,9 @@ case "$cmd" in
case "$X" in
sdl)
TARGETS="$TARGETS sdl-$debug"
+ if [ -n "$WE_HATE_OUR_USERS" ]; then
+ export PATH="$PATH:$d0/misc/builddeps/win32/sdl/bin"
+ fi
;;
agl)
TARGETS="$TARGETS cl-$debug"