mirror of
https://github.com/TES3MP/TES3MP.git
synced 2025-09-23 04:26:31 -04:00
Merge pull request #677 from backlabs1/add-missing-msvc-dependencies
Add missing dependencies for MSVC builds
This commit is contained in:
commit
65c5ed5666
@ -584,6 +584,28 @@ if [ -z $SKIP_DOWNLOAD ]; then
|
|||||||
git clone -b release-1.10.0 https://github.com/google/googletest.git
|
git clone -b release-1.10.0 https://github.com/google/googletest.git
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# RakNet/CrabNet
|
||||||
|
echo "RakNet/CrabNet 19e66190e8 ..."
|
||||||
|
if [[ -d CrabNet ]]; then
|
||||||
|
echo " directory exists, skipping."
|
||||||
|
else
|
||||||
|
git clone https://github.com/TES3MP/CrabNet.git
|
||||||
|
cd CrabNet
|
||||||
|
git reset --hard 19e66190e83f53bcdcbcd6513238ed2e54878a21
|
||||||
|
cd ..
|
||||||
|
fi
|
||||||
|
|
||||||
|
# LuaJIT
|
||||||
|
echo "LuaJit c525bcb902 ..."
|
||||||
|
if [[ -d LuaJIT ]]; then
|
||||||
|
printf " directory exists, skipping."
|
||||||
|
else
|
||||||
|
git clone https://luajit.org/git/luajit.git
|
||||||
|
cd luajit
|
||||||
|
git reset --hard c525bcb9024510cad9e170e12b6209aedb330f83
|
||||||
|
cd ..
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
cd .. #/..
|
cd .. #/..
|
||||||
@ -987,6 +1009,51 @@ if [ ! -z $TEST_FRAMEWORK ]; then
|
|||||||
echo Done.
|
echo Done.
|
||||||
|
|
||||||
fi
|
fi
|
||||||
|
cd $DEPS
|
||||||
|
echo
|
||||||
|
# RakNet/CrabNet
|
||||||
|
printf "RakNet/CrabNet... "
|
||||||
|
{
|
||||||
|
if [[ -d $DEPS_INSTALL/CrabNet ]]; then
|
||||||
|
echo "already built"
|
||||||
|
else
|
||||||
|
cd CrabNet/
|
||||||
|
rm -rf build
|
||||||
|
mkdir build
|
||||||
|
cd build/
|
||||||
|
cmake -DCMAKE_BUILD_TYPE=Release ..
|
||||||
|
cmake --build . --target RakNetLibStatic --config Release \
|
||||||
|
--clean-first -- -maxcpucount
|
||||||
|
cd ../..
|
||||||
|
cp -r CrabNet/ $DEPS_INSTALL
|
||||||
|
echo Done.
|
||||||
|
fi
|
||||||
|
add_cmake_opts -DRakNet_INCLUDES=$DEPS_INSTALL/CrabNet/include
|
||||||
|
add_cmake_opts -DRakNet_LIBRARY_RELEASE=$DEPS_INSTALL/CrabNet/build/lib/Release/RakNetLibStatic.lib
|
||||||
|
add_cmake_opts -DRakNet_LIBRARY_DEBUG=$DEPS_INSTALL/CrabNet/build/lib/Release/RakNetLibStatic.lib
|
||||||
|
}
|
||||||
|
cd $DEPS
|
||||||
|
echo
|
||||||
|
# LuaJIT
|
||||||
|
printf "LuaJIT... "
|
||||||
|
{
|
||||||
|
if [[ -d $DEPS_INSTALL/luajit ]]; then
|
||||||
|
echo "already built"
|
||||||
|
else
|
||||||
|
cd $DEPS/luajit/
|
||||||
|
mingw32-make -j $NUMBER_OF_PROCESSORS
|
||||||
|
tmp=$DEPS_INSTALL/tmp/luajit
|
||||||
|
mkdir -p $tmp/lua
|
||||||
|
cp src/luajit.exe $tmp
|
||||||
|
cp -r src/jit src/lua51.dll $tmp/lua/
|
||||||
|
mv $tmp $DEPS_INSTALL
|
||||||
|
fi
|
||||||
|
add_cmake_opts -DLuaJit_INCLUDE_DIR=$DEPS_INSTALL/luajit/lua
|
||||||
|
add_cmake_opts -DLuaJit_LIBRARY=$DEPS_INSTALL/luajit/lua
|
||||||
|
for config in ${CONFIGURATIONS[@]}; do
|
||||||
|
add_runtime_dlls $config $DEPS_INSTALL/luajit/lua/lua51.dll
|
||||||
|
done
|
||||||
|
}
|
||||||
|
|
||||||
echo
|
echo
|
||||||
cd $DEPS_INSTALL/..
|
cd $DEPS_INSTALL/..
|
||||||
|
Loading…
x
Reference in New Issue
Block a user