From cfb1bdfa339a0bdc0192d7b6c5cc6849a58740ee Mon Sep 17 00:00:00 2001
From: Rudolf Polzer <divverent@alientrap.org>
Date: Mon, 26 Jul 2010 13:35:34 +0200
Subject: [PATCH] buildfiles: rename dir from w32 to win32

---
 all                                              |   6 +++---
 misc/buildfiles/{w32 => win32}/SDL.dll           | Bin
 misc/buildfiles/{w32 => win32}/libcurl-4.dll     | Bin
 misc/buildfiles/{w32 => win32}/libfreetype-6.dll | Bin
 misc/buildfiles/{w32 => win32}/libjpeg.dll       | Bin
 misc/buildfiles/{w32 => win32}/libmodplug-0.dll  | Bin
 misc/buildfiles/{w32 => win32}/libpng12.dll      | Bin
 misc/buildfiles/{w32 => win32}/libtheora.dll     | Bin
 misc/buildfiles/{w32 => win32}/ogg.dll           | Bin
 misc/buildfiles/{w32 => win32}/vorbis.dll        | Bin
 misc/buildfiles/{w32 => win32}/vorbisenc.dll     | Bin
 misc/buildfiles/{w32 => win32}/vorbisfile.dll    | Bin
 misc/buildfiles/{w32 => win32}/zlib1.dll         | Bin
 13 files changed, 3 insertions(+), 3 deletions(-)
 rename misc/buildfiles/{w32 => win32}/SDL.dll (100%)
 rename misc/buildfiles/{w32 => win32}/libcurl-4.dll (100%)
 rename misc/buildfiles/{w32 => win32}/libfreetype-6.dll (100%)
 rename misc/buildfiles/{w32 => win32}/libjpeg.dll (100%)
 rename misc/buildfiles/{w32 => win32}/libmodplug-0.dll (100%)
 rename misc/buildfiles/{w32 => win32}/libpng12.dll (100%)
 rename misc/buildfiles/{w32 => win32}/libtheora.dll (100%)
 rename misc/buildfiles/{w32 => win32}/ogg.dll (100%)
 rename misc/buildfiles/{w32 => win32}/vorbis.dll (100%)
 rename misc/buildfiles/{w32 => win32}/vorbisenc.dll (100%)
 rename misc/buildfiles/{w32 => win32}/vorbisfile.dll (100%)
 rename misc/buildfiles/{w32 => win32}/zlib1.dll (100%)

diff --git a/all b/all
index 690ee8f1..2906d8a0 100755
--- a/all
+++ b/all
@@ -539,7 +539,7 @@ case "$cmd" in
 	run)
 		if [ -n "$WE_HATE_OUR_USERS" ]; then
 			client=
-			export PATH="$d0/misc/buildfiles/w32:$PATH"
+			export PATH="$d0/misc/buildfiles/win64:$d0/misc/buildfiles/win32:$PATH"
 		elif [ x"`uname`" = x"Darwin" ]; then
 			export DYLD_LIBRARY_PATH="$d0/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS"
 			export DYLD_FRAMEWORK_PATH="$d0/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks"
@@ -845,14 +845,14 @@ case "$cmd" in
 		"$SELF" release-compile-run "xonotic-build-$suffix" /tmp/Darkplaces.build."$suffix" "$darkplaces_maketargets" "$makeflags" "fteqcc" "$darkplaces_files"
 		;;
 	release-engine-win32)
-		rsync --exclude=.git -vaSHPAX Xonotic/misc/buildfiles/w32/* Xonotic/
+		rsync --exclude=.git -vaSHPAX Xonotic/misc/buildfiles/win32/* Xonotic/
 		"$SELF" release-compile win32 \
 			'"DP_MAKE_TARGET=mingw CC="i586-mingw32msvc-gcc -Wl,--dynamicbase -Wl,--nxcompat -g -DSUPPORTDIRECTX -DUSE_WSPIAPI_H -I$HOME/dp.win32/include -L$HOME/dp.win32/lib" WINDRES="i586-mingw32msvc-windres" SDL_CONFIG="$HOME/dp.win32/bin/sdl-config"' \
 			win 'fteqcc.exe:Xonotic/fteqcc/fteqcc.exe' \
 			debug 'darkplaces.exe:xonotic.exe darkplaces-sdl.exe:xonotic-sdl.exe darkplaces-dedicated.exe:xonotic-dedicated.exe'
 		;;
 	release-engine-win64)
-		rsync --exclude=.git -vaSHPAX Xonotic/misc/buildfiles/w32/* Xonotic/
+		rsync --exclude=.git -vaSHPAX Xonotic/misc/buildfiles/win64/* Xonotic/
 		"$SELF" release-compile win32 \
 			'"DP_MAKE_TARGET=mingw CC="amd64-mingw32msvc-gcc -Wl,--dynamicbase -Wl,--nxcompat -g -DSUPPORTDIRECTX -DUSE_WSPIAPI_H -I$HOME/dp.win64/include -L$HOME/dp.win64/lib" WINDRES="amd64-mingw32msvc-windres" SDL_CONFIG="$HOME/dp.win64/bin/sdl-config"' \
 			win 'fteqcc.exe:Xonotic/fteqcc/fteqcc-64.exe' \
diff --git a/misc/buildfiles/w32/SDL.dll b/misc/buildfiles/win32/SDL.dll
similarity index 100%
rename from misc/buildfiles/w32/SDL.dll
rename to misc/buildfiles/win32/SDL.dll
diff --git a/misc/buildfiles/w32/libcurl-4.dll b/misc/buildfiles/win32/libcurl-4.dll
similarity index 100%
rename from misc/buildfiles/w32/libcurl-4.dll
rename to misc/buildfiles/win32/libcurl-4.dll
diff --git a/misc/buildfiles/w32/libfreetype-6.dll b/misc/buildfiles/win32/libfreetype-6.dll
similarity index 100%
rename from misc/buildfiles/w32/libfreetype-6.dll
rename to misc/buildfiles/win32/libfreetype-6.dll
diff --git a/misc/buildfiles/w32/libjpeg.dll b/misc/buildfiles/win32/libjpeg.dll
similarity index 100%
rename from misc/buildfiles/w32/libjpeg.dll
rename to misc/buildfiles/win32/libjpeg.dll
diff --git a/misc/buildfiles/w32/libmodplug-0.dll b/misc/buildfiles/win32/libmodplug-0.dll
similarity index 100%
rename from misc/buildfiles/w32/libmodplug-0.dll
rename to misc/buildfiles/win32/libmodplug-0.dll
diff --git a/misc/buildfiles/w32/libpng12.dll b/misc/buildfiles/win32/libpng12.dll
similarity index 100%
rename from misc/buildfiles/w32/libpng12.dll
rename to misc/buildfiles/win32/libpng12.dll
diff --git a/misc/buildfiles/w32/libtheora.dll b/misc/buildfiles/win32/libtheora.dll
similarity index 100%
rename from misc/buildfiles/w32/libtheora.dll
rename to misc/buildfiles/win32/libtheora.dll
diff --git a/misc/buildfiles/w32/ogg.dll b/misc/buildfiles/win32/ogg.dll
similarity index 100%
rename from misc/buildfiles/w32/ogg.dll
rename to misc/buildfiles/win32/ogg.dll
diff --git a/misc/buildfiles/w32/vorbis.dll b/misc/buildfiles/win32/vorbis.dll
similarity index 100%
rename from misc/buildfiles/w32/vorbis.dll
rename to misc/buildfiles/win32/vorbis.dll
diff --git a/misc/buildfiles/w32/vorbisenc.dll b/misc/buildfiles/win32/vorbisenc.dll
similarity index 100%
rename from misc/buildfiles/w32/vorbisenc.dll
rename to misc/buildfiles/win32/vorbisenc.dll
diff --git a/misc/buildfiles/w32/vorbisfile.dll b/misc/buildfiles/win32/vorbisfile.dll
similarity index 100%
rename from misc/buildfiles/w32/vorbisfile.dll
rename to misc/buildfiles/win32/vorbisfile.dll
diff --git a/misc/buildfiles/w32/zlib1.dll b/misc/buildfiles/win32/zlib1.dll
similarity index 100%
rename from misc/buildfiles/w32/zlib1.dll
rename to misc/buildfiles/win32/zlib1.dll
-- 
2.39.2