diff options
| author | bjarni <bjarni@openttd.org> | 2004-12-01 11:50:20 +0000 |
|---|---|---|
| committer | bjarni <bjarni@openttd.org> | 2004-12-01 11:50:20 +0000 |
| commit | 2fc6077a68f9f6e979656f93dcd298dd63627ed8 (patch) | |
| tree | bc428b3daabadd9c9a7121ad4d95a88e9931f658 | |
| parent | ec7586dac3a7143219de31e507876f9cc67ef652 (diff) | |
| download | openttd-2fc6077a68f9f6e979656f93dcd298dd63627ed8.tar.xz | |
(svn r862) Cygwin: libdetection now sets the flags properly if no Makefile.config is found
Cygwin: workaround: libpng is automatically not used even if present until the Cygwin/libpng problem is solved
| -rw-r--r-- | makefiledir/Makefile.libdetection | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/makefiledir/Makefile.libdetection b/makefiledir/Makefile.libdetection index 8d875b105..3f5150c44 100644 --- a/makefiledir/Makefile.libdetection +++ b/makefiledir/Makefile.libdetection @@ -6,6 +6,8 @@ ifndef UNIX WIN32:=1
CYGWIN:=1
MINGW:=1
+STATIC:=1
+SKIP_STATIC_CHECK:=1
endif
else
UNIX:=1
@@ -98,3 +100,9 @@ endif endif
endif
endif
+
+# workaround
+# cygwin have problems with libpng, so we will just disable it for now until the problem is solved
+ifdef CYGWIN
+WITH_PNG:=
+endif
\ No newline at end of file |