summaryrefslogtreecommitdiff
path: root/svtools
diff options
context:
space:
mode:
authorka <kai.ahrens@oracle.com>2011-04-01 17:25:01 +0200
committerka <kai.ahrens@oracle.com>2011-04-01 17:25:01 +0200
commit0fb5462f69e7b5e44ac8abb1cba1a2115676494f (patch)
treeb210afbf48d60cadc69b95c841f4aa2b69634fb2 /svtools
parente0cfe0f0fbd36782e98a93ed62f897422d2d17e8 (diff)
ooo340libs: needed patch changes for external libraries/using external/jpeg*.h again
Diffstat (limited to 'svtools')
-rw-r--r--svtools/Library_svt.mk1
-rw-r--r--svtools/source/filter/jpeg/jpeg.cxx4
2 files changed, 3 insertions, 2 deletions
diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk
index f1c5dfef1590..c7dab0f17746 100644
--- a/svtools/Library_svt.mk
+++ b/svtools/Library_svt.mk
@@ -34,6 +34,7 @@ $(eval $(call gb_Library_add_precompiled_header,svt,$(SRCDIR)/svtools/inc/pch/pr
$(eval $(call gb_Library_set_componentfile,svt,svtools/util/svt))
$(eval $(call gb_Library_set_include,svt,\
+ -I$(OUTDIR)/inc/external/jpeg \
$$(INCLUDE) \
-I$(WORKDIR)/inc/svtools \
-I$(WORKDIR)/inc/ \
diff --git a/svtools/source/filter/jpeg/jpeg.cxx b/svtools/source/filter/jpeg/jpeg.cxx
index 6f157a248ddc..2f43b1b025f3 100644
--- a/svtools/source/filter/jpeg/jpeg.cxx
+++ b/svtools/source/filter/jpeg/jpeg.cxx
@@ -34,8 +34,8 @@ extern "C"
{
#include "stdio.h"
#include "jpeg.h"
- #include "jpeg/jpeglib.h"
- #include "jpeg/jerror.h"
+ #include "jpeglib.h"
+ #include "jerror.h"
}
#define _JPEGPRIVATE