better handling of msvc+cmake recipes.

This commit is contained in:
aliaspider 2018-07-20 23:16:34 +01:00
parent 717e843bb2
commit 9466dcfa1f
3 changed files with 25 additions and 4 deletions

View file

@ -367,13 +367,34 @@ build_libretro_generic_makefile() {
EXTRAARGS="-DANDROID_PLATFORM=android-${API_LEVEL} \
-DANDROID_ABI=${ABI_OVERRIDE} \
-DCMAKE_TOOLCHAIN_FILE=${NDK_ROOT}/build/cmake/android.toolchain.cmake"
fi
if [ "${PLATFORM}" = "msvc2017_desktop_x86" ]; then
EXTRAARGS="-G\"Visual Studio 15 2017\""
fi
if [ "${PLATFORM}" = "msvc2017_desktop_x64" ]; then
EXTRAARGS="-G\"Visual Studio 15 2017 Win64\""
fi
if [ "${PLATFORM}" = "msvc2010_x86" ]; then
EXTRAARGS="-G\"Visual Studio 10 2010\""
fi
if [ "${PLATFORM}" = "msvc2010_x64" ]; then
EXTRAARGS="-G\"Visual Studio 10 2010 Win64\""
fi
if [ "${PLATFORM}" = "msvc2005_x86" ]; then
EXTRAARGS="-G\"Visual Studio 8 2005\""
fi
if [ "${PLATFORM}" = "msvc2005_x64" ]; then
EXTRAARGS="-G\"Visual Studio 8 2005 Win64\""
fi
if [ "${PLATFORM}" = "msvc2003_x86" ]; then
EXTRAARGS="-G\"Visual Studio 7\""
fi
eval "set -- ${EXTRAARGS} \${CORE_ARGS}"
eval "set -- ${EXTRAARGS} \${CORE_ARGS} -DCMAKE_VERBOSE_MAKEFILE=ON"
echo "BUILD CMD: ${CMAKE} $*" 2>&1 | tee -a "$LOGFILE"
echo "$@" .. | xargs ${CMAKE} 2>&1 | tee -a "$LOGFILE"
echo "BUILD CMD: ${HELPER} ${MAKE} -f ${MAKEFILE} -j${JOBS}" 2>&1 | tee -a "$LOGFILE"
${HELPER} ${MAKE} -f ${MAKEFILE} -j${JOBS} 2>&1 | tee -a "$LOGFILE"
echo "BUILD CMD: ${CMAKE} --build . --target ${core}_libretro --config Release -- -j${JOBS}" 2>&1 | tee -a "$LOGFILE"
${CMAKE} --build . --target ${core}_libretro --config Release -- -j${JOBS} 2>&1 | tee -a "$LOGFILE"
find . -mindepth 2 -name "${CORENAM}" -exec cp -f "{}" . \;
elif [ "${COMMAND}" = "LEIRADEL" ]; then

View file

@ -7,3 +7,4 @@ nestopia libretro-nestopia https://github.com/libretro/nestopia.git master YES G
snes9x libretro-snes9x https://github.com/libretro/snes9x.git master YES GENERIC Makefile libretro
theodore libretro-theodore https://github.com/Zlika/theodore.git master YES GENERIC Makefile .
vbam libretro-vbam https://github.com/libretro/vbam-libretro.git master YES GENERIC Makefile src/libretro
dolphin libretro-dolphin https://github.com/libretro/dolphin.git master YES CMAKE Makefile build -DLIBRETRO=ON -DCMAKE_BUILD_TYPE=Release

View file

@ -16,7 +16,6 @@ crocods libretro-crocods https://github.com/libretro/libretro-crocods.git master
desmume libretro-desmume https://github.com/libretro/desmume.git master YES GENERIC Makefile.libretro desmume/src/frontend/libretro
desmume2015 libretro-desmume2015 https://github.com/libretro/desmume2015.git master YES GENERIC Makefile.libretro desmume
dinothawr libretro-dinothawr https://github.com/libretro/Dinothawr.git master YES GENERIC Makefile .
dolphin libretro-dolphin https://github.com/libretro/dolphin.git master YES CMAKE Makefile build -DLIBRETRO=ON -DCMAKE_BUILD_TYPE=Release
dosbox libretro-dosbox https://github.com/libretro/dosbox-libretro.git master YES GENERIC Makefile.libretro .
dosbox_svn libretro-dosbox_svn https://github.com/fr500/dosbox-svn libretro YES GENERIC Makefile.libretro libretro
easyrpg libretro-easyrpg https://github.com/libretro/easyrpg-libretro.git master YES GENERIC Makefile.libretro builds/libretro