diff options
author | XhmikosR <xhmikosr@users.sourceforge.net> | 2010-06-04 17:27:21 +0400 |
---|---|---|
committer | XhmikosR <xhmikosr@users.sourceforge.net> | 2010-06-04 17:27:21 +0400 |
commit | 9657cba7d8f0f311791b570b68ad12a976447c5a (patch) | |
tree | 0b6c97253dc19014887575b3f9b1494287a6787b | |
parent | 2148c74696f6613dac88ef09d7d73666500fdd18 (diff) |
cosmetics
git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@2006 10f7b99b-c216-0410-bff0-8a66a9350fd8
-rw-r--r-- | build.bat | 18 | ||||
-rw-r--r-- | src/filters/reader/asyncreader/asyncio.cpp | 1 | ||||
-rw-r--r-- | src/filters/reader/asyncreader/asyncrdr.cpp | 1 | ||||
-rw-r--r-- | update_version.bat | 31 |
4 files changed, 23 insertions, 28 deletions
@@ -1,8 +1,6 @@ @ECHO OFF
SETLOCAL
-REM Notes
-REM Visual Studio 2008 Devenv Command Line Switches - http://msdn.microsoft.com/en-us/library/xee0c8y7.aspx
IF /I "%1" == "help" (
TITLE build.bat %1
ECHO.
@@ -10,26 +8,25 @@ ECHO:Usage: ECHO: "build.bat [clean|build|rebuild] [null|x86|x64] [null|Main|Resource] [Debug]"
ECHO:Executing "build.bat" will use the defaults: "build.bat build null null"
ECHO:Examples:
-ECHO:"null" can be replaced with anything, e.g. "all": build.bat build x86 all Debug
ECHO:build.bat build x86 Resource -Will build the x86 resources only
ECHO:build.bat build null Resource -Will build both x86 and x64 resources only
ECHO:build.bat build x86 -Will build x86 Main exe and the resources
ECHO:build.bat build x86 null Debug -Will build x86 Main Debug exe and resources
ECHO.
+ECHO:"null" can be replaced with anything, e.g. "all": build.bat build x86 all Debug
+ECHO.
ECHO:NOTE: Debug only applies to Main project [mpc-hc.sln]
ECHO.
ENDLOCAL
EXIT /B
)
-
REM pre-build checks
-
IF "%VS90COMNTOOLS%" == "" GOTO :MissingVar
IF "%MINGW32%" == "" GOTO :MissingVar
IF "%MINGW64%" == "" GOTO :MissingVar
-REM Detect if we are running on 64bit WIN and use Wow6432Node, set the path
+REM Detect if we are running on 64bit WIN and use Wow6432Node, and set the path
REM of Inno Setup accordingly
IF "%PROGRAMFILES(x86)%zzz"=="zzz" (SET "U_=HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall"
) ELSE (
@@ -58,13 +55,13 @@ ENDLOCAL EXIT /B
:NoVarMissing
-REM setup variables
+REM set up variables
Title Compiling MPC-HC...
SET start_time=%date%-%time%
IF "%1" == "" (SET BUILDTYPE=/Build) ELSE (SET BUILDTYPE=/%1)
-
SET ORIGPATH="%CD%"
+
REM FIXME: Does this work for x64 builds??
REM we do have a good alternative vcvarsall.bat x86 | x64
REM Default location: "C:\Program Files\Microsoft Visual Studio 9\VC\Vcvarsall.bat"
@@ -73,7 +70,7 @@ CD %ORIGPATH% SET BUILD_APP=devenv /nologo
-REM Debug build only applies to Main(mpc-hc.sln), Resource only have the Release config
+REM Debug build only applies to Main (mpc-hc.sln)
IF /I "%4" == "Debug" (SET BUILDCONFIG=Debug) ELSE (SET BUILDCONFIG=Release)
REM Do we want to build x86, x64 or both?
@@ -127,7 +124,7 @@ CALL :SubMPCRES %%A )
:skipResource
-IF /I "%1" == "clean" EXIT /B
+IF /I "%1" == "Clean" EXIT /B
IF /I "%3" == "Resource" EXIT /B
IF /I "%3" == "Main" EXIT /B
IF /I "%4" == "Debug" EXIT /B
@@ -156,7 +153,6 @@ GOTO :END )
GOTO :EOF
-
:SubMPCRES
%BUILD_APP% mpcresources.sln %BUILDTYPE% "Release %~1|%Platform%"
IF %ERRORLEVEL% NEQ 0 GOTO :EndWithError
diff --git a/src/filters/reader/asyncreader/asyncio.cpp b/src/filters/reader/asyncreader/asyncio.cpp index 071091712..5675d22f2 100644 --- a/src/filters/reader/asyncreader/asyncio.cpp +++ b/src/filters/reader/asyncreader/asyncio.cpp @@ -8,7 +8,6 @@ #include "stdafx.h"
-#include <streams.h>
#include "asyncio.h"
// --- CAsyncRequest ---
diff --git a/src/filters/reader/asyncreader/asyncrdr.cpp b/src/filters/reader/asyncreader/asyncrdr.cpp index c724be04a..5fa17ba93 100644 --- a/src/filters/reader/asyncreader/asyncrdr.cpp +++ b/src/filters/reader/asyncreader/asyncrdr.cpp @@ -10,7 +10,6 @@ #include "stdafx.h"
-#include <streams.h>
#include "asyncio.h"
#include "asyncrdr.h"
diff --git a/update_version.bat b/update_version.bat index 7746603a5..6cb04955c 100644 --- a/update_version.bat +++ b/update_version.bat @@ -1,18 +1,19 @@ -@SubWCRev .\ include\SubWCRev.conf include\Version.h
-@SubWCRev .\ src\apps\mplayerc\res\mpc-hc.exe.manifest.conf src\apps\mplayerc\res\mpc-hc.exe.manifest
-@if %ERRORLEVEL% NEQ 0 goto :NoSubWCRev
-@goto :eof
+@ECHO OFF
+SubWCRev .\ include\SubWCRev.conf include\Version.h
+SubWCRev .\ src\apps\mplayerc\res\mpc-hc.exe.manifest.conf src\apps\mplayerc\res\mpc-hc.exe.manifest
+IF %ERRORLEVEL% NEQ 0 GOTO :NoSubWCRev
+GOTO :EOF
:NoSubWCRev
-@echo NoSubWCRev
-echo #pragma once > include\Version.h
-echo. >> include\Version.h
-echo #define DO_MAKE_STR(x) #x >> include\Version.h
-echo #define MAKE_STR(x) DO_MAKE_STR(x) >> include\Version.h
-echo. >> include\Version.h
-@echo #define VERSION_MAJOR 1 >> include\Version.h
-@echo #define VERSION_MINOR 3 >> include\Version.h
-@echo #define VERSION_REV 0 >> include\Version.h
-@echo #define VERSION_PATCH 0 >> include\Version.h
+ECHO:NoSubWCRev
+ECHO:#pragma once > include\Version.h
+ECHO.>> include\Version.h
+ECHO:#define DO_MAKE_STR(x) #x >> include\Version.h
+ECHO:#define MAKE_STR(x) DO_MAKE_STR(x) >> include\Version.h
+ECHO.>> include\Version.h
+ECHO:#define VERSION_MAJOR 1 >> include\Version.h
+ECHO:#define VERSION_MINOR 3 >> include\Version.h
+ECHO:#define VERSION_REV 0 >> include\Version.h
+ECHO:#define VERSION_PATCH 0 >> include\Version.h
-@copy src\apps\mplayerc\res\mpc-hc.exe.manifest.template src\apps\mplayerc\res\mpc-hc.exe.manifest /Y
\ No newline at end of file +COPY src\apps\mplayerc\res\mpc-hc.exe.manifest.template src\apps\mplayerc\res\mpc-hc.exe.manifest /Y
\ No newline at end of file |