2 files changed, 7 insertions, 26 deletions
diff --git a/addons/skin.confluence/build.bat b/addons/skin.confluence/build.bat
index cc92e77228..8a148de8c3 100644
--- a/addons/skin.confluence/build.bat
+++ b/addons/skin.confluence/build.bat
@@ -1,40 +1,24 @@
 @echo off
 ECHO ----------------------------------------
 echo Creating Confluence Build Folder
-rmdir BUILD /S /Q
-md BUILD
+rmdir ..\..\project\Win32BuildSetup\BUILD_WIN32\Xbmc\addons\skin.confluence\ /S /Q
+md ..\..\project\Win32BuildSetup\BUILD_WIN32\Xbmc\addons\skin.confluence\media\
 
 Echo .svn>exclude.txt
 Echo Thumbs.db>>exclude.txt
 Echo Desktop.ini>>exclude.txt
 Echo dsstdfx.bin>>exclude.txt
+Echo BUILD>>exclude.txt
+Echo media>>exclude.txt
 Echo exclude.txt>>exclude.txt
 
 ECHO ----------------------------------------
 ECHO Creating XBT File...
-START /B /WAIT ..\..\Tools\TexturePacker\TexturePacker -input media -output media\Textures.xbt
-
-ECHO ----------------------------------------
-ECHO Copying XBT File...
-xcopy "media\Textures.xbt" "BUILD\Confluence\media\" /Q /I /Y
-
-ECHO ----------------------------------------
-ECHO Cleaning Up...
-del "media\Textures.xbt"
+START /B /WAIT ..\..\Tools\TexturePacker\TexturePacker -input media -output ..\..\project\Win32BuildSetup\BUILD_WIN32\Xbmc\addons\skin.confluence\media\Textures.xbt
 
 ECHO ----------------------------------------
 ECHO XBT Texture Files Created...
 ECHO Building Skin Directory...
-xcopy "720p" "BUILD\Confluence\720p" /E /Q /I /Y /EXCLUDE:exclude.txt
-xcopy "fonts" "BUILD\Confluence\fonts" /E /Q /I /Y /EXCLUDE:exclude.txt
-xcopy "backgrounds" "BUILD\Confluence\backgrounds" /E /Q /I /Y /EXCLUDE:exclude.txt
-xcopy "scripts" "BUILD\Confluence\scripts" /E /Q /I /Y /EXCLUDE:exclude.txt
-xcopy "sounds\*.*" "BUILD\Confluence\sounds\" /Q /I /Y /EXCLUDE:exclude.txt
-xcopy "colors\*.*" "BUILD\Confluence\colors\" /Q /I /Y /EXCLUDE:exclude.txt
-xcopy "language" "BUILD\Confluence\language" /E /Q /I /Y /EXCLUDE:exclude.txt
+xcopy "..\skin.confluence" "..\..\project\Win32BuildSetup\BUILD_WIN32\Xbmc\addons\skin.confluence" /E /Q /I /Y /EXCLUDE:exclude.txt
 
 del exclude.txt
-
-copy *.xml "BUILD\Confluence\"
-copy *.txt "BUILD\Confluence\"
-copy icon.png "BUILD\Confluence\"
-\ No newline at end of file
diff --git a/project/Win32BuildSetup/buildskins.bat b/project/Win32BuildSetup/buildskins.bat
index 0617394768..f741580439 100644
--- a/project/Win32BuildSetup/buildskins.bat
+++ b/project/Win32BuildSetup/buildskins.bat
@@ -4,7 +4,7 @@ rem Copyright (C) 2005-2008 Team XBMC
 rem http://xbmc.org
 
 rem Script by chadoe
-rem This script builds the Confluence and PM3.HD skins and all skins in the optinal directory provided and copy the builds to BUILD_WIN32 for further packaging
+rem This script builds the Confluence and all skins in the optinal directory provided and copy the builds to BUILD_WIN32 for further packaging
 
 SET SKIN_PATH="%1"
 SET CUR_PATH=%CD%
@@ -19,9 +19,6 @@ ECHO Compiling Confluence...
 cd "..\..\addons\skin.confluence"
 CALL build.bat > NUL
 cd "%CUR_PATH%"
-ECHO Copying files...
-rmdir BUILD_WIN32\Xbmc\addons\skin.confluence /S /Q
-xcopy "..\..\addons\skin.confluence\BUILD\Confluence" "BUILD_WIN32\Xbmc\addons\skin.confluence" /E /Q /I /Y /EXCLUDE:exclude.txt  > NUL
 
 IF "%SKIN_PATH%" == "" GOTO DONE
 rem optional skins