verbose cd Xonotic
verbose mkdir data source source/darkplaces source/gmqcc source/d0_blind_id mapping
verbose rm -rf misc/builddeps
- verbose mv misc/buildfiles/win32 bin32 || true
- verbose mv bin32/SDL.dll . || true
- verbose mv misc/buildfiles/win64 bin64 || true
+ #verbose mv bin32/SDL.dll . || true # Leftover?
+
+ # We're going to be building these later
+ #verbose mv misc/buildfiles/win32 bin32 || true
+ #verbose mv misc/buildfiles/win64 bin64 || true
+
verbose mv misc/buildfiles/osx/* . || true
verbose rm -rf misc/buildfiles
verbose rm -rf misc/pki
;;
esac
;;
+ release-dlls-compile)
+ release_common
+ arch=$1
+ buildpath=$2
+ targetdir=$3
+ mkdir -p "$d0/$targetdir"
+ cd "$d0/misc/buildsrc"
+ verbose ./dlls.sh all "$buildpath" "$arch"
+ verbose cp "$buildpath/out/$arch/*" "$d0/$targetdir"
+ cd "$d0"
+ ;;
+ release-dlls-win32)
+ release_common
+ verbose "$SELF" release-dlls-compile win32 /tmp/dlls Xonotic/bin32
+ ;;
+ release-dlls-win64)
+ release_common
+ verbose "$SELF" release-dlls-compile win64 /tmp/dlls Xonotic/bin64
+ ;;
+ release-dlls-clean)
+ release_common
+ verbose $d0/misc/buildsrc/dlls.sh clean /tmp/dlls
+ ;;
+ release-dlls)
+ release_common
+ good=false
+ verbose "$SELF" release-dlls-win32
+ verbose "$SELF" release-dlls-win64
+ verbose "$SELF" release-dlls-clean
+ $good
+ ;;
release-engine-win32)
release_common
#good=true
#verbose "$SELF" release-getbinary Xonotic/xonotic-x86-dedicated.exe || good=false
#$good
verbose "$SELF" release-compile win32 \
- 'STRIP=: D3D=1 DP_MAKE_TARGET=mingw UNAME=MINGW32 WIN32RELEASE=1 CC="i686-w64-mingw32-gcc -static -g1 -mstackrealign -Wl,--dynamicbase -Wl,--nxcompat -I../../../.deps/include -L../../../.deps/lib -DSUPPORTIPV6" WINDRES="i686-w64-mingw32-windres" SDL_CONFIG="../../../.deps/bin/sdl2-config" DP_LINK_CRYPTO=dlopen DP_LINK_CRYPTO_RIJNDAEL=dlopen DP_LINK_JPEG=dlopen DP_LINK_ODE=dlopen DP_LINK_ZLIB=dlopen' \
- release 'darkplaces.exe:Xonotic/xonotic.exe darkplaces-sdl.exe:Xonotic/xonotic-sdl.exe darkplaces-dedicated.exe:Xonotic/xonotic-dedicated.exe'
+ 'STRIP=: D3D=1 DP_MAKE_TARGET=mingw WIN32RELEASE=1 CC="i686-w64-mingw32-gcc -static -g1 -mstackrealign -Wl,--dynamicbase -Wl,--nxcompat -I../../../.deps/include -L../../../.deps/lib -DSUPPORTIPV6" WINDRES="i686-w64-mingw32-windres" SDL_CONFIG="../../../.deps/bin/sdl2-config" DP_LINK_CRYPTO=dlopen DP_LINK_CRYPTO_RIJNDAEL=dlopen DP_LINK_JPEG=dlopen DP_LINK_ODE=dlopen DP_LINK_ZLIB=dlopen' \
+ release 'darkplaces.exe:Xonotic/xonotic-x86-wgl.exe darkplaces-sdl.exe:Xonotic/xonotic-x86.exe darkplaces-dedicated.exe:Xonotic/xonotic-x86-dedicated.exe'
;;
release-engine-win64)
release_common
#verbose "$SELF" release-getbinary Xonotic/xonotic.exe || good=false
#verbose "$SELF" release-getbinary Xonotic/xonotic-dedicated.exe || good=false
#$good
+ verbose "$SELF" release-dlls win64 /tmp/dlls Xonotic/bin64
verbose "$SELF" release-compile win64 \
- 'STRIP=: D3D=1 DP_MAKE_TARGET=mingw UNAME=MINGW32 WIN64RELEASE=1 CC="x86_64-w64-mingw32-gcc -static -g1 -Wl,--dynamicbase -Wl,--nxcompat -I../../../.deps/include -L../../../.deps/lib -DSUPPORTIPV6" WINDRES="x86_64-w64-mingw32-windres" SDL_CONFIG="../../../.deps/bin/sdl2-config" DP_LINK_CRYPTO=dlopen DP_LINK_CRYPTO_RIJNDAEL=dlopen DP_LINK_JPEG=dlopen DP_LINK_ODE=dlopen DP_LINK_ZLIB=dlopen' \
- release 'darkplaces.exe:Xonotic/xonotic-x64.exe darkplaces-sdl.exe:Xonotic/xonotic-x64-sdl.exe darkplaces-dedicated.exe:Xonotic/xonotic-x64-dedicated.exe'
+ 'STRIP=: D3D=1 DP_MAKE_TARGET=mingw WIN64RELEASE=1 CC="x86_64-w64-mingw32-gcc -static -g1 -Wl,--dynamicbase -Wl,--nxcompat -I../../../.deps/include -L../../../.deps/lib -DSUPPORTIPV6" WINDRES="x86_64-w64-mingw32-windres" SDL_CONFIG="../../../.deps/bin/sdl2-config" DP_LINK_CRYPTO=dlopen DP_LINK_CRYPTO_RIJNDAEL=dlopen DP_LINK_JPEG=dlopen DP_LINK_ODE=dlopen DP_LINK_ZLIB=dlopen' \
+ release 'darkplaces.exe:Xonotic/xonotic-wgl.exe darkplaces-sdl.exe:Xonotic/xonotic.exe darkplaces-dedicated.exe:Xonotic/xonotic-dedicated.exe'
;;
release-engine-osx)
release_common
#$good
# Note: travis build script also had SDLCONFIG_MACOSX* flags; need to check if they're still needed with osxcross.
verbose "$SELF" release-compile osx \
- 'STRIP=: CC="gcc -g1 -arch x86_64 -mmacosx-version-min=10.6 -Wl,-rpath -Wl,@loader_path/../Frameworks -Wl,-rpath -Wl,@loader_path -I../../../.deps/include -L../../../.deps/lib -DSUPPORTIPV6" DP_LINK_CRYPTO=dlopen DP_LINK_CRYPTO_RIJNDAEL=dlopen DP_LINK_JPEG=dlopen DP_LINK_ODE=dlopen DP_LINK_ZLIB=shared' \
+ 'STRIP=: DP_MAKE_TARGET=macosx CC="$HOME/osxcross/out/bin/o64-clang -g1 -arch x86_64 -mmacosx-version-min=10.6 -Wl,-rpath -Wl,@loader_path/../Frameworks -Wl,-rpath -Wl,@loader_path -I../../../.deps/include -L../../../.deps/lib -DSUPPORTIPV6" SDLCONFIG_MACOSXCFLAGS="-I../../../.deps/SDL2.framework/Headers" SDLCONFIG_MACOSXLIBS="-F../../../.deps -framework SDL2 -framework Cocoa -I../../../.deps/SDL2.framework/Headers" SDLCONFIG_MACOSXSTATICLIBS="-F../../../.deps -framework SDL2 -framework Cocoa -I../../../.deps/SDL2.framework/Headers" DP_LINK_CRYPTO=dlopen DP_LINK_CRYPTO_RIJNDAEL=dlopen DP_LINK_JPEG=dlopen DP_LINK_ODE=dlopen DP_LINK_ZLIB=shared' \
'sv-release sdl-release' 'darkplaces-sdl:Xonotic/Xonotic.app/Contents/MacOS/xonotic-osx-sdl-bin darkplaces-dedicated:Xonotic/xonotic-osx-dedicated'
;;
release-engine-linux64)
verbose "$SELF" release-engine-linux64 && good=true
verbose "$SELF" release-engine-win32 && good=true
verbose "$SELF" release-engine-win64 && good=true
- #verbose "$SELF" release-engine-osx && good=true
+ verbose "$SELF" release-engine-osx && good=true
$good
;;
release-maps)
release-qc)
release_common
verbose make -C "$d0/gmqcc" gmqcc
- verbose env GIT_DIR="$d0/data/xonotic-data.pk3dir/.git" make -C Xonotic/source QCC="$d0/gmqcc/gmqcc" XON_BUILDSYSTEM=1 clean qc
+ verbose env GIT_DIR="$d0/data/xonotic-data.pk3dir/.git" make -C Xonotic/source QCC="$d0/gmqcc/gmqcc" XON_BUILDSYSTEM=1 QCCFLAGS_WATERMARK='$(shell git describe --tags)' clean qc
;;
release-buildpk3-transform-raw)
release_common
release_common
verbose "$SELF" release-prepare
verbose "$SELF" release-maps
+ verbose "$SELF" release-dlls
verbose "$SELF" release-engine
verbose "$SELF" release-qc
verbose "$SELF" release-pack
projects / xonotic / xonotic.git / blobdiff