Index: ext/gmock/gmock.vcxproj
===================================================================
diff -u -N -rc8dc2ed371eba9b83347c1ee97615f89719e0b84 -r122f5f17f602b989c626ab31bb7f32c4211f93bd
--- ext/gmock/gmock.vcxproj (.../gmock.vcxproj) (revision c8dc2ed371eba9b83347c1ee97615f89719e0b84)
+++ ext/gmock/gmock.vcxproj (.../gmock.vcxproj) (revision 122f5f17f602b989c626ab31bb7f32c4211f93bd)
@@ -116,21 +116,21 @@
<_ProjectFileVersion>11.0.51106.1
- $(SolutionDir)bin-vc120\$(Configuration)\
+ $(SolutionDir)bin\$(Configuration)\
$(SolutionDir)intermediate\vc120\$(Platform)\$(ProjectName)_$(Configuration)\
$(ProjectName)32d
C:\dev\boost_1_57_0;$(IncludePath)
C:\dev\boost_1_57_0\lib-12.0\x32\lib;$(LibraryPath)
- $(SolutionDir)bin-vc120\$(Configuration)\
+ $(SolutionDir)bin\$(Configuration)\
$(SolutionDir)intermediate\vc120\$(Platform)\$(ProjectName)_$(Configuration)\
$(ProjectName)32d
C:\dev\boost_1_57_0;$(IncludePath)
C:\dev\boost_1_57_0\lib-12.0\x32\lib;$(LibraryPath)
- $(SolutionDir)bin-vc120\$(Configuration)\
+ $(SolutionDir)bin\$(Configuration)\
$(SolutionDir)intermediate\vc120\$(Platform)\$(ProjectName)_$(Configuration)\
AllRules.ruleset
false
@@ -139,7 +139,7 @@
C:\dev\boost_1_57_0\lib-12.0\x64\lib;$(LibraryPath)
- $(SolutionDir)bin-vc120\$(Configuration)\
+ $(SolutionDir)bin\$(Configuration)\
$(SolutionDir)intermediate\vc120\$(Platform)\$(ProjectName)_$(Configuration)\
AllRules.ruleset
false
@@ -148,28 +148,28 @@
C:\dev\boost_1_57_0\lib-12.0\x64\lib;$(LibraryPath)
- $(SolutionDir)bin-vc120\$(Configuration)\
+ $(SolutionDir)bin\$(Configuration)\
$(SolutionDir)intermediate\vc120\$(Platform)\$(ProjectName)_$(Configuration)\
$(ProjectName)32
C:\dev\boost_1_57_0;$(IncludePath)
C:\dev\boost_1_57_0\lib-12.0\x32\lib;$(LibraryPath)
- $(SolutionDir)bin-vc120\$(Configuration)\
+ $(SolutionDir)bin\$(Configuration)\
$(SolutionDir)intermediate\vc120\$(Platform)\$(ProjectName)_$(Configuration)\
$(ProjectName)32
C:\dev\boost_1_57_0;$(IncludePath)
C:\dev\boost_1_57_0\lib-12.0\x32\lib;$(LibraryPath)
- $(SolutionDir)bin-vc120\$(Configuration)\
+ $(SolutionDir)bin\$(Configuration)\
$(SolutionDir)intermediate\vc120\$(Platform)\$(ProjectName)_$(Configuration)\
$(ProjectName)64
C:\dev\boost_1_57_0;$(IncludePath)
C:\dev\boost_1_57_0\lib-12.0\x64\lib;$(LibraryPath)
- $(SolutionDir)bin-vc120\$(Configuration)\
+ $(SolutionDir)bin\$(Configuration)\
$(SolutionDir)intermediate\vc120\$(Platform)\$(ProjectName)_$(Configuration)\
$(ProjectName)64
C:\dev\boost_1_57_0;$(IncludePath)
Index: ext/sqlite3/sqlite3.vcxproj
===================================================================
diff -u -N -rc8dc2ed371eba9b83347c1ee97615f89719e0b84 -r122f5f17f602b989c626ab31bb7f32c4211f93bd
--- ext/sqlite3/sqlite3.vcxproj (.../sqlite3.vcxproj) (revision c8dc2ed371eba9b83347c1ee97615f89719e0b84)
+++ ext/sqlite3/sqlite3.vcxproj (.../sqlite3.vcxproj) (revision 122f5f17f602b989c626ab31bb7f32c4211f93bd)
@@ -116,49 +116,49 @@
<_ProjectFileVersion>12.0.21005.1
- $(SolutionDir)bin-vc120\$(Configuration)\
+ $(SolutionDir)bin\$(Configuration)\
$(SolutionDir)intermediate\vc120\$(Platform)\$(ProjectName)_$(Configuration)\
true
$(ProjectName)_32d
- $(SolutionDir)bin-vc120\$(Configuration)\
+ $(SolutionDir)bin\$(Configuration)\
$(SolutionDir)intermediate\vc120\$(Platform)\$(ProjectName)_$(Configuration)\
true
$(ProjectName)_64d
- $(SolutionDir)bin-vc120\$(Configuration)\
+ $(SolutionDir)bin\$(Configuration)\
$(SolutionDir)intermediate\vc120\$(Platform)\$(ProjectName)_$(Configuration)\
false
$(ProjectName)_32
- $(SolutionDir)bin-vc120\$(Configuration)\
+ $(SolutionDir)bin\$(Configuration)\
$(SolutionDir)intermediate\vc120\$(Platform)\$(ProjectName)_$(Configuration)\
false
$(ProjectName)_64
- $(SolutionDir)bin-vc120\$(Configuration)\
+ $(SolutionDir)bin\$(Configuration)\
$(SolutionDir)intermediate\vc120\$(Platform)\$(ProjectName)_$(Configuration)\
true
$(ProjectName)_32d
- $(SolutionDir)bin-vc120\$(Configuration)\
+ $(SolutionDir)bin\$(Configuration)\
$(SolutionDir)intermediate\vc120\$(Platform)\$(ProjectName)_$(Configuration)\
true
$(ProjectName)_64d
- $(SolutionDir)bin-vc120\$(Configuration)\
+ $(SolutionDir)bin\$(Configuration)\
$(SolutionDir)intermediate\vc120\$(Platform)\$(ProjectName)_$(Configuration)\
false
$(ProjectName)_32
- $(SolutionDir)bin-vc120\$(Configuration)\
+ $(SolutionDir)bin\$(Configuration)\
$(SolutionDir)intermediate\vc120\$(Platform)\$(ProjectName)_$(Configuration)\
false
$(ProjectName)_64
Index: msbuild.proj
===================================================================
diff -u -N -rc8dc2ed371eba9b83347c1ee97615f89719e0b84 -r122f5f17f602b989c626ab31bb7f32c4211f93bd
--- msbuild.proj (.../msbuild.proj) (revision c8dc2ed371eba9b83347c1ee97615f89719e0b84)
+++ msbuild.proj (.../msbuild.proj) (revision 122f5f17f602b989c626ab31bb7f32c4211f93bd)
@@ -1,4 +1,4 @@
-
+
@@ -9,4 +9,8 @@
+
+
+
+
\ No newline at end of file
Index: scripts/config.bat
===================================================================
diff -u -N -rfbce0995f733e1708a73175c6233ecfde6690e21 -r122f5f17f602b989c626ab31bb7f32c4211f93bd
--- scripts/config.bat (.../config.bat) (revision fbce0995f733e1708a73175c6233ecfde6690e21)
+++ scripts/config.bat (.../config.bat) (revision 122f5f17f602b989c626ab31bb7f32c4211f93bd)
@@ -9,12 +9,12 @@
SET OutputDir=%CurrentDir%\out
SET TmpDir=%CurrentDir%\tmp
-SET VSInstallDirX64=%ProgramFiles%\Microsoft Visual Studio 9.0
+SET VSInstallDirX64=%ProgramFiles%\Microsoft Visual Studio 12.0
SET ProgramFilesX86=%ProgramFiles%
rem NOTE: Strange construct here because of strange behaviour of %ProgramFiles(x86)% which loses last parenthesis otherwise
-if "%ProgramFiles(x86)%" == "" SET VSInstallDirX86=%ProgramFiles%\Microsoft Visual Studio 9.0
-if NOT "%ProgramFiles(x86)%" == "" SET VSInstallDirX86=%ProgramFiles(x86)%\Microsoft Visual Studio 9.0
+if "%ProgramFiles(x86)%" == "" SET VSInstallDirX86=%ProgramFiles%\Microsoft Visual Studio 12.0
+if NOT "%ProgramFiles(x86)%" == "" SET VSInstallDirX86=%ProgramFiles(x86)%\Microsoft Visual Studio 12.0
if NOT "%ProgramFiles(x86)%" == "" SET ProgramFilesX86=%ProgramFiles(x86)%
if not exist "%ScriptDir%\config.bat" (
Index: scripts/make_existing_release.bat
===================================================================
diff -u -N -r07fcd16f9a6e678a95133127f207509d18045080 -r122f5f17f602b989c626ab31bb7f32c4211f93bd
--- scripts/make_existing_release.bat (.../make_existing_release.bat) (revision 07fcd16f9a6e678a95133127f207509d18045080)
+++ scripts/make_existing_release.bat (.../make_existing_release.bat) (revision 122f5f17f602b989c626ab31bb7f32c4211f93bd)
@@ -18,11 +18,11 @@
)
echo * Initializing Visual Studio environment
-if not exist "%VS90COMNTOOLS%\vsvars32.bat" (
+if not exist "%VS120COMNTOOLS%\vsvars32.bat" (
echo ERROR: Can't find the vsvars32.bat file.
goto error
) else (
- call "%VS90COMNTOOLS%\vsvars32.bat" >nul
+ call "%VS120COMNTOOLS%\vsvars32.bat" >nul
)
set MainProjectDir=%CHRootDir%
@@ -45,23 +45,15 @@
)
echo --- Building solutions ----------------------------------------------
-cd "%MainProjectDir%"
-echo * Building win32 release solution...
-devenv ch.vc90.sln /rebuild "Release|Win32" >"%TmpDir%\command.log"
+rem cd "%MainProjectDir%"
+echo * Building release...
+msbuild "..\msbuild.proj" /t:Release /m:4 >"%TmpDir%\command.log"
if errorlevel 1 (
echo ERROR: Build process failed. See the log below:
type "%TmpDir%\command.log"
goto error
)
-echo * Building win64 release solution...
-devenv ch.vc90.sln /rebuild "Release|x64" >"%TmpDir%\command.log"
-if errorlevel 1 (
- echo ERROR: Build process failed. See the log below:
- type "%TmpDir%\command.log"
- goto error
-)
-
echo --- Verifying build -------------------------------------------------
cd %MainProjectDir%
if not exist bin\release (
@@ -76,8 +68,8 @@
echo * Verifying %%~nv%%~xv...
call internal\detect_incorrect_manifest.bat "%%v"
if errorlevel 1 (
- SET FoundWrongManifest=1
- )
+ SET FoundWrongManifest=1
+ )
)
if "!FoundWrongManifest!" == "1" (
@@ -187,9 +179,10 @@
xcopy "bin\release\libchcore32u.dll" "%TmpDir%\zip32\" >>"%TmpDir%\command.log" || SET Res=1
xcopy "bin\release\libictranslate32u.dll" "%TmpDir%\zip32\" >>"%TmpDir%\command.log" || SET Res=1
xcopy "bin\release\ictranslate.exe" "%TmpDir%\zip32\" >>"%TmpDir%\command.log" || SET Res=1
-xcopy "%VSInstallDirX86%\VC\redist\x86\Microsoft.VC90.CRT\*" "%TmpDir%\zip32\" >>"%TmpDir%\command.log" || SET Res=1
-xcopy "%VSInstallDirX86%\VC\redist\x86\Microsoft.VC90.MFC\*" "%TmpDir%\zip32\" >>"%TmpDir%\command.log" || SET Res=1
-xcopy "%VSInstallDirX64%\Common7\IDE\Remote Debugger\x86\dbghelp.dll" "%TmpDir%\zip32\" >>"%TmpDir%\command.log" || SET Res=1
+xcopy "bin\release\sqlite3_32.dll" "%TmpDir%\zip32\" >>"%TmpDir%\command.log" || SET Res=1
+xcopy "%VSInstallDirX86%\VC\redist\x86\Microsoft.VC120.CRT\*" "%TmpDir%\zip32\" >>"%TmpDir%\command.log" || SET Res=1
+xcopy "%VSInstallDirX86%\VC\redist\x86\Microsoft.VC120.MFC\*" "%TmpDir%\zip32\" >>"%TmpDir%\command.log" || SET Res=1
+xcopy "%VSInstallDirX86%\Common7\IDE\Remote Debugger\x86\dbghelp.dll" "%TmpDir%\zip32\" >>"%TmpDir%\command.log" || SET Res=1
xcopy /E /I "bin\release\help" "%TmpDir%\zip32\help" >>"%TmpDir%\command.log" || SET Res=1
xcopy /E /I "bin\release\langs" "%TmpDir%\zip32\langs" >>"%TmpDir%\command.log" || SET Res=1
@@ -200,9 +193,10 @@
xcopy "bin\release\libchcore64u.dll" "%TmpDir%\zip64\" >>"%TmpDir%\command.log" || SET Res=1
xcopy "bin\release\libictranslate64u.dll" "%TmpDir%\zip64\" >>"%TmpDir%\command.log" || SET Res=1
xcopy "bin\release\ictranslate64.exe" "%TmpDir%\zip64\" >>"%TmpDir%\command.log" || SET Res=1
-xcopy "%VSInstallDirX86%\VC\redist\amd64\Microsoft.VC90.CRT\*" "%TmpDir%\zip64\" >>"%TmpDir%\command.log" || SET Res=1
-xcopy "%VSInstallDirX86%\VC\redist\amd64\Microsoft.VC90.MFC\*" "%TmpDir%\zip64\" >>"%TmpDir%\command.log" || SET Res=1
-xcopy "%VSInstallDirX64%\Common7\IDE\Remote Debugger\x64\dbghelp.dll" "%TmpDir%\zip64\" >>"%TmpDir%\command.log" || SET Res=1
+xcopy "bin\release\sqlite3_64.dll" "%TmpDir%\zip64\" >>"%TmpDir%\command.log" || SET Res=1
+xcopy "%VSInstallDirX86%\VC\redist\x64\Microsoft.VC120.CRT\*" "%TmpDir%\zip64\" >>"%TmpDir%\command.log" || SET Res=1
+xcopy "%VSInstallDirX86%\VC\redist\x64\Microsoft.VC120.MFC\*" "%TmpDir%\zip64\" >>"%TmpDir%\command.log" || SET Res=1
+xcopy "%VSInstallDirX86%\Common7\IDE\Remote Debugger\x64\dbghelp.dll" "%TmpDir%\zip64\" >>"%TmpDir%\command.log" || SET Res=1
xcopy /E /I "bin\release\help" "%TmpDir%\zip64\help" >>"%TmpDir%\command.log" || SET Res=1
xcopy /E /I "bin\release\langs" "%TmpDir%\zip64\langs" >>"%TmpDir%\command.log" || SET Res=1
Index: scripts/setup.iss
===================================================================
diff -u -N -rf1d071f0db83bd9af41f33b2023dbc5e0cd4d1da -r122f5f17f602b989c626ab31bb7f32c4211f93bd
--- scripts/setup.iss (.../setup.iss) (revision f1d071f0db83bd9af41f33b2023dbc5e0cd4d1da)
+++ scripts/setup.iss (.../setup.iss) (revision 122f5f17f602b989c626ab31bb7f32c4211f93bd)
@@ -23,10 +23,10 @@
#define ICTranslateFilename64 "ictranslate64.exe"
#define SQLite32 "sqlite3_32.dll"
#define SQLite64 "sqlite3_64.dll"
-#define MSRedistDir32 "C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\redist\x86"
-#define MSRedistDir64 "C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\redist\amd64"
-#define DbgHelp32 "C:\Program Files\Microsoft Visual Studio 9.0\Common7\IDE\Remote Debugger\x86"
-#define DbgHelp64 "C:\Program Files\Microsoft Visual Studio 9.0\Common7\IDE\Remote Debugger\x64"
+#define MSRedistDir32 "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\redist\x86"
+#define MSRedistDir64 "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\redist\x64"
+#define DbgHelp32 "C:\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\IDE\Remote Debugger\x86"
+#define DbgHelp64 "C:\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\IDE\Remote Debugger\x64"
[Setup]
AppName={#MyAppName}
@@ -88,8 +88,8 @@
Name: startatboot; Description: {cm:StartAtBoot}; Flags: unchecked
[Files]
-Source: "C:\projects\ch-rw\bin\release\help\*.chm"; DestDir: "{app}\help"; Flags: ignoreversion recursesubdirs createallsubdirs
-Source: "C:\projects\ch-rw\bin\release\langs\*.lng"; DestDir: "{app}\langs"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "..\bin\release\help\*.chm"; DestDir: "{app}\help"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "..\bin\release\langs\*.lng"; DestDir: "{app}\langs"; Flags: ignoreversion recursesubdirs createallsubdirs
Source: "..\License.txt"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\bin\release\{#ExeFilename32}"; DestDir: "{app}"; Flags: ignoreversion; Check: not Is64BitInstallMode
@@ -107,10 +107,10 @@
Source: "..\bin\release\{#SQLite64}"; DestDir: "{app}"; Flags: ignoreversion; Check: not Is64BitInstallMode
Source: "..\bin\release\{#SQLite64}"; DestDir: "{app}"; Flags: ignoreversion; Check: Is64BitInstallMode
-Source: "{#MSRedistDir32}\Microsoft.VC90.CRT\*"; DestDir: "{app}"; Flags: ignoreversion; Check: not Is64BitInstallMode
-Source: "{#MSRedistDir64}\Microsoft.VC90.CRT\*"; DestDir: "{app}"; Flags: ignoreversion; Check: Is64BitInstallMode
-Source: "{#MSRedistDir32}\Microsoft.VC90.MFC\*"; DestDir: "{app}"; Flags: ignoreversion; Check: not Is64BitInstallMode
-Source: "{#MSRedistDir64}\Microsoft.VC90.MFC\*"; DestDir: "{app}"; Flags: ignoreversion; Check: Is64BitInstallMode
+Source: "{#MSRedistDir32}\Microsoft.VC120.CRT\*"; DestDir: "{app}"; Flags: ignoreversion; Check: not Is64BitInstallMode
+Source: "{#MSRedistDir64}\Microsoft.VC120.CRT\*"; DestDir: "{app}"; Flags: ignoreversion; Check: Is64BitInstallMode
+Source: "{#MSRedistDir32}\Microsoft.VC120.MFC\*"; DestDir: "{app}"; Flags: ignoreversion; Check: not Is64BitInstallMode
+Source: "{#MSRedistDir64}\Microsoft.VC120.MFC\*"; DestDir: "{app}"; Flags: ignoreversion; Check: Is64BitInstallMode
Source: "{#DbgHelp32}\dbghelp.dll"; DestDir: "{app}"; Flags: ignoreversion; Check: not Is64BitInstallMode
Source: "{#DbgHelp64}\dbghelp.dll"; DestDir: "{app}"; Flags: ignoreversion; Check: Is64BitInstallMode
Index: src/ch/ch.vc120.vcxproj
===================================================================
diff -u -N -rc8dc2ed371eba9b83347c1ee97615f89719e0b84 -r122f5f17f602b989c626ab31bb7f32c4211f93bd
--- src/ch/ch.vc120.vcxproj (.../ch.vc120.vcxproj) (revision c8dc2ed371eba9b83347c1ee97615f89719e0b84)
+++ src/ch/ch.vc120.vcxproj (.../ch.vc120.vcxproj) (revision 122f5f17f602b989c626ab31bb7f32c4211f93bd)
@@ -121,21 +121,21 @@
<_ProjectFileVersion>11.0.51106.1
- $(SolutionDir)bin-vc120\$(Configuration)\
+ $(SolutionDir)bin\$(Configuration)\
$(SolutionDir)intermediate\vc120\$(Platform)\$(ProjectName)_$(Configuration)\
true
C:\dev\boost_1_57_0;$(IncludePath)
C:\dev\boost_1_57_0\lib-12.0\x32\lib;$(LibraryPath)
- $(SolutionDir)bin-vc120\$(Configuration)\
+ $(SolutionDir)bin\$(Configuration)\
$(SolutionDir)intermediate\vc120\$(Platform)\$(ProjectName)_$(Configuration)\
true
C:\dev\boost_1_57_0;$(IncludePath)
C:\dev\boost_1_57_0\lib-12.0\x32\lib;$(LibraryPath)
- $(SolutionDir)bin-vc120\$(Configuration)\
+ $(SolutionDir)bin\$(Configuration)\
$(SolutionDir)intermediate\vc120\$(Platform)\$(ProjectName)_$(Configuration)\
true
$(ProjectName)64
@@ -145,7 +145,7 @@
C:\dev\boost_1_57_0\lib-12.0\x64\lib;$(LibraryPath)
- $(SolutionDir)bin-vc120\$(Configuration)\
+ $(SolutionDir)bin\$(Configuration)\
$(SolutionDir)intermediate\vc120\$(Platform)\$(ProjectName)_$(Configuration)\
true
$(ProjectName)64
@@ -155,29 +155,29 @@
C:\dev\boost_1_57_0\lib-12.0\x64\lib;$(LibraryPath)
- $(SolutionDir)bin-vc120\$(Configuration)\
+ $(SolutionDir)bin\$(Configuration)\
$(SolutionDir)intermediate\vc120\$(Platform)\$(ProjectName)_$(Configuration)\
false
C:\dev\boost_1_57_0;$(IncludePath)
C:\dev\boost_1_57_0\lib-12.0\x32\lib;$(LibraryPath)
- $(SolutionDir)bin-vc120\$(Configuration)\
+ $(SolutionDir)bin\$(Configuration)\
$(SolutionDir)intermediate\vc120\$(Platform)\$(ProjectName)_$(Configuration)\
false
C:\dev\boost_1_57_0;$(IncludePath)
C:\dev\boost_1_57_0\lib-12.0\x32\lib;$(LibraryPath)
- $(SolutionDir)bin-vc120\$(Configuration)\
+ $(SolutionDir)bin\$(Configuration)\
$(SolutionDir)intermediate\vc120\$(Platform)\$(ProjectName)_$(Configuration)\
false
$(ProjectName)64
C:\dev\boost_1_57_0;$(IncludePath)
C:\dev\boost_1_57_0\lib-12.0\x64\lib;$(LibraryPath)
- $(SolutionDir)bin-vc120\$(Configuration)\
+ $(SolutionDir)bin\$(Configuration)\
$(SolutionDir)intermediate\vc120\$(Platform)\$(ProjectName)_$(Configuration)\
false
$(ProjectName)64
Index: src/chext/chext.vc120.vcxproj
===================================================================
diff -u -N -rc8dc2ed371eba9b83347c1ee97615f89719e0b84 -r122f5f17f602b989c626ab31bb7f32c4211f93bd
--- src/chext/chext.vc120.vcxproj (.../chext.vc120.vcxproj) (revision c8dc2ed371eba9b83347c1ee97615f89719e0b84)
+++ src/chext/chext.vc120.vcxproj (.../chext.vc120.vcxproj) (revision 122f5f17f602b989c626ab31bb7f32c4211f93bd)
@@ -125,23 +125,23 @@
<_ProjectFileVersion>11.0.51106.1
- $(SolutionDir)bin-vc120\$(Configuration)\
+ $(SolutionDir)bin\$(Configuration)\
$(SolutionDir)intermediate\vc120\$(Platform)\$(ProjectName)_$(Configuration)\
true
true
C:\dev\boost_1_57_0;$(IncludePath)
C:\dev\boost_1_57_0\lib-12.0\x32\lib;$(LibraryPath)
- $(SolutionDir)bin-vc120\$(Configuration)\
+ $(SolutionDir)bin\$(Configuration)\
$(SolutionDir)intermediate\vc120\$(Platform)\$(ProjectName)_$(Configuration)\
true
true
C:\dev\boost_1_57_0;$(IncludePath)
C:\dev\boost_1_57_0\lib-12.0\x32\lib;$(LibraryPath)
- $(SolutionDir)bin-vc120\$(Configuration)\
+ $(SolutionDir)bin\$(Configuration)\
$(SolutionDir)intermediate\vc120\$(Platform)\$(ProjectName)_$(Configuration)\
true
true
@@ -152,7 +152,7 @@
C:\dev\boost_1_57_0\lib-12.0\x64\lib;$(LibraryPath)
- $(SolutionDir)bin-vc120\$(Configuration)\
+ $(SolutionDir)bin\$(Configuration)\
$(SolutionDir)intermediate\vc120\$(Platform)\$(ProjectName)_$(Configuration)\
true
true
@@ -163,23 +163,23 @@
C:\dev\boost_1_57_0\lib-12.0\x64\lib;$(LibraryPath)
- $(SolutionDir)bin-vc120\$(Configuration)\
+ $(SolutionDir)bin\$(Configuration)\
$(SolutionDir)intermediate\vc120\$(Platform)\$(ProjectName)_$(Configuration)\
true
false
C:\dev\boost_1_57_0;$(IncludePath)
C:\dev\boost_1_57_0\lib-12.0\x32\lib;$(LibraryPath)
- $(SolutionDir)bin-vc120\$(Configuration)\
+ $(SolutionDir)bin\$(Configuration)\
$(SolutionDir)intermediate\vc120\$(Platform)\$(ProjectName)_$(Configuration)\
true
false
C:\dev\boost_1_57_0;$(IncludePath)
C:\dev\boost_1_57_0\lib-12.0\x32\lib;$(LibraryPath)
- $(SolutionDir)bin-vc120\$(Configuration)\
+ $(SolutionDir)bin\$(Configuration)\
$(SolutionDir)intermediate\vc120\$(Platform)\$(ProjectName)_$(Configuration)\
true
false
@@ -188,7 +188,7 @@
C:\dev\boost_1_57_0\lib-12.0\x64\lib;$(LibraryPath)
- $(SolutionDir)bin-vc120\$(Configuration)\
+ $(SolutionDir)bin\$(Configuration)\
$(SolutionDir)intermediate\vc120\$(Platform)\$(ProjectName)_$(Configuration)\
true
false
Index: src/libchcore/libchcore.vc120.vcxproj
===================================================================
diff -u -N -rc8dc2ed371eba9b83347c1ee97615f89719e0b84 -r122f5f17f602b989c626ab31bb7f32c4211f93bd
--- src/libchcore/libchcore.vc120.vcxproj (.../libchcore.vc120.vcxproj) (revision c8dc2ed371eba9b83347c1ee97615f89719e0b84)
+++ src/libchcore/libchcore.vc120.vcxproj (.../libchcore.vc120.vcxproj) (revision 122f5f17f602b989c626ab31bb7f32c4211f93bd)
@@ -117,23 +117,23 @@
<_ProjectFileVersion>11.0.51106.1
- $(SolutionDir)bin-vc120\$(Configuration)\
+ $(SolutionDir)bin\$(Configuration)\
$(SolutionDir)intermediate\vc120\$(Platform)\$(ProjectName)_$(Configuration)\
true
$(ProjectName)32ud
C:\dev\boost_1_57_0;$(IncludePath)
C:\dev\boost_1_57_0\lib-12.0\x32\lib;$(LibraryPath)
- $(SolutionDir)bin-vc120\$(Configuration)\
+ $(SolutionDir)bin\$(Configuration)\
$(SolutionDir)intermediate\vc120\$(Platform)\$(ProjectName)_$(Configuration)\
true
$(ProjectName)32ud
C:\dev\boost_1_57_0;$(IncludePath)
C:\dev\boost_1_57_0\lib-12.0\x32\lib;$(LibraryPath)
- $(SolutionDir)bin-vc120\$(Configuration)\
+ $(SolutionDir)bin\$(Configuration)\
$(SolutionDir)intermediate\vc120\$(Platform)\$(ProjectName)_$(Configuration)\
true
$(ProjectName)64ud
@@ -143,7 +143,7 @@
C:\dev\boost_1_57_0\lib-12.0\x64\lib;$(LibraryPath)
- $(SolutionDir)bin-vc120\$(Configuration)\
+ $(SolutionDir)bin\$(Configuration)\
$(SolutionDir)intermediate\vc120\$(Platform)\$(ProjectName)_$(Configuration)\
true
$(ProjectName)64ud
@@ -153,31 +153,31 @@
C:\dev\boost_1_57_0\lib-12.0\x64\lib;$(LibraryPath)
- $(SolutionDir)bin-vc120\$(Configuration)\
+ $(SolutionDir)bin\$(Configuration)\
$(SolutionDir)intermediate\vc120\$(Platform)\$(ProjectName)_$(Configuration)\
false
$(ProjectName)32u
C:\dev\boost_1_57_0;$(IncludePath)
C:\dev\boost_1_57_0\lib-12.0\x32\lib;$(LibraryPath)
- $(SolutionDir)bin-vc120\$(Configuration)\
+ $(SolutionDir)bin\$(Configuration)\
$(SolutionDir)intermediate\vc120\$(Platform)\$(ProjectName)_$(Configuration)\
false
$(ProjectName)32u
C:\dev\boost_1_57_0;$(IncludePath)
C:\dev\boost_1_57_0\lib-12.0\x32\lib;$(LibraryPath)
- $(SolutionDir)bin-vc120\$(Configuration)\
+ $(SolutionDir)bin\$(Configuration)\
$(SolutionDir)intermediate\vc120\$(Platform)\$(ProjectName)_$(Configuration)\
false
$(ProjectName)64u
C:\dev\boost_1_57_0;$(IncludePath)
C:\dev\boost_1_57_0\lib-12.0\x64\lib;$(LibraryPath)
- $(SolutionDir)bin-vc120\$(Configuration)\
+ $(SolutionDir)bin\$(Configuration)\
$(SolutionDir)intermediate\vc120\$(Platform)\$(ProjectName)_$(Configuration)\
false
$(ProjectName)64u