Index: src/ictranslate/ictranslate.vc120.vcxproj =================================================================== diff -u -re887dced1eb64c0dc6029d317dbaeaa3ee2c70e4 -rac09bb9e4f4e16697b912a86411fafc4f3d795c8 --- src/ictranslate/ictranslate.vc120.vcxproj (.../ictranslate.vc120.vcxproj) (revision e887dced1eb64c0dc6029d317dbaeaa3ee2c70e4) +++ src/ictranslate/ictranslate.vc120.vcxproj (.../ictranslate.vc120.vcxproj) (revision ac09bb9e4f4e16697b912a86411fafc4f3d795c8) @@ -17,6 +17,22 @@ Release x64 + + Testing Debug + Win32 + + + Testing Debug + x64 + + + Testing Release + Win32 + + + Testing Release + x64 + ictranslate @@ -32,40 +48,78 @@ Unicode true + + Application + v120 + Dynamic + Unicode + true + Application v120 Dynamic Unicode + + Application + v120 + Dynamic + Unicode + Application v120 Dynamic Unicode true + + Application + v120 + Dynamic + Unicode + true + Application v120 Dynamic Unicode + + Application + v120 + Dynamic + Unicode + + + + + + + + + + + + + <_ProjectFileVersion>11.0.51106.1 @@ -77,6 +131,13 @@ C:\dev\boost_1_56_0;$(IncludePath) C:\dev\boost_1_56_0\lib-12.0\x32\lib;$(LibraryPath) + + $(SolutionDir)bin-vc120\$(Configuration)\ + $(SolutionDir)intermediate\vc120\$(Platform)\$(ProjectName)_$(Configuration)\ + true + C:\dev\boost_1_56_0;$(IncludePath) + C:\dev\boost_1_56_0\lib-12.0\x32\lib;$(LibraryPath) + $(SolutionDir)bin-vc120\$(Configuration)\ $(SolutionDir)intermediate\vc120\$(Platform)\$(ProjectName)_$(Configuration)\ @@ -85,13 +146,28 @@ C:\dev\boost_1_56_0;$(IncludePath) C:\dev\boost_1_56_0\lib-12.0\x64\lib;$(LibraryPath) + + $(SolutionDir)bin-vc120\$(Configuration)\ + $(SolutionDir)intermediate\vc120\$(Platform)\$(ProjectName)_$(Configuration)\ + true + $(ProjectName)64 + C:\dev\boost_1_56_0;$(IncludePath) + C:\dev\boost_1_56_0\lib-12.0\x64\lib;$(LibraryPath) + $(SolutionDir)bin-vc120\$(Configuration)\ $(SolutionDir)intermediate\vc120\$(Platform)\$(ProjectName)_$(Configuration)\ false C:\dev\boost_1_56_0;$(IncludePath) C:\dev\boost_1_56_0\lib-12.0\x32\lib;$(LibraryPath) + + $(SolutionDir)bin-vc120\$(Configuration)\ + $(SolutionDir)intermediate\vc120\$(Platform)\$(ProjectName)_$(Configuration)\ + false + C:\dev\boost_1_56_0;$(IncludePath) + C:\dev\boost_1_56_0\lib-12.0\x32\lib;$(LibraryPath) + $(SolutionDir)bin-vc120\$(Configuration)\ $(SolutionDir)intermediate\vc120\$(Platform)\$(ProjectName)_$(Configuration)\ @@ -100,6 +176,14 @@ C:\dev\boost_1_56_0;$(IncludePath) C:\dev\boost_1_56_0\lib-12.0\x64\lib;$(LibraryPath) + + $(SolutionDir)bin-vc120\$(Configuration)\ + $(SolutionDir)intermediate\vc120\$(Platform)\$(ProjectName)_$(Configuration)\ + false + $(ProjectName)64 + C:\dev\boost_1_56_0;$(IncludePath) + C:\dev\boost_1_56_0\lib-12.0\x64\lib;$(LibraryPath) + _DEBUG;%(PreprocessorDefinitions) @@ -128,8 +212,47 @@ true Windows MachineX86 + "$(OutDir)" + + + _DEBUG;%(PreprocessorDefinitions) + false + true + + + Disabled + WIN32;_WINDOWS;_DEBUG;_CRT_SECURE_NO_DEPRECATE;_BIND_TO_CURRENT_VCLIBS_VERSION=1;TESTING;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + Use + $(IntDir)$(TargetName)_vs90.pdb + Level4 + true + EditAndContinue + true + ..\..\ext\gmock\include + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + $(IntDir);%(AdditionalIncludeDirectories) + + + true + Console + MachineX86 + gmock32d.lib + "$(OutDir)" + + + cd "$(TargetDir)" +"$(TargetPath)" + + + _DEBUG;%(PreprocessorDefinitions) @@ -158,8 +281,47 @@ true Windows MachineX64 + "$(OutDir)" + + + _DEBUG;%(PreprocessorDefinitions) + false + X64 + + + Disabled + WIN32;_WINDOWS;_DEBUG;_CRT_SECURE_NO_DEPRECATE;_BIND_TO_CURRENT_VCLIBS_VERSION=1;TESTING;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + Use + $(IntDir)$(TargetName)_vs90.pdb + Level4 + true + ProgramDatabase + true + ..\..\ext\gmock\include + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + $(IntDir);%(AdditionalIncludeDirectories) + + + true + Console + MachineX64 + gmock64d.lib + "$(OutDir)" + + + cd "$(TargetDir)" +"$(TargetPath)" + + + NDEBUG;%(PreprocessorDefinitions) @@ -191,8 +353,50 @@ true true MachineX86 + "$(OutDir)" + + + NDEBUG;%(PreprocessorDefinitions) + false + true + + + MaxSpeed + true + WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;_BIND_TO_CURRENT_VCLIBS_VERSION=1;TESTING;_CONSOLE;%(PreprocessorDefinitions) + false + MultiThreadedDLL + true + Use + $(IntDir)$(TargetName)_vs90.pdb + Level4 + true + ProgramDatabase + true + ..\..\ext\gmock\include + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + $(IntDir);%(AdditionalIncludeDirectories) + + + true + Console + true + true + MachineX86 + gmock32.lib + "$(OutDir)" + + + cd "$(TargetDir)" +"$(TargetPath)" + + + NDEBUG;%(PreprocessorDefinitions) @@ -224,8 +428,50 @@ true true MachineX64 + "$(OutDir)" + + + NDEBUG;%(PreprocessorDefinitions) + false + X64 + + + MaxSpeed + true + WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;_BIND_TO_CURRENT_VCLIBS_VERSION=1;TESTING;_CONSOLE;%(PreprocessorDefinitions) + false + MultiThreadedDLL + true + Use + $(IntDir)$(TargetName)_vs90.pdb + Level4 + true + ProgramDatabase + true + ..\..\ext\gmock\include + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + $(IntDir);%(AdditionalIncludeDirectories) + + + true + Console + true + true + MachineX64 + gmock64.lib + "$(OutDir)" + + + cd "$(TargetDir)" +"$(TargetPath)" + + + {5510b933-046f-4f75-8b46-5e8279c8ccde} @@ -235,13 +481,31 @@ + + true + true + true + true + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + Create + Create Create + Create Create + Create Create + Create Index: src/ictranslate/ictranslate.vc120.vcxproj.filters =================================================================== diff -u -rf5fa714118429e492390790c38327e05873a6da3 -rac09bb9e4f4e16697b912a86411fafc4f3d795c8 --- src/ictranslate/ictranslate.vc120.vcxproj.filters (.../ictranslate.vc120.vcxproj.filters) (revision f5fa714118429e492390790c38327e05873a6da3) +++ src/ictranslate/ictranslate.vc120.vcxproj.filters (.../ictranslate.vc120.vcxproj.filters) (revision ac09bb9e4f4e16697b912a86411fafc4f3d795c8) @@ -13,6 +13,9 @@ {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + {03f4b207-02d6-436e-ba87-91ae5a63ccdd} + @@ -24,6 +27,9 @@ Source Files + + Tests + Index: src/libictranslate/libictranslate.vc120.vcxproj =================================================================== diff -u -re887dced1eb64c0dc6029d317dbaeaa3ee2c70e4 -rac09bb9e4f4e16697b912a86411fafc4f3d795c8 --- src/libictranslate/libictranslate.vc120.vcxproj (.../libictranslate.vc120.vcxproj) (revision e887dced1eb64c0dc6029d317dbaeaa3ee2c70e4) +++ src/libictranslate/libictranslate.vc120.vcxproj (.../libictranslate.vc120.vcxproj) (revision ac09bb9e4f4e16697b912a86411fafc4f3d795c8) @@ -17,6 +17,22 @@ Release x64 + + Testing Debug + Win32 + + + Testing Debug + x64 + + + Testing Release + Win32 + + + Testing Release + x64 + libictranslate @@ -32,40 +48,78 @@ Unicode true + + DynamicLibrary + v120 + Dynamic + Unicode + true + DynamicLibrary v120 Dynamic Unicode + + DynamicLibrary + v120 + Dynamic + Unicode + DynamicLibrary v120 Dynamic Unicode true + + DynamicLibrary + v120 + Dynamic + Unicode + true + DynamicLibrary v120 Dynamic Unicode + + DynamicLibrary + v120 + Dynamic + Unicode + + + + + + + + + + + + + <_ProjectFileVersion>11.0.51106.1 @@ -78,6 +132,14 @@ C:\dev\boost_1_56_0;$(IncludePath) C:\dev\boost_1_56_0\lib-12.0\x32\lib;$(LibraryPath) + + $(SolutionDir)bin-vc120\$(Configuration)\ + $(SolutionDir)intermediate\vc120\$(Platform)\$(ProjectName)_$(Configuration)\ + true + $(ProjectName)32ud + C:\dev\boost_1_56_0;$(IncludePath) + C:\dev\boost_1_56_0\lib-12.0\x32\lib;$(LibraryPath) + $(SolutionDir)bin-vc120\$(Configuration)\ $(SolutionDir)intermediate\vc120\$(Platform)\$(ProjectName)_$(Configuration)\ @@ -86,6 +148,14 @@ C:\dev\boost_1_56_0;$(IncludePath) C:\dev\boost_1_56_0\lib-12.0\x64\lib;$(LibraryPath) + + $(SolutionDir)bin-vc120\$(Configuration)\ + $(SolutionDir)intermediate\vc120\$(Platform)\$(ProjectName)_$(Configuration)\ + true + $(ProjectName)64ud + C:\dev\boost_1_56_0;$(IncludePath) + C:\dev\boost_1_56_0\lib-12.0\x64\lib;$(LibraryPath) + $(SolutionDir)bin-vc120\$(Configuration)\ $(SolutionDir)intermediate\vc120\$(Platform)\$(ProjectName)_$(Configuration)\ @@ -94,6 +164,14 @@ C:\dev\boost_1_56_0;$(IncludePath) C:\dev\boost_1_56_0\lib-12.0\x32\lib;$(LibraryPath) + + $(SolutionDir)bin-vc120\$(Configuration)\ + $(SolutionDir)intermediate\vc120\$(Platform)\$(ProjectName)_$(Configuration)\ + false + $(ProjectName)32u + C:\dev\boost_1_56_0;$(IncludePath) + C:\dev\boost_1_56_0\lib-12.0\x32\lib;$(LibraryPath) + $(SolutionDir)bin-vc120\$(Configuration)\ $(SolutionDir)intermediate\vc120\$(Platform)\$(ProjectName)_$(Configuration)\ @@ -102,6 +180,14 @@ C:\dev\boost_1_56_0;$(IncludePath) C:\dev\boost_1_56_0\lib-12.0\x64\lib;$(LibraryPath) + + $(SolutionDir)bin-vc120\$(Configuration)\ + $(SolutionDir)intermediate\vc120\$(Platform)\$(ProjectName)_$(Configuration)\ + false + $(ProjectName)64u + C:\dev\boost_1_56_0;$(IncludePath) + C:\dev\boost_1_56_0\lib-12.0\x64\lib;$(LibraryPath) + _DEBUG;%(PreprocessorDefinitions) @@ -126,12 +212,73 @@ $(IntDir);%(AdditionalIncludeDirectories) - $(OutDir);%(AdditionalLibraryDirectories) + "$(OutDir)" true Windows MachineX86 + + + _DEBUG;%(PreprocessorDefinitions) + false + + + Disabled + WIN32;_WINDOWS;_DEBUG;_AFXEXT;_CRT_SECURE_NO_DEPRECATE;LIBICTRANSLATE_EXPORTS;_BIND_TO_CURRENT_VCLIBS_VERSION=1;TESTING;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + Use + $(IntDir)$(TargetName)_vs90.pdb + Level4 + true + EditAndContinue + true + ..\..\ext\gmock\include + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + $(IntDir);%(AdditionalIncludeDirectories) + + + "$(OutDir)" + true + Windows + MachineX86 + gmock32d.lib + + + cd "$(TargetDir)" + +if "$(PlatformName)" EQU "x64" goto x64 + +if "$(Configuration)" EQU "Testing Release" goto x32rel + +:x32dbg +"$(SolutionDir)tools\test_runner32.exe" "$(TargetPath)" +goto end + +:x32rel +"$(SolutionDir)tools\test_runner32.exe" "$(TargetPath)" +goto end + +:x64 +if "$(Configuration)" EQU "Testing Release" goto x64rel + +:x64dbg +"$(SolutionDir)tools\test_runner64.exe" "$(TargetPath)" +goto end + +:x64rel +"$(SolutionDir)tools\test_runner64.exe" "$(TargetPath)" +goto end + +:end + + + _DEBUG;%(PreprocessorDefinitions) @@ -157,12 +304,74 @@ $(IntDir);%(AdditionalIncludeDirectories) - $(OutDir);%(AdditionalLibraryDirectories) + "$(OutDir)" true Windows MachineX64 + + + _DEBUG;%(PreprocessorDefinitions) + false + X64 + + + Disabled + WIN32;_WINDOWS;_DEBUG;_AFXEXT;_CRT_SECURE_NO_DEPRECATE;LIBICTRANSLATE_EXPORTS;_BIND_TO_CURRENT_VCLIBS_VERSION=1;TESTING;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + Use + $(IntDir)$(TargetName)_vs90.pdb + Level4 + true + ProgramDatabase + true + ..\..\ext\gmock\include + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + $(IntDir);%(AdditionalIncludeDirectories) + + + "$(OutDir)" + true + Windows + MachineX64 + gmock64d.lib + + + cd "$(TargetDir)" + +if "$(PlatformName)" EQU "x64" goto x64 + +if "$(Configuration)" EQU "Testing Release" goto x32rel + +:x32dbg +"$(SolutionDir)tools\test_runner32.exe" "$(TargetPath)" +goto end + +:x32rel +"$(SolutionDir)tools\test_runner32.exe" "$(TargetPath)" +goto end + +:x64 +if "$(Configuration)" EQU "Testing Release" goto x64rel + +:x64dbg +"$(SolutionDir)tools\test_runner64.exe" "$(TargetPath)" +goto end + +:x64rel +"$(SolutionDir)tools\test_runner64.exe" "$(TargetPath)" +goto end + +:end + + + NDEBUG;%(PreprocessorDefinitions) @@ -187,14 +396,77 @@ $(IntDir);%(AdditionalIncludeDirectories) - $(OutDir);%(AdditionalLibraryDirectories) + "$(OutDir)" true Windows true true MachineX86 + + + NDEBUG;%(PreprocessorDefinitions) + false + + + MaxSpeed + true + WIN32;_WINDOWS;NDEBUG;_AFXEXT;_CRT_SECURE_NO_DEPRECATE;LIBICTRANSLATE_EXPORTS;_BIND_TO_CURRENT_VCLIBS_VERSION=1;TESTING;%(PreprocessorDefinitions) + MultiThreadedDLL + true + Use + $(IntDir)$(TargetName)_vs90.pdb + Level4 + true + ProgramDatabase + true + ..\..\ext\gmock\include + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + $(IntDir);%(AdditionalIncludeDirectories) + + + "$(OutDir)" + true + Windows + true + true + MachineX86 + gmock32.lib + + + cd "$(TargetDir)" + +if "$(PlatformName)" EQU "x64" goto x64 + +if "$(Configuration)" EQU "Testing Release" goto x32rel + +:x32dbg +"$(SolutionDir)tools\test_runner32.exe" "$(TargetPath)" +goto end + +:x32rel +"$(SolutionDir)tools\test_runner32.exe" "$(TargetPath)" +goto end + +:x64 +if "$(Configuration)" EQU "Testing Release" goto x64rel + +:x64dbg +"$(SolutionDir)tools\test_runner64.exe" "$(TargetPath)" +goto end + +:x64rel +"$(SolutionDir)tools\test_runner64.exe" "$(TargetPath)" +goto end + +:end + + + NDEBUG;%(PreprocessorDefinitions) @@ -220,37 +492,131 @@ $(IntDir);%(AdditionalIncludeDirectories) - $(OutDir);%(AdditionalLibraryDirectories) + "$(OutDir)" true Windows true true MachineX64 + + + NDEBUG;%(PreprocessorDefinitions) + false + X64 + + + MaxSpeed + true + WIN32;_WINDOWS;NDEBUG;_AFXEXT;_CRT_SECURE_NO_DEPRECATE;LIBICTRANSLATE_EXPORTS;_BIND_TO_CURRENT_VCLIBS_VERSION=1;TESTING;%(PreprocessorDefinitions) + MultiThreadedDLL + true + Use + $(IntDir)$(TargetName)_vs90.pdb + Level4 + true + ProgramDatabase + true + ..\..\ext\gmock\include + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + $(IntDir);%(AdditionalIncludeDirectories) + + + "$(OutDir)" + true + Windows + true + true + MachineX64 + gmock64.lib + + + cd "$(TargetDir)" + +if "$(PlatformName)" EQU "x64" goto x64 + +if "$(Configuration)" EQU "Testing Release" goto x32rel + +:x32dbg +"$(SolutionDir)tools\test_runner32.exe" "$(TargetPath)" +goto end + +:x32rel +"$(SolutionDir)tools\test_runner32.exe" "$(TargetPath)" +goto end + +:x64 +if "$(Configuration)" EQU "Testing Release" goto x64rel + +:x64dbg +"$(SolutionDir)tools\test_runner64.exe" "$(TargetPath)" +goto end + +:x64rel +"$(SolutionDir)tools\test_runner64.exe" "$(TargetPath)" +goto end + +:end + + + + + true + true + true + true + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + + + false + false + + false + false + + false + false + + false + false Create + Create Create + Create Create + Create Create + Create Index: src/libictranslate/libictranslate.vc120.vcxproj.filters =================================================================== diff -u -rf5fa714118429e492390790c38327e05873a6da3 -rac09bb9e4f4e16697b912a86411fafc4f3d795c8 --- src/libictranslate/libictranslate.vc120.vcxproj.filters (.../libictranslate.vc120.vcxproj.filters) (revision f5fa714118429e492390790c38327e05873a6da3) +++ src/libictranslate/libictranslate.vc120.vcxproj.filters (.../libictranslate.vc120.vcxproj.filters) (revision ac09bb9e4f4e16697b912a86411fafc4f3d795c8) @@ -13,6 +13,9 @@ {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + {5f24c877-aafc-40b9-b4c5-a80951ace0df} + @@ -30,6 +33,9 @@ Source Files + + Tests +