diff options
author | Ivo Hinkelmann <ihi@openoffice.org> | 2011-04-04 13:20:41 +0200 |
---|---|---|
committer | Ivo Hinkelmann <ihi@openoffice.org> | 2011-04-04 13:20:41 +0200 |
commit | e05b91d143ef336b6d57bc188f726f74a3a2d8cd (patch) | |
tree | c2fda1e3829d600d04dd287c689546c856ea7e55 | |
parent | 92402b65a0cf560174a73eadb1044562d197d13f (diff) | |
parent | 6b96269d945701ffaf0a07aa6d7c3e14d009050f (diff) |
masterfix DEV300: #i10000# fixed includesooo/DEV300_m106
-rw-r--r-- | svtools/Library_svt.mk | 1 | ||||
-rw-r--r-- | svtools/source/filter/jpeg/jpeg.cxx | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk index f1c5dfef15..c7dab0f177 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 578d9500ec..d3fe7cc852 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 |