aboutsummaryrefslogtreecommitdiff
path: root/tools/buildsteps
diff options
context:
space:
mode:
authorMartijn Kaijser <mcm.kaijser@gmail.com>2014-08-16 19:31:52 +0200
committerMartijn Kaijser <mcm.kaijser@gmail.com>2014-08-16 23:13:06 +0200
commitaa4b6741e945c8e1262b7d7ac78f1f0e9b824995 (patch)
tree7e21f267c78f8d013e72aed0ebc41db346cfb721 /tools/buildsteps
parent449902887026f60ce1f127dd90ac4bf949b99d25 (diff)
[win32] rename and generalise packaging folders. also simplify NSIS installer to match package folders
Diffstat (limited to 'tools/buildsteps')
-rw-r--r--tools/buildsteps/win32/make-addons.bat2
-rw-r--r--tools/buildsteps/win32/make-xbmc.bat10
2 files changed, 6 insertions, 6 deletions
diff --git a/tools/buildsteps/win32/make-addons.bat b/tools/buildsteps/win32/make-addons.bat
index 3283d98e0b..c10b340396 100644
--- a/tools/buildsteps/win32/make-addons.bat
+++ b/tools/buildsteps/win32/make-addons.bat
@@ -78,7 +78,7 @@ rem determine the proper install path for the built addons
IF %install% == true (
SET ADDONS_INSTALL_PATH=%WORKDIR%\addons
) ELSE (
- SET ADDONS_INSTALL_PATH=%WORKDIR%\project\Win32BuildSetup\BUILD_WIN32\Xbmc\xbmc-addons
+ SET ADDONS_INSTALL_PATH=%WORKDIR%\project\Win32BuildSetup\BUILD_WIN32\addons
)
ECHO --------------------------------------------------
diff --git a/tools/buildsteps/win32/make-xbmc.bat b/tools/buildsteps/win32/make-xbmc.bat
index 19d8e69a68..1be66c020b 100644
--- a/tools/buildsteps/win32/make-xbmc.bat
+++ b/tools/buildsteps/win32/make-xbmc.bat
@@ -100,9 +100,9 @@ goto EXE_COMPILE
ECHO [1] a NEW EXE will be compiled for the BUILD_WIN32
ECHO [2] existing EXE will be updated (quick mode compile) for the BUILD_WIN32
ECHO ------------------------------------------------------------
- set /P XBMC_COMPILE_ANSWER=Compile a new EXE? [1/2]:
- if /I %XBMC_COMPILE_ANSWER% EQU 1 goto COMPILE_EXE
- if /I %XBMC_COMPILE_ANSWER% EQU 2 goto COMPILE_NO_CLEAN_EXE
+ set /P APP_COMPILE_ANSWER=Compile a new EXE? [1/2]:
+ if /I %APP_COMPILE_ANSWER% EQU 1 goto COMPILE_EXE
+ if /I %APP_COMPILE_ANSWER% EQU 2 goto COMPILE_NO_CLEAN_EXE
:COMPILE_EXE
ECHO Wait while preparing the build.
@@ -160,8 +160,8 @@ goto EXE_COMPILE
goto END
)
- set /P XBMC_BUILD_ANSWER=View the build log in your HTML browser? [y/n]
- if /I %XBMC_BUILD_ANSWER% NEQ y goto END
+ set /P APP_BUILD_ANSWER=View the build log in your HTML browser? [y/n]
+ if /I %APP_BUILD_ANSWER% NEQ y goto END
SET log="%WORKSPACE%\project\vs2010express\XBMC\%buildconfig%\objs\" XBMC.log