This commit is contained in:
Birunthan Mohanathas 2012-12-18 20:02:19 +02:00
parent cabc5f00a4
commit 17f390082d
2 changed files with 7 additions and 3 deletions

View File

@ -92,11 +92,11 @@ echo * Starting build for %VERSION%
:: Build Library :: Build Library
echo * Building 32-bit projects echo * Building 32-bit projects
"msbuild.exe" /t:rebuild /p:Configuration=Release;Platform=Win32 /m ..\Rainmeter.sln > "BuildLog.txt" "msbuild.exe" /t:rebuild /p:Configuration=Release;Platform=Win32 /v:q /m ..\Rainmeter.sln > "BuildLog.txt"
if not %ERRORLEVEL% == 0 echo ERROR %ERRORLEVEL%: Build failed & goto END if not %ERRORLEVEL% == 0 echo ERROR %ERRORLEVEL%: Build failed & goto END
echo * Building 64-bit projects echo * Building 64-bit projects
"msbuild.exe" /t:rebuild /p:Configuration=Release;Platform=x64 /m ..\Rainmeter.sln > "BuildLog.txt" "msbuild.exe" /t:rebuild /p:Configuration=Release;Platform=x64 /v:q /m ..\Rainmeter.sln > "BuildLog.txt"
if not %ERRORLEVEL% == 0 echo ERROR %ERRORLEVEL%: Build failed & goto END if not %ERRORLEVEL% == 0 echo ERROR %ERRORLEVEL%: Build failed & goto END
:BUILDLANGUAGES :BUILDLANGUAGES
@ -110,7 +110,7 @@ for /f "tokens=1,2,3 delims=," %%a in (..\Language\List) do (
>>".\Installer\Languages.nsh" echo ${IncludeLanguage} "%%b" "%%a" >>".\Installer\Languages.nsh" echo ${IncludeLanguage} "%%b" "%%a"
set LANGUAGES='%%a - ${LANGFILE_%%b_NAME}' '${LANG_%%b}' '${LANG_%%b_CP}' !LANGUAGES! set LANGUAGES='%%a - ${LANGFILE_%%b_NAME}' '${LANG_%%b}' '${LANG_%%b_CP}' !LANGUAGES!
"msbuild.exe" /t:Language /p:Configuration=Release;Platform=Win32;TargetName=%%c ..\Rainmeter.sln > "BuildLog.txt" "msbuild.exe" /t:Language /p:Configuration=Release;Platform=Win32;TargetName=%%c /v:q ..\Rainmeter.sln > "BuildLog.txt"
if not %ERRORLEVEL% == 0 echo ERROR: Building language %%a failed & goto END if not %ERRORLEVEL% == 0 echo ERROR: Building language %%a failed & goto END
) )
>>".\Installer\Languages.nsh" echo ^^!define LANGUAGES "%LANGUAGES%" >>".\Installer\Languages.nsh" echo ^^!define LANGUAGES "%LANGUAGES%"

View File

@ -23,17 +23,21 @@
<CharacterSet>Unicode</CharacterSet> <CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v110_xp</PlatformToolset> <PlatformToolset>v110_xp</PlatformToolset>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
<UseDebugLibraries>true</UseDebugLibraries> <UseDebugLibraries>true</UseDebugLibraries>
<LinkIncremental>true</LinkIncremental> <LinkIncremental>true</LinkIncremental>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
<WholeProgramOptimization>true</WholeProgramOptimization> <WholeProgramOptimization>true</WholeProgramOptimization>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Platform)'=='Win32'"> <PropertyGroup Condition="'$(Platform)'=='Win32'">
<OutDir>$(SolutionDir)TestBench\x32\$(Configuration)\</OutDir> <OutDir>$(SolutionDir)TestBench\x32\$(Configuration)\</OutDir>
<IntDir>.\x32\$(Configuration)\</IntDir> <IntDir>.\x32\$(Configuration)\</IntDir>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Platform)'=='x64'"> <PropertyGroup Condition="'$(Platform)'=='x64'">
<OutDir>$(SolutionDir)TestBench\x64\$(Configuration)\</OutDir> <OutDir>$(SolutionDir)TestBench\x64\$(Configuration)\</OutDir>
<IntDir>.\x64\$(Configuration)\</IntDir> <IntDir>.\x64\$(Configuration)\</IntDir>