Skip to content

Commit

Permalink
zlib and foma again
Browse files Browse the repository at this point in the history
  • Loading branch information
Lluís Padró committed Apr 18, 2016
1 parent 13dc799 commit 47da64d
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 10 deletions.
4 changes: 3 additions & 1 deletion msvc/13.0/libfreeling/libfreeling.vcxproj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Release|Win32">
Expand Down Expand Up @@ -68,9 +68,11 @@
<ClCompile Include="..\..\..\src\libfreeling\database.cc" />
<ClCompile Include="..\..\..\src\libfreeling\dates\dates.cc" />
<ClCompile Include="..\..\..\src\libfreeling\dates\dates_ca.cc" />
<ClCompile Include="..\..\..\src\libfreeling\dates\dates_de.cc" />
<ClCompile Include="..\..\..\src\libfreeling\dates\dates_default.cc" />
<ClCompile Include="..\..\..\src\libfreeling\dates\dates_en.cc" />
<ClCompile Include="..\..\..\src\libfreeling\dates\dates_es.cc" />
<ClCompile Include="..\..\..\src\libfreeling\dates\dates_fr.cc" />
<ClCompile Include="..\..\..\src\libfreeling\dates\dates_gl.cc" />
<ClCompile Include="..\..\..\src\libfreeling\dates\dates_pt.cc" />
<ClCompile Include="..\..\..\src\libfreeling\dates\dates_ru.cc" />
Expand Down
17 changes: 9 additions & 8 deletions msvc/README
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ This folder contains information about how to install FreeLing on MS-Windows.

Here you'll find information about:

OPTION (A). Install FreeLing from a binary package.
OPTION (A). Install FreeLing on Windows from a binary package.

Use this option if you only want to use FreeLing as an out-of-the-box analyzer
or as an external library.

OPTION (B). Compile FreeLing with Visual Studio 2013.
OPTION (B). Compile FreeLing on Windows with Visual Studio 2013.

Use this option if you need to compile FreeLing (e.g. because you want to
tune the code to alter its behaviour, or because your architecture or OS
Expand Down Expand Up @@ -100,11 +100,11 @@ FINAL SYSTEM CONFIGURATION
If you want to use it as an external library to compile your own programs calling
FreeLing, you will also need to adjust your %PATH% environment variable to include
folders where freeling binaries and libraries are installed, i.e.:
mysrc\freeling_win\bin
mysrc\freeling_win\lib
mysrc\freeling_win_libraries\boost\lib
mysrc\freeling_win_libraries\icu\lib
mysrc\freeling_win_libraries\zlib\lib
freeling\bin
freeling\lib
freeling\dependencies\boost\lib
freeling\dependencies\icu\lib
freeling\dependencies\zlib\lib

To add these folders to your %PATH%, do
press WindowsKey+X
Expand All @@ -113,4 +113,5 @@ FINAL SYSTEM CONFIGURATION
-> click "environment variables"
-> Edit "PATH" and add the required folders.

(Note that this sequence of actions may slightly differ in your windows version)
(Note that this sequence of actions may slightly differ depending on in
your windows version)
2 changes: 1 addition & 1 deletion src/libfoma/foma/fomalib.h
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ extern "C" {
#endif

/* deal with newer API for zlib */
#if ZLIB_VERNUM < 0x1252
#if ZLIB_VERNUM < 0x1250
#define gzFile gzFile*
#endif

Expand Down

0 comments on commit 47da64d

Please sign in to comment.