From: Rudolf Polzer Date: Mon, 26 Jul 2010 11:35:34 +0000 (+0200) Subject: buildfiles: rename dir from w32 to win32 X-Git-Tag: xonotic-v0.1.0preview~340^2~5 X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=cfb1bdfa339a0bdc0192d7b6c5cc6849a58740ee;ds=sidebyside buildfiles: rename dir from w32 to win32 --- 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/w32/SDL.dll deleted file mode 100644 index 3ce97a59..00000000 Binary files a/misc/buildfiles/w32/SDL.dll and /dev/null differ diff --git a/misc/buildfiles/w32/libcurl-4.dll b/misc/buildfiles/w32/libcurl-4.dll deleted file mode 100755 index 1e41b765..00000000 Binary files a/misc/buildfiles/w32/libcurl-4.dll and /dev/null differ diff --git a/misc/buildfiles/w32/libfreetype-6.dll b/misc/buildfiles/w32/libfreetype-6.dll deleted file mode 100755 index 8413207b..00000000 Binary files a/misc/buildfiles/w32/libfreetype-6.dll and /dev/null differ diff --git a/misc/buildfiles/w32/libjpeg.dll b/misc/buildfiles/w32/libjpeg.dll deleted file mode 100644 index 99c0215d..00000000 Binary files a/misc/buildfiles/w32/libjpeg.dll and /dev/null differ diff --git a/misc/buildfiles/w32/libmodplug-0.dll b/misc/buildfiles/w32/libmodplug-0.dll deleted file mode 100755 index 8390535c..00000000 Binary files a/misc/buildfiles/w32/libmodplug-0.dll and /dev/null differ diff --git a/misc/buildfiles/w32/libpng12.dll b/misc/buildfiles/w32/libpng12.dll deleted file mode 100644 index db304503..00000000 Binary files a/misc/buildfiles/w32/libpng12.dll and /dev/null differ diff --git a/misc/buildfiles/w32/libtheora.dll b/misc/buildfiles/w32/libtheora.dll deleted file mode 100644 index ef66bd77..00000000 Binary files a/misc/buildfiles/w32/libtheora.dll and /dev/null differ diff --git a/misc/buildfiles/w32/ogg.dll b/misc/buildfiles/w32/ogg.dll deleted file mode 100644 index 76bc6219..00000000 Binary files a/misc/buildfiles/w32/ogg.dll and /dev/null differ diff --git a/misc/buildfiles/w32/vorbis.dll b/misc/buildfiles/w32/vorbis.dll deleted file mode 100644 index d19353b0..00000000 Binary files a/misc/buildfiles/w32/vorbis.dll and /dev/null differ diff --git a/misc/buildfiles/w32/vorbisenc.dll b/misc/buildfiles/w32/vorbisenc.dll deleted file mode 100644 index feb0808a..00000000 Binary files a/misc/buildfiles/w32/vorbisenc.dll and /dev/null differ diff --git a/misc/buildfiles/w32/vorbisfile.dll b/misc/buildfiles/w32/vorbisfile.dll deleted file mode 100644 index 2892040c..00000000 Binary files a/misc/buildfiles/w32/vorbisfile.dll and /dev/null differ diff --git a/misc/buildfiles/w32/zlib1.dll b/misc/buildfiles/w32/zlib1.dll deleted file mode 100644 index 2b0072b0..00000000 Binary files a/misc/buildfiles/w32/zlib1.dll and /dev/null differ diff --git a/misc/buildfiles/win32/SDL.dll b/misc/buildfiles/win32/SDL.dll new file mode 100644 index 00000000..3ce97a59 Binary files /dev/null and b/misc/buildfiles/win32/SDL.dll differ diff --git a/misc/buildfiles/win32/libcurl-4.dll b/misc/buildfiles/win32/libcurl-4.dll new file mode 100755 index 00000000..1e41b765 Binary files /dev/null and b/misc/buildfiles/win32/libcurl-4.dll differ diff --git a/misc/buildfiles/win32/libfreetype-6.dll b/misc/buildfiles/win32/libfreetype-6.dll new file mode 100755 index 00000000..8413207b Binary files /dev/null and b/misc/buildfiles/win32/libfreetype-6.dll differ diff --git a/misc/buildfiles/win32/libjpeg.dll b/misc/buildfiles/win32/libjpeg.dll new file mode 100644 index 00000000..99c0215d Binary files /dev/null and b/misc/buildfiles/win32/libjpeg.dll differ diff --git a/misc/buildfiles/win32/libmodplug-0.dll b/misc/buildfiles/win32/libmodplug-0.dll new file mode 100755 index 00000000..8390535c Binary files /dev/null and b/misc/buildfiles/win32/libmodplug-0.dll differ diff --git a/misc/buildfiles/win32/libpng12.dll b/misc/buildfiles/win32/libpng12.dll new file mode 100644 index 00000000..db304503 Binary files /dev/null and b/misc/buildfiles/win32/libpng12.dll differ diff --git a/misc/buildfiles/win32/libtheora.dll b/misc/buildfiles/win32/libtheora.dll new file mode 100644 index 00000000..ef66bd77 Binary files /dev/null and b/misc/buildfiles/win32/libtheora.dll differ diff --git a/misc/buildfiles/win32/ogg.dll b/misc/buildfiles/win32/ogg.dll new file mode 100644 index 00000000..76bc6219 Binary files /dev/null and b/misc/buildfiles/win32/ogg.dll differ diff --git a/misc/buildfiles/win32/vorbis.dll b/misc/buildfiles/win32/vorbis.dll new file mode 100644 index 00000000..d19353b0 Binary files /dev/null and b/misc/buildfiles/win32/vorbis.dll differ diff --git a/misc/buildfiles/win32/vorbisenc.dll b/misc/buildfiles/win32/vorbisenc.dll new file mode 100644 index 00000000..feb0808a Binary files /dev/null and b/misc/buildfiles/win32/vorbisenc.dll differ diff --git a/misc/buildfiles/win32/vorbisfile.dll b/misc/buildfiles/win32/vorbisfile.dll new file mode 100644 index 00000000..2892040c Binary files /dev/null and b/misc/buildfiles/win32/vorbisfile.dll differ diff --git a/misc/buildfiles/win32/zlib1.dll b/misc/buildfiles/win32/zlib1.dll new file mode 100644 index 00000000..2b0072b0 Binary files /dev/null and b/misc/buildfiles/win32/zlib1.dll differ