summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/cdgl.mak4
-rw-r--r--src/ftgl/FTVectoriser.cpp2
-rw-r--r--src/pdflib/pdcore/pc_file.c4
-rw-r--r--src/pdflib/pdflib/p_params.c6
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;