visual studio compiles but doesn't link

3 files changed, 28 insertions, 12 deletions

diff --git a/contrib/other-builds/kenlm.vcxproj b/contrib/other-builds/kenlm.vcxproj
index 763dea787..d538d5560 100755
--- a/contrib/other-builds/kenlm.vcxproj
+++ b/contrib/other-builds/kenlm.vcxproj
@@ -28,14 +28,12 @@
     <None Include="..\..\lm\max_order.hh" />

     <None Include="..\..\lm\model.hh" />

     <None Include="..\..\lm\model_type.hh" />

-    <None Include="..\..\lm\ngram_query.hh" />

     <None Include="..\..\lm\quantize.hh" />

     <None Include="..\..\lm\README" />

     <None Include="..\..\lm\read_arpa.hh" />

     <None Include="..\..\lm\return.hh" />

     <None Include="..\..\lm\search_hashed.hh" />

     <None Include="..\..\lm\search_trie.hh" />

-    <None Include="..\..\lm\state.hh" />

     <None Include="..\..\lm\test.arpa" />

     <None Include="..\..\lm\test.sh" />

     <None Include="..\..\lm\test_nounk.arpa" />

@@ -49,6 +47,8 @@
     <None Include="..\..\lm\word_index.hh" />

     <None Include="..\..\util\bit_packing.hh" />

     <None Include="..\..\util\check.hh" />

+    <None Include="..\..\util\COPYING" />

+    <None Include="..\..\util\COPYING.LESSER" />

     <None Include="..\..\util\ersatz_progress.hh" />

     <None Include="..\..\util\exception.hh" />

     <None Include="..\..\util\file.hh" />

@@ -68,7 +68,6 @@
     <None Include="..\..\util\sorted_uniform.hh" />

     <None Include="..\..\util\string_piece.hh" />

     <None Include="..\..\util\tokenize_piece.hh" />

-    <None Include="..\..\util\usage.hh" />

   </ItemGroup>

   <ItemGroup>

     <ClCompile Include="..\..\lm\bhiksha.cc" />

@@ -78,7 +77,6 @@
     <ClCompile Include="..\..\lm\left_test.cc" />

     <ClCompile Include="..\..\lm\lm_exception.cc" />

     <ClCompile Include="..\..\lm\model.cc" />

-    <ClCompile Include="..\..\lm\model_test.cc" />

     <ClCompile Include="..\..\lm\ngram_query.cc" />

     <ClCompile Include="..\..\lm\quantize.cc" />

     <ClCompile Include="..\..\lm\read_arpa.cc" />

@@ -97,7 +95,6 @@
     <ClCompile Include="..\..\util\getopt.c" />

     <ClCompile Include="..\..\util\mmap.cc" />

     <ClCompile Include="..\..\util\murmur_hash.cc" />

-    <ClCompile Include="..\..\util\usage.cc" />

   </ItemGroup>

   <PropertyGroup Label="Globals">

     <ProjectGuid>{A5402E0B-6ED7-465C-9669-E4124A0CDDCB}</ProjectGuid>

diff --git a/contrib/other-builds/moses-cmd.vcxproj b/contrib/other-builds/moses-cmd.vcxproj
index ed69f3799..8718a41db 100644
--- a/contrib/other-builds/moses-cmd.vcxproj
+++ b/contrib/other-builds/moses-cmd.vcxproj
@@ -43,12 +43,14 @@
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>

     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>

     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>

+    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">C:\Program Files\boost\boost_1_47\lib;$(LibraryPath)</LibraryPath>

+    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">C:\Program Files\boost\boost_1_47\lib;$(LibraryPath)</LibraryPath>

   </PropertyGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

     <ClCompile>

       <Optimization>Disabled</Optimization>

       <AdditionalIncludeDirectories>C:\Program Files\boost\boost_1_47;$(SolutionDir)/../../moses/src;$(SolutionDir)/../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>WITH_THREADS;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <MinimalRebuild>true</MinimalRebuild>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

@@ -58,7 +60,7 @@
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

     </ClCompile>

     <Link>

-      <AdditionalDependencies>C:\GnuWin32\lib\zlib.lib;$(SolutionDir)$(Configuration)\moses.lib;$(SolutionDir)$(Configuration)\kenlm.lib;$(SolutionDir)$(Configuration)\OnDiskPt.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <AdditionalDependencies>zdll.lib;$(SolutionDir)$(Configuration)\moses.lib;$(SolutionDir)$(Configuration)\kenlm.lib;$(SolutionDir)$(Configuration)\OnDiskPt.lib;%(AdditionalDependencies)</AdditionalDependencies>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <SubSystem>Console</SubSystem>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

@@ -70,7 +72,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

     <ClCompile>

       <AdditionalIncludeDirectories>C:\Program Files\boost\boost_1_47;$(SolutionDir)/../../moses/src;$(SolutionDir)/../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>WITH_THREADS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

       <PrecompiledHeader>

       </PrecompiledHeader>

@@ -78,7 +80,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

     </ClCompile>

     <Link>

-      <AdditionalDependencies>C:\GnuWin32\lib\zlib.lib;$(SolutionDir)$(Configuration)\moses.lib;$(SolutionDir)$(Configuration)\kenlm.lib;$(SolutionDir)$(Configuration)\OnDiskPt.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <AdditionalDependencies>zdll.lib;$(SolutionDir)$(Configuration)\moses.lib;$(SolutionDir)$(Configuration)\kenlm.lib;$(SolutionDir)$(Configuration)\OnDiskPt.lib;%(AdditionalDependencies)</AdditionalDependencies>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <SubSystem>Console</SubSystem>

       <OptimizeReferences>true</OptimizeReferences>

diff --git a/contrib/other-builds/moses.vcxproj b/contrib/other-builds/moses.vcxproj
index ca840cab4..e4eb6e258 100644
--- a/contrib/other-builds/moses.vcxproj
+++ b/contrib/other-builds/moses.vcxproj
@@ -22,7 +22,6 @@
     <ClInclude Include="..\..\moses\src\ChartHypothesis.h" />

     <ClInclude Include="..\..\moses\src\ChartHypothesisCollection.h" />

     <ClInclude Include="..\..\moses\src\ChartManager.h" />

-    <ClInclude Include="..\..\moses\src\ChartRuleLookupManager.h" />

     <ClInclude Include="..\..\moses\src\ChartTranslationOption.h" />

     <ClInclude Include="..\..\moses\src\ChartTranslationOptionCollection.h" />

     <ClInclude Include="..\..\moses\src\ChartTranslationOptionList.h" />

@@ -32,6 +31,12 @@
     <ClInclude Include="..\..\moses\src\ChartTrellisPath.h" />

     <ClInclude Include="..\..\moses\src\ChartTrellisPathList.h" />

     <ClInclude Include="..\..\moses\src\ConfusionNet.h" />

+    <ClInclude Include="..\..\moses\src\CYKPlusParser\ChartRuleLookupManagerCYKPlus.h" />

+    <ClInclude Include="..\..\moses\src\CYKPlusParser\ChartRuleLookupManagerMemory.h" />

+    <ClInclude Include="..\..\moses\src\CYKPlusParser\ChartRuleLookupManagerOnDisk.h" />

+    <ClInclude Include="..\..\moses\src\CYKPlusParser\DotChart.h" />

+    <ClInclude Include="..\..\moses\src\CYKPlusParser\DotChartInMemory.h" />

+    <ClInclude Include="..\..\moses\src\CYKPlusParser\DotChartOnDisk.h" />

     <ClInclude Include="..\..\moses\src\DecodeFeature.h" />

     <ClInclude Include="..\..\moses\src\DecodeGraph.h" />

     <ClInclude Include="..\..\moses\src\DecodeStep.h" />

@@ -39,6 +44,11 @@
     <ClInclude Include="..\..\moses\src\DecodeStepTranslation.h" />

     <ClInclude Include="..\..\moses\src\Dictionary.h" />

     <ClInclude Include="..\..\moses\src\DummyScoreProducers.h" />

+    <ClInclude Include="..\..\moses\src\DynSAInclude\file.h" />

+    <ClInclude Include="..\..\moses\src\DynSAInclude\FileHandler.h" />

+    <ClInclude Include="..\..\moses\src\DynSAInclude\onlineRLM.h" />

+    <ClInclude Include="..\..\moses\src\DynSAInclude\quantizer.h" />

+    <ClInclude Include="..\..\moses\src\DynSAInclude\vocab.h" />

     <ClInclude Include="..\..\moses\src\DynSuffixArray.h" />

     <ClInclude Include="..\..\moses\src\Factor.h" />

     <ClInclude Include="..\..\moses\src\FactorCollection.h" />

@@ -166,6 +176,11 @@
     <ClCompile Include="..\..\moses\src\ChartTrellisNode.cpp" />

     <ClCompile Include="..\..\moses\src\ChartTrellisPath.cpp" />

     <ClCompile Include="..\..\moses\src\ConfusionNet.cpp" />

+    <ClCompile Include="..\..\moses\src\CYKPlusParser\ChartRuleLookupManagerCYKPlus.cpp" />

+    <ClCompile Include="..\..\moses\src\CYKPlusParser\ChartRuleLookupManagerMemory.cpp" />

+    <ClCompile Include="..\..\moses\src\CYKPlusParser\ChartRuleLookupManagerOnDisk.cpp" />

+    <ClCompile Include="..\..\moses\src\CYKPlusParser\DotChartInMemory.cpp" />

+    <ClCompile Include="..\..\moses\src\CYKPlusParser\DotChartOnDisk.cpp" />

     <ClCompile Include="..\..\moses\src\DecodeFeature.cpp" />

     <ClCompile Include="..\..\moses\src\DecodeGraph.cpp" />

     <ClCompile Include="..\..\moses\src\DecodeStep.cpp" />

@@ -173,6 +188,8 @@
     <ClCompile Include="..\..\moses\src\DecodeStepTranslation.cpp" />

     <ClCompile Include="..\..\moses\src\Dictionary.cpp" />

     <ClCompile Include="..\..\moses\src\DummyScoreProducers.cpp" />

+    <ClCompile Include="..\..\moses\src\DynSAInclude\FileHandler.cpp" />

+    <ClCompile Include="..\..\moses\src\DynSAInclude\vocab.cpp" />

     <ClCompile Include="..\..\moses\src\DynSuffixArray.cpp" />

     <ClCompile Include="..\..\moses\src\Factor.cpp" />

     <ClCompile Include="..\..\moses\src\FactorCollection.cpp" />

@@ -309,7 +326,7 @@
     <ClCompile>

       <Optimization>Disabled</Optimization>

       <AdditionalIncludeDirectories>C:\Users\mike\workspace\mosesdecoder\lm\msinttypes;C:\Program Files\boost\boost_1_47;$(SolutionDir)/../../moses/src;$(SolutionDir)/../../;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>NO_PIPES;WIN32;_DEBUG;_CONSOLE;TRACE_ENABLE;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>WITH_THREADS;NO_PIPES;WIN32;_DEBUG;_CONSOLE;TRACE_ENABLE;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <MinimalRebuild>true</MinimalRebuild>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

@@ -328,7 +345,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>

       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>

       <AdditionalIncludeDirectories>C:\Users\mike\workspace\mosesdecoder\lm\msinttypes;C:\Program Files\boost\boost_1_47;$(SolutionDir)/../../moses/src;$(SolutionDir)/../../;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>NO_PIPES;WIN32;NDEBUG;_CONSOLE;LM_INTERNAL;TRACE_ENABLE;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>WITH_THREADS;NO_PIPES;WIN32;NDEBUG;_CONSOLE;LM_INTERNAL;TRACE_ENABLE;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

       <PrecompiledHeader>

       </PrecompiledHeader>