diff options
| author | sfan5 <sfan5@live.de> | 2014-07-29 10:47:38 +0200 |
|---|---|---|
| committer | sfan5 <sfan5@live.de> | 2014-07-29 20:03:18 +0200 |
| commit | 17345404bad71989238d492ed2e23c97f5681065 (patch) | |
| tree | 6d688df0d1e9d4055187b233b76549e3956c30ea /util/buildbot/buildwin64.sh | |
| parent | 5884236046c4405eec7cfc12cdde0be9f48058b6 (diff) | |
| download | minetest-17345404bad71989238d492ed2e23c97f5681065.tar.gz minetest-17345404bad71989238d492ed2e23c97f5681065.tar.bz2 minetest-17345404bad71989238d492ed2e23c97f5681065.zip | |
Add ZLIBWAPI_DLL and LEVELDB_DLL CMake options Remove legacy MINGWM10_DLL CMake option Update 32-bit buildbot (OpenAL updated, zlib updated) Change build directory for buildbots to '_build' to prevent removal of Android build files Use -win64 suffix for 64-bit Windows builds Fixes #1476
Diffstat (limited to 'util/buildbot/buildwin64.sh')
| -rwxr-xr-x | util/buildbot/buildwin64.sh | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/util/buildbot/buildwin64.sh b/util/buildbot/buildwin64.sh index eed33d2f9..321985e1b 100755 --- a/util/buildbot/buildwin64.sh +++ b/util/buildbot/buildwin64.sh @@ -77,46 +77,59 @@ cd ../.. # Build the thing cd minetest -[ -d build ] && rm -Rf build/ -mkdir build -cd build +[ -d _build ] && rm -Rf _build/ +mkdir _build +cd _build cmake .. \ -DCMAKE_TOOLCHAIN_FILE=$toolchain_file \ -DCMAKE_INSTALL_PREFIX=/tmp \ -DVERSION_EXTRA=$git_hash \ -DBUILD_CLIENT=1 -DBUILD_SERVER=0 \ + \ -DENABLE_SOUND=1 \ -DENABLE_CURL=1 \ -DENABLE_GETTEXT=1 \ -DENABLE_FREETYPE=1 \ -DENABLE_LEVELDB=1 \ + \ -DIRRLICHT_INCLUDE_DIR=$libdir/irrlicht-$irrlicht_version/include \ -DIRRLICHT_LIBRARY=$libdir/irrlicht-$irrlicht_version/lib/Win64-gcc/libIrrlicht.dll.a \ -DIRRLICHT_DLL=$libdir/irrlicht-$irrlicht_version/bin/Win64-gcc/Irrlicht.dll \ + \ -DZLIB_INCLUDE_DIR=$libdir/zlib/include \ -DZLIB_LIBRARIES=$libdir/zlib/lib/libz.dll.a \ -DZLIB_DLL=$libdir/zlib/bin/zlib1.dll \ + \ -DLUA_INCLUDE_DIR=$libdir/luajit/include \ -DLUA_LIBRARY=$libdir/luajit/libluajit.a \ + \ -DOGG_INCLUDE_DIR=$libdir/libogg/include \ -DOGG_LIBRARY=$libdir/libogg/lib/libogg.dll.a \ -DOGG_DLL=$libdir/libogg/bin/libogg-0.dll \ + \ -DVORBIS_INCLUDE_DIR=$libdir/libvorbis/include \ -DVORBIS_LIBRARY=$libdir/libvorbis/lib/libvorbis.dll.a \ -DVORBIS_DLL=$libdir/libvorbis/bin/libvorbis-0.dll \ -DVORBISFILE_LIBRARY=$libdir/libvorbis/lib/libvorbisfile.dll.a \ -DVORBISFILE_DLL=$libdir/libvorbis/bin/libvorbisfile-3.dll \ + \ -DOPENAL_INCLUDE_DIR=$libdir/openal_stripped/include/AL \ -DOPENAL_LIBRARY=$libdir/openal_stripped/lib/libOpenAL32.dll.a \ -DOPENAL_DLL=$libdir/openal_stripped/bin/OpenAL32.dll \ + \ -DCURL_DLL=$libdir/libcurl/bin/libcurl-4.dll \ -DCURL_INCLUDE_DIR=$libdir/libcurl/include \ -DCURL_LIBRARY=$libdir/libcurl/lib/libcurl.dll.a \ + \ -DFREETYPE_INCLUDE_DIR_freetype2=$libdir/freetype/include/freetype2 \ -DFREETYPE_INCLUDE_DIR_ft2build=$libdir/freetype/include/freetype2 \ -DFREETYPE_LIBRARY=$libdir/freetype/lib/libfreetype.dll.a \ + -DFREETYPE_DLL=$libdir/freetype/bin/libfreetype-6.dll \ + \ -DLEVELDB_INCLUDE_DIR=$libdir/leveldb/include \ -DLEVELDB_LIBRARY=$libdir/leveldb/lib/libleveldb.dll.a \ + -DLEVELDB_DLL=$libdir/leveldb/bin/libleveldb.dll \ + \ -DCUSTOM_GETTEXT_PATH=$libdir/gettext \ -DGETTEXT_MSGFMT=`which msgfmt` \ -DGETTEXT_DLL=$libdir/gettext/bin/libintl-8.dll \ |