Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mpc-hc/mpc-hc.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXhmikosR <xhmikosr@users.sourceforge.net>2012-06-09 19:34:24 +0400
committerXhmikosR <xhmikosr@users.sourceforge.net>2012-06-09 19:34:24 +0400
commit24a58f13f3ccb791a53fec80136f872b88c587d4 (patch)
treef57a73315bcc53bec5d9526e9b7c46871aa4c222
parentb9958177903f7a8b6fdc389276fea0cd7c893392 (diff)
build.bat: show a warning when incompatible switches are used
git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@5062 10f7b99b-c216-0410-bff0-8a66a9350fd8
-rw-r--r--build.bat38
1 files changed, 30 insertions, 8 deletions
diff --git a/build.bat b/build.bat
index 13c4a720b..0033df07c 100644
--- a/build.bat
+++ b/build.bat
@@ -111,7 +111,9 @@ IF /I "%CONFIG%" == "Filters" (
GOTO x64
)
-IF /I "%CONFIG%" == "Resources" CALL :SubResources Win32 && GOTO x64
+IF /I NOT "%BUILDCFG%" == "Debug" (
+ IF /I "%CONFIG%" == "Resources" CALL :SubResources Win32 && GOTO x64
+)
CALL :SubMPCHC Win32
@@ -139,7 +141,9 @@ IF /I "%CONFIG%" == "Filters" (
GOTO END
)
-IF /I "%CONFIG%" == "Resources" CALL :SubResources x64 && GOTO END
+IF /I NOT "%BUILDCFG%" == "Debug" (
+ IF /I "%CONFIG%" == "Resources" CALL :SubResources x64 && GOTO END
+)
CALL :SubMPCHC x64
@@ -196,7 +200,10 @@ EXIT /B
:SubResources
-IF /I "%BUILDCFG%" == "Debug" EXIT /B
+IF /I "%BUILDCFG%" == "Debug" (
+ CALL :SubMsg "WARNING" "/debug was used with /resource, ignoring /resource"
+ EXIT /B
+)
TITLE Compiling mpciconlib - Release^|%1...
"%MSBUILD%" mpciconlib.sln %MSBUILD_SWITCHES%^
@@ -229,9 +236,18 @@ EXIT /B
:SubCreateInstaller
-IF /I "%BUILDTYPE%" == "Clean" EXIT /B
-IF /I "%BUILDCFG%" == "Debug" EXIT /B
-IF /I "%CONFIG%" == "Filters" EXIT /B
+IF /I "%BUILDTYPE%" == "Clean" (
+ CALL :SubMsg "WARNING" "/clean was used with /installer, ignoring /installer"
+ EXIT /B
+)
+IF /I "%BUILDCFG%" == "Debug" (
+ CALL :SubMsg "WARNING" "/debug was used with /installer, ignoring /installer"
+ EXIT /B
+)
+IF /I "%CONFIG%" == "Filters" (
+ CALL :SubMsg "WARNING" "/filters was used with /installer, ignoring /installer"
+ EXIT /B
+)
IF /I "%~1" == "x64" (
SET MPCHC_INNO_DEF=%MPCHC_INNO_DEF% /Dx64Build
@@ -254,8 +270,14 @@ EXIT /B
:SubCreatePackages
-IF /I "%BUILDTYPE%" == "Clean" EXIT /B
-IF /I "%BUILDCFG%" == "Debug" EXIT /B
+IF /I "%BUILDTYPE%" == "Clean" (
+ CALL :SubMsg "WARNING" "/clean was used with /packages, ignoring /packages"
+ EXIT /B
+)
+IF /I "%BUILDCFG%" == "Debug" (
+ CALL :SubMsg "WARNING" "/debug was used with /packages, ignoring /packages"
+ EXIT /B
+)
CALL :SubDetectSevenzipPath
CALL :SubGetVersion