diff options
| author | scuri <scuri> | 2010-11-10 02:55:48 +0000 |
|---|---|---|
| committer | scuri <scuri> | 2010-11-10 02:55:48 +0000 |
| commit | 324769ed96e0f952fb23fe36e8660e6a2e70f2e0 (patch) | |
| tree | 18e13e4d66c3298011824548887ea132ff2111b8 | |
| parent | 7e2276df97825b54bfec1414c22beeb8e6b1f9eb (diff) | |
*** empty log message ***
| -rw-r--r-- | src/cdgl.mak | 4 | ||||
| -rw-r--r-- | src/ftgl/FTVectoriser.cpp | 2 | ||||
| -rw-r--r-- | src/pdflib/pdcore/pc_file.c | 4 | ||||
| -rw-r--r-- | src/pdflib/pdflib/p_params.c | 6 |
4 files changed, 10 insertions, 6 deletions
diff --git a/src/cdgl.mak b/src/cdgl.mak index 6f63fa7..77f62f6 100644 --- a/src/cdgl.mak +++ b/src/cdgl.mak @@ -37,3 +37,7 @@ ifneq ($(findstring MacOS, $(TEC_UNAME)), ) BUILD_DYLIB=Yes endif endif + +ifneq ($(findstring cygw, $(TEC_UNAME)), ) + LIBS += iconv fontconfig +endif diff --git a/src/ftgl/FTVectoriser.cpp b/src/ftgl/FTVectoriser.cpp index ea5c571..3ac0840 100644 --- a/src/ftgl/FTVectoriser.cpp +++ b/src/ftgl/FTVectoriser.cpp @@ -36,7 +36,7 @@ #if defined __APPLE_CC__ && __APPLE_CC__ < 5465 typedef GLvoid (*GLUTesselatorFunction) (...); -#elif defined WIN32 && !defined __CYGWIN__ +#elif (defined WIN32 && !defined __CYGWIN__) || (defined __CYGWIN__ && defined USE_OPENGL32) typedef GLvoid (CALLBACK *GLUTesselatorFunction) (); #else typedef GLvoid (*GLUTesselatorFunction) (); diff --git a/src/pdflib/pdcore/pc_file.c b/src/pdflib/pdcore/pc_file.c index 42a7a02..1fb014b 100644 --- a/src/pdflib/pdcore/pc_file.c +++ b/src/pdflib/pdcore/pc_file.c @@ -10,7 +10,7 @@ | | *---------------------------------------------------------------------------*/ -/* $Id: pc_file.c,v 1.3 2010/01/27 02:27:21 scuri Exp $ +/* $Id: pc_file.c,v 1.4 2010/11/10 02:55:49 scuri Exp $ * * Various file routines * @@ -53,7 +53,7 @@ #include <ssdef.h> #endif -#if defined(WIN32) && !defined(__BORLANDC__) +#if defined(WIN32) && !defined(__BORLANDC__) && !defined(__CYGWIN__) #ifndef _IOB_ENTRIES #define _IOB_ENTRIES 20 diff --git a/src/pdflib/pdflib/p_params.c b/src/pdflib/pdflib/p_params.c index efe2c87..4a41603 100644 --- a/src/pdflib/pdflib/p_params.c +++ b/src/pdflib/pdflib/p_params.c @@ -10,7 +10,7 @@ | | *---------------------------------------------------------------------------*/ -/* $Id: p_params.c,v 1.2 2009/10/20 18:14:16 scuri Exp $ +/* $Id: p_params.c,v 1.3 2010/11/10 02:55:49 scuri Exp $ * * PDFlib parameter handling * @@ -578,7 +578,7 @@ pdf__set_value(PDF *p, const char *key, double value) switch (i) { -#if defined(WIN32) && !defined(__BORLANDC__) +#if defined(WIN32) && !defined(__BORLANDC__) && !defined(__CYGWIN__) case PDF_PARAMETER_MAXFILEHANDLES: ivalue = pdc_set_maxfilehandles(p->pdc, ivalue); if (ivalue == -1) @@ -847,7 +847,7 @@ pdf__get_value(PDF *p, const char *key, double mod) switch (i) { -#if defined(WIN32) && !defined(__BORLANDC__) +#if defined(WIN32) && !defined(__BORLANDC__) && !defined(__CYGWIN__) case PDF_PARAMETER_MAXFILEHANDLES: result = (double) pdc_get_maxfilehandles(); break; |