diff options
| author | Barry Haddow <barry.haddow@gmail.com> | 2011-10-28 18:54:23 +0400 |
|---|---|---|
| committer | Barry Haddow <barry.haddow@gmail.com> | 2011-10-28 18:54:23 +0400 |
| commit | 90820ad0c5e0c54641518f64720179e5426cfae1 (patch) | |
| tree | 0314ac341ea724c97f2e05514d43e11c8021cc7a /moses-cmd | |
| parent | bd056a52783e78593c6beecc9f481251a85a1270 (diff) | |
| parent | 42924144fd0c247a57d669db7862be898f675416 (diff) | |
Merge branch 'master' into miramerge.
Also fix mert-moses.pl to use correct flag for specifying
weights of non-core features.
Conflicts:
.gitignore
configure.in
ltmain.sh
moses/src/LM/Factory.cpp
moses/src/LMList.cpp
moses/src/LMList.h
moses/src/LanguageModel.cpp
moses/src/LanguageModel.h
moses/src/LanguageModelKen.h
moses/src/Makefile.am
moses/src/Manager.cpp
moses/src/PhraseDictionaryMemory.cpp
moses/src/PhraseDictionaryTree.cpp
moses/src/StaticData.cpp
moses/src/TargetPhrase.h
Diffstat (limited to 'moses-cmd')
| -rw-r--r-- | moses-cmd/moses-cmd.vcxproj | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/moses-cmd/moses-cmd.vcxproj b/moses-cmd/moses-cmd.vcxproj index 4dd1a2b93..b82da9e79 100644 --- a/moses-cmd/moses-cmd.vcxproj +++ b/moses-cmd/moses-cmd.vcxproj @@ -47,7 +47,7 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../moses/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>C:\Program Files\boost\boost_1_47;$(SolutionDir)/moses/src;$(SolutionDir)/kenlm;$(SolutionDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -58,7 +58,7 @@ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
</ClCompile>
<Link>
- <AdditionalDependencies>zlib.lib;$(OutDir)moses.lib;$(OutDir)OnDiskPt.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>zlib.lib;$(SolutionDir)$(Configuration)\moses.lib;$(SolutionDir)$(Configuration)\kenlm.lib;%(AdditionalDependencies)</AdditionalDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -69,7 +69,7 @@ </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
- <AdditionalIncludeDirectories>../moses/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>C:\Program Files\boost\boost_1_47;$(SolutionDir)/moses/src;$(SolutionDir)/kenlm;$(SolutionDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<PrecompiledHeader>
@@ -78,7 +78,7 @@ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
- <AdditionalDependencies>zlib.lib;$(OutDir)moses.lib;$(OutDir)OnDiskPt.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>zlib.lib;$(SolutionDir)$(Configuration)\moses.lib;$(SolutionDir)$(Configuration)\kenlm.lib;%(AdditionalDependencies)</AdditionalDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
|