Merge branch 'master' of github.com:libretro/libretro-super

libretro-buildbot-recipe.sh

@@ -226,6 +226,7 @@ build_libretro_generic_makefile() {
 			echo "$1 running retrolink [$jobid]"
 			$WORK/retrolink.sh ${NAME}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT}
 		fi
+		      strip -s ${NAME}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT}
                       cp -v ${NAME}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT} $RARCH_DIST_DIR/${DIST}/${NAME}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT}  &> /tmp/buildbot.log
 	else
                 ERROR=`cat /tmp/buildbot.log | tail -n 300`
@@ -1174,6 +1175,7 @@ if [ "${PLATFORM}" = "MINGW64" ] || [ "${PLATFORM}" = "MINGW32" ] && [ "${RA}" =
 		echo "building..."
 		echo "build command: $MAKE -j${JOBS}"
 		$MAKE -j${JOBS} &> /tmp/buildbot.log
+		strip -s retroarch.exe
 
 		if [ $? -eq 0 ]; then
 			MESSAGE="retroarch build successful [$jobid]"
@@ -1197,6 +1199,7 @@ if [ "${PLATFORM}" = "MINGW64" ] || [ "${PLATFORM}" = "MINGW32" ] && [ "${RA}" =
 			mkdir -p windows/database
 			mkdir -p windows/database/cursors
 			mkdir -p windows/database/rdb
+			mkdir -p windows/playlists
 
 cat << EOF > windows/retroarch.cfg
 assets_directory = ":\assets"
@@ -1244,10 +1247,10 @@ EOF
 		else
                 ERROR=`cat /tmp/buildbot.log | tail -n 300`
                 HASTE=`curl -XPOST http://hastebin.com/documents -d"$ERROR" | cut --fields=4 --delimiter='"'`
-		        MESSAGE="retroarch build failed [$jobid] LOG: http://hastebin.com/$HASTE"
-			echo $MESSAGE
-			buildbot_log "$MESSAGE"
-		fi
+		MESSAGE="retroarch build failed [$jobid] LOG: http://hastebin.com/$HASTE"
+		echo $MESSAGE
+		buildbot_log "$MESSAGE"
+	   fi
 	fi
 fi
 

libretro-config.sh

@@ -26,10 +26,6 @@ case "$platform" in
 		FORMAT_COMPILER_TARGET=ios
 		FORMAT_COMPILER_TARGET_ALT=ios
 		export IOSSDK=$(xcodebuild -version -sdk iphoneos Path)
-		iosver=$(xcodebuild -version -sdk iphoneos ProductVersion)
-		IOSVER_MAJOR=${iosver%.*}
-		IOSVER_MINOR=${iosver#*.}
-		IOSVER=${IOSVER_MAJOR}${IOSVER_MINOR}
 		MIN_IOS5="-miphoneos-version-min=5.0"
 		MIN_IOS7="-miphoneos-version-min=7.0"
 

rules.d/player-rules.sh

@@ -1,6 +1,6 @@
 # vim: set ts=3 sw=3 noet ft=sh : bash
 
-register_module player any
+register_module player retroarch
 libretro_retroarch_name="RetroArch"
 libretro_retroarch_dir="retroarch"
 libretro_retroarch_git_url="https://github.com/libretro/RetroArch.git"