2011-12-08 09:06:04 -06:00
|
|
|
--- misc/libcdr-0.0.0/src/lib/libcdr_utils.h
|
|
|
|
|
+++ misc/build/libcdr-0.0.0/src/lib/libcdr_utils.h
|
|
|
|
|
@@ -41,17 +41,8 @@
|
|
|
|
|
|
|
|
|
|
#else
|
|
|
|
|
|
|
|
|
|
-#ifdef HAVE_CONFIG_H
|
|
|
|
|
-#include <config.h>
|
|
|
|
|
-#endif
|
|
|
|
|
-
|
|
|
|
|
-#ifdef HAVE_STDINT_H
|
|
|
|
|
#include <stdint.h>
|
|
|
|
|
-#endif
|
|
|
|
|
-
|
|
|
|
|
-#ifdef HAVE_INTTYPES_H
|
|
|
|
|
#include <inttypes.h>
|
|
|
|
|
-#endif
|
|
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
|
2011-12-08 15:52:26 -06:00
|
|
|
--- 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 \
|
|
|
|
|
|
