diff options
| author | bjarni <bjarni@openttd.org> | 2006-03-31 10:04:18 +0000 |
|---|---|---|
| committer | bjarni <bjarni@openttd.org> | 2006-03-31 10:04:18 +0000 |
| commit | 3b4b5771073555b14a47400bf1d7522fd394e8a2 (patch) | |
| tree | 96f450213a6617748595005f55ed39649e2b08f0 /Makefile | |
| parent | 20c29f10df67efcada2bd3275863848a21d5040f (diff) | |
| download | openttd-3b4b5771073555b14a47400bf1d7522fd394e8a2.tar.xz | |
(svn r4197) reentered STATIC_ZLIB_PATH (removed in 4183) since it turned out that it's used after all
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 13 |
1 files changed, 11 insertions, 2 deletions
@@ -416,8 +416,17 @@ endif # zlib config ifdef WITH_ZLIB - CDEFS += -DWITH_ZLIB - LIBS += -lz + CDEFS += -DWITH_ZLIB + ifdef STATIC + ifdef OSX + # OSX links dynamically to zlib, even in static builds since it's always present in the system + LIBS += -lz + else + LIBS += $(STATIC_ZLIB_PATH) + endif + else + LIBS += -lz + endif endif # libpng config |