diff options
| author | Tor Lillqvist <tlillqvist@suse.com> | 2011-12-08 23:52:26 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2011-12-08 23:52:26 +0200 |
| commit | 03a8c54cfc12222c0614fb5099d287777e17a88b (patch) | |
| tree | 653b38d9c3cc8ce645ae177cbca3ae9b6fac1037 /libcdr | |
| parent | 8b8dfa253646356d8915bc10be1b8ce83002f0df (diff) | |
Fix build with internal zlib
Diffstat (limited to 'libcdr')
| -rw-r--r-- | libcdr/libcdr-0.0.0.patch | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/libcdr/libcdr-0.0.0.patch b/libcdr/libcdr-0.0.0.patch index 8016fec9328a..325874087169 100644 --- a/libcdr/libcdr-0.0.0.patch +++ b/libcdr/libcdr-0.0.0.patch @@ -18,3 +18,17 @@ #endif +--- misc/libcdr-0.0.0/src/lib/makefile.mk ++++ misc/build/libcdr-0.0.0/src/lib/makefile.mk +@@ -28,6 +28,10 @@ + INCPRE+=$(SOLARVER)$/$(INPATH)$/inc$/libwpg + .ENDIF + ++.IF "$(SYSTEM_ZLIB)" != "YES" ++INCPRE+=-I$(SOLARVER)$/$(INPATH)$/inc$/external/zlib ++.ENDIF ++ + SLOFILES= \ + $(SLO)$/CDRDocument.obj \ + $(SLO)$/CDRInternalStream.obj \ + |