]> git.xonotic.org Git - xonotic/xonotic.git/commitdiff
Revert "use a different name for mingw64 binaries", as the new compiler does not run
authorRudolf Polzer <divverent@alientrap.org>
Fri, 3 Sep 2010 10:42:52 +0000 (12:42 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 3 Sep 2010 10:42:52 +0000 (12:42 +0200)
This reverts commit 54fd63ab64aa8c0f373f5e4c61e8efc74676043a.

all

diff --git a/all b/all
index 1b20d4d9c2e69a407bea770fe89ce920a7319a51..58e1ea40bf8011ec3a6b4d971287cbc4df4f3403 100755 (executable)
--- a/all
+++ b/all
@@ -1016,7 +1016,7 @@ case "$cmd" in
                ;;
        release-engine-win64)
                verbose "$SELF" release-compile win64 \
                ;;
        release-engine-win64)
                verbose "$SELF" release-compile win64 \
-                       'STRIP=: DP_MAKE_TARGET=mingw CC="x86_64-w64-mingw32-gcc -g -Wl,--dynamicbase -Wl,--nxcompat -I$HOME/dp.win64/include -L$HOME/dp.win64/lib" WINDRES="x86_64-w64-mingw32-windres" SDL_CONFIG="$HOME/dp.win64/bin/sdl-config" LIB_JPEG= CFLAGS_LIBJPEG= WIN64RELEASE=1 D3D=0' \
+                       'STRIP=: DP_MAKE_TARGET=mingw CC="amd64-mingw32msvc-gcc -g -Wl,--dynamicbase -Wl,--nxcompat -I$HOME/dp.win64/include -L$HOME/dp.win64/lib" WINDRES="amd64-mingw32msvc-windres" SDL_CONFIG="$HOME/dp.win64/bin/sdl-config" LIB_JPEG= CFLAGS_LIBJPEG= WIN64RELEASE=1 D3D=0' \
                        win 'fteqcc.exe:Xonotic/fteqcc/fteqcc-x64.exe' \
                        'sv-release cl-release' 'darkplaces.exe:Xonotic/xonotic-x64.exe darkplaces-dedicated.exe:Xonotic/xonotic-dedicated-x64.exe'
                        # release 'darkplaces.exe:Xonotic/xonotic-x64.exe darkplaces-sdl.exe:Xonotic/xonotic-sdl-x64.exe darkplaces-dedicated.exe:Xonotic/xonotic-dedicated-x64.exe'
                        win 'fteqcc.exe:Xonotic/fteqcc/fteqcc-x64.exe' \
                        'sv-release cl-release' 'darkplaces.exe:Xonotic/xonotic-x64.exe darkplaces-dedicated.exe:Xonotic/xonotic-dedicated-x64.exe'
                        # release 'darkplaces.exe:Xonotic/xonotic-x64.exe darkplaces-sdl.exe:Xonotic/xonotic-sdl-x64.exe darkplaces-dedicated.exe:Xonotic/xonotic-dedicated-x64.exe'