From e7cde2c4ef8d8f115927da4d0b13085c8d19ba27 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sun, 18 Feb 2018 01:58:34 +0100
Subject: [PATCH] (Xbox) Fix dist-scripts

---
 dist-scripts/xdk1-cores.sh         | 10 +++++-----
 dist-scripts/xdk1_env.bat          |  2 +-
 dist-scripts/xdk1_env_bigstack.bat |  2 +-
 dist-scripts/xdk360-cores.sh       |  8 ++++----
 dist-scripts/xdk360_env.bat        |  2 +-
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/dist-scripts/xdk1-cores.sh b/dist-scripts/xdk1-cores.sh
index f47e0ab284..ed00fd0e58 100644
--- a/dist-scripts/xdk1-cores.sh
+++ b/dist-scripts/xdk1-cores.sh
@@ -4,19 +4,19 @@ platform=xdk
 
 ip='192.168.1.10'
 
-mkdir -p ../msvc/RetroArch-Xbox1/Debug
-mkdir -p ../msvc/RetroArch-Xbox1/Release
-mkdir -p ../msvc/RetroArch-Xbox1/Release_LTCG
+mkdir -p ../pkg/msvc/RetroArch-Xbox1/Debug
+mkdir -p ../pkg/msvc/RetroArch-Xbox1/Release
+mkdir -p ../pkg/msvc/RetroArch-Xbox1/Release_LTCG
 
 for f in *_${platform}.lib ; do
    name=`echo "$f" | sed "s/\(_libretro_${platform}\|\).lib$//"`
    echo $name
    if [ $name = "tyrquake" ] || [ $name = "genesis_plus_gx" ] ; then
       echo "Applying whole archive linking for this core..."
-   	cp -f "$f" ../msvc/RetroArch-Xbox1/Release_LTCG_BigStack/libretro_${platform}.lib
+   	cp -f "$f" ../pkg/msvc/RetroArch-Xbox1/Release_LTCG_BigStack/libretro_${platform}.lib
    	cmd.exe /k xdk1_env_bigstack.bat ${name}_libretro_xdk1
    else
-   	cp -f "$f" ../msvc/RetroArch-Xbox1/Release_LTCG/libretro_${platform}.lib
+   	cp -f "$f" ../pkg/msvc/RetroArch-Xbox1/Release_LTCG/libretro_${platform}.lib
    	cmd.exe /k xdk1_env.bat ${name}_libretro_xdk1
    fi
 done
diff --git a/dist-scripts/xdk1_env.bat b/dist-scripts/xdk1_env.bat
index c87c977558..b2c0d33907 100644
--- a/dist-scripts/xdk1_env.bat
+++ b/dist-scripts/xdk1_env.bat
@@ -42,7 +42,7 @@
 
 :end
 
-cd ../msvc/
+cd ../pkg/msvc/
 devenv /clean Release_LTCG RetroArch-Xbox1.sln
 devenv /build Release_LTCG RetroArch-Xbox1.sln
 copy RetroArch-Xbox1\Release_LTCG\RetroArch.xbe RetroArch-Xbox1\%1.xbe
diff --git a/dist-scripts/xdk1_env_bigstack.bat b/dist-scripts/xdk1_env_bigstack.bat
index e3d45f979a..a15dd58154 100644
--- a/dist-scripts/xdk1_env_bigstack.bat
+++ b/dist-scripts/xdk1_env_bigstack.bat
@@ -42,7 +42,7 @@
 
 :end
 
-cd ../msvc/
+cd ../pkg/msvc/
 devenv /clean Release_LTCG_BigStack RetroArch-Xbox1.sln
 devenv /build Release_LTCG_BigStack RetroArch-Xbox1.sln
 copy RetroArch-Xbox1\Release_LTCG_BigStack\RetroArch.xbe RetroArch-Xbox1\%1.xbe
diff --git a/dist-scripts/xdk360-cores.sh b/dist-scripts/xdk360-cores.sh
index 7053bd6044..d87e0834c7 100644
--- a/dist-scripts/xdk360-cores.sh
+++ b/dist-scripts/xdk360-cores.sh
@@ -2,13 +2,13 @@
 
 platform=xdk360
 
-mkdir -p ../msvc/RetroArch-360/Debug
-mkdir -p ../msvc/RetroArch-360/Release
-mkdir -p ../msvc/RetroArch-360/Release_LTCG
+mkdir -p ../pkg/msvc/RetroArch-360/Debug
+mkdir -p ../pkg/msvc/RetroArch-360/Release
+mkdir -p ../pkg/msvc/RetroArch-360/Release_LTCG
 
 for f in *_${platform}.lib ; do
    name=`echo "$f" | sed "s/\(_libretro_${platform}\|\).lib$//"`
    echo $name
-   cp -f "$f" ../msvc/RetroArch-360/Release_LTCG/libretro_${platform}.lib
+   cp -f "$f" ../pkg/msvc/RetroArch-360/Release_LTCG/libretro_${platform}.lib
    cmd.exe /k ${platform}_env.bat ${name}_libretro_${platform}
 done
diff --git a/dist-scripts/xdk360_env.bat b/dist-scripts/xdk360_env.bat
index e060031aa8..a986f808c1 100644
--- a/dist-scripts/xdk360_env.bat
+++ b/dist-scripts/xdk360_env.bat
@@ -119,7 +119,7 @@
 
 :end
 
-cd ../msvc/
+cd ../pkg/msvc/
 msbuild RetroArch-360.sln /p:Configuration=Release_LTCG
 copy RetroArch-360\Release_LTCG\CORE.xex RetroArch-360\%1.xex
 del RetroArch-360\Release_LTCG\CORE.xex