diff options
| author | Barry Haddow <barry.haddow@gmail.com> | 2011-11-11 12:25:13 +0400 |
|---|---|---|
| committer | Barry Haddow <barry.haddow@gmail.com> | 2011-11-11 12:25:13 +0400 |
| commit | 6890472ba11b5b267bbebcff51bc5d6bff3d31ad (patch) | |
| tree | 6aa6bccfc6365c7cd4097c19ac66f4efe09f8d0a /moses-chart-cmd | |
| parent | 4e20e132650036a60044dc522b3d7cebaefe5b92 (diff) | |
| parent | 0d8ec8bbd2c256b36eadcf1696593ee653a38a21 (diff) | |
Merge branch 'master' into miramerge
Conflicts:
.gitignore
config.h.in
moses/src/ChartTrellisPath.cpp
moses/src/Makefile.am
Diffstat (limited to 'moses-chart-cmd')
| -rw-r--r-- | moses-chart-cmd/moses-chart-cmd.xcodeproj/project.pbxproj | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/moses-chart-cmd/moses-chart-cmd.xcodeproj/project.pbxproj b/moses-chart-cmd/moses-chart-cmd.xcodeproj/project.pbxproj index da8f9dddb..450fd0d56 100644 --- a/moses-chart-cmd/moses-chart-cmd.xcodeproj/project.pbxproj +++ b/moses-chart-cmd/moses-chart-cmd.xcodeproj/project.pbxproj @@ -305,13 +305,13 @@ HEADER_SEARCH_PATHS = ( ../moses/src, ../kenlm, + /opt/local/include, ); INSTALL_PATH = /usr/local/bin; LIBRARY_SEARCH_PATHS = ( ../irstlm/lib, ../srilm/lib/macosx, ../kenlm, - ../randlm/lib, ); OTHER_LDFLAGS = ( "-lz", @@ -321,7 +321,6 @@ "-loolm", "-lflm", "-llattice", - "-lrandlm", ); PRODUCT_NAME = "moses-chart-cmd"; }; @@ -341,13 +340,13 @@ HEADER_SEARCH_PATHS = ( ../moses/src, ../kenlm, + /opt/local/include, ); INSTALL_PATH = /usr/local/bin; LIBRARY_SEARCH_PATHS = ( ../irstlm/lib, ../srilm/lib/macosx, ../kenlm, - ../randlm/lib, ); OTHER_LDFLAGS = ( "-lz", @@ -357,7 +356,6 @@ "-loolm", "-lflm", "-llattice", - "-lrandlm", ); PRODUCT_NAME = "moses-chart-cmd"; }; |