[Libreoffice-commits] .: 3 commits - vcl/AllLangResTarget_vcl.mk vcl/Library_desktop_detector.mk vcl/Library_vcl.mk vcl/Library_vclplug_gen.mk vcl/Library_vclplug_gtk.mk vcl/Library_vclplug_kde4.mk vcl/Library_vclplug_kde.mk vcl/Library_vclplug_svp.mk vcl/StaticLibrary_vclmain.mk vcl/win vcl/WinResTarget_vcl.mk
Tor Lillqvist
tml at kemper.freedesktop.org
Sat May 28 13:25:54 PDT 2011
vcl/AllLangResTarget_vcl.mk | 2 +-
vcl/Library_desktop_detector.mk | 4 ++--
vcl/Library_vcl.mk | 13 +++----------
vcl/StaticLibrary_vclmain.mk | 4 ++--
vcl/WinResTarget_vcl.mk | 2 +-
vcl/win/source/app/saldata.cxx | 1 -
vcl/win/source/app/salshl.cxx | 1 -
vcl/win/source/gdi/salgdi2.cxx | 2 +-
vcl/win/source/gdi/salgdi3.cxx | 4 ----
vcl/win/source/gdi/salprn.cxx | 2 +-
vcl/win/source/gdi/winlayout.cxx | 2 --
vcl/win/source/window/salframe.cxx | 1 +
vcl/win/source/window/salobj.cxx | 1 -
13 files changed, 12 insertions(+), 27 deletions(-)
New commits:
commit e4c6e763921ad5d0bf6cbbbd6f2519e7079c94f1
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Sat May 28 23:24:22 2011 +0300
Fix compilation errors on Windows, linking errors remain
diff --git a/vcl/win/source/app/saldata.cxx b/vcl/win/source/app/saldata.cxx
index f83d89f..be847d0 100755
--- a/vcl/win/source/app/saldata.cxx
+++ b/vcl/win/source/app/saldata.cxx
@@ -29,7 +29,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_vcl.hxx"
#include <svsys.h>
-#include "tools/svwin.h"
#include "rtl/tencinfo.h"
#include "vcl/svapp.hxx"
diff --git a/vcl/win/source/app/salshl.cxx b/vcl/win/source/app/salshl.cxx
index b7d3d3e..f5f5a3f 100755
--- a/vcl/win/source/app/salshl.cxx
+++ b/vcl/win/source/app/salshl.cxx
@@ -31,7 +31,6 @@
#include <svsys.h>
#include <tools/debug.hxx>
-#include <tools/svwin.h>
#include <win/saldata.hxx>
// =======================================================================
diff --git a/vcl/win/source/gdi/salgdi2.cxx b/vcl/win/source/gdi/salgdi2.cxx
index 04a7d50..ff939a4 100644
--- a/vcl/win/source/gdi/salgdi2.cxx
+++ b/vcl/win/source/gdi/salgdi2.cxx
@@ -44,7 +44,7 @@
#include "vcl/salbtype.hxx"
#include "vcl/bmpacc.hxx"
-#include "vcl/outdata.hxx"
+#include "outdata.hxx"
bool WinSalGraphics::supportsOperation( OutDevSupportType eType ) const
{
diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx
index 3e74649..4f7b6ad 100644
--- a/vcl/win/source/gdi/salgdi3.cxx
+++ b/vcl/win/source/gdi/salgdi3.cxx
@@ -59,10 +59,6 @@
#include "tools/debug.hxx"
#include "tools/stream.hxx"
-#include <tools/prewin.h>
-#include <windows.h>
-#include <tools/postwin.h>
-
#include <vcl/sysdata.hxx>
#include "win/wincomp.hxx"
diff --git a/vcl/win/source/gdi/salprn.cxx b/vcl/win/source/gdi/salprn.cxx
index 74667c7..8a541ae 100644
--- a/vcl/win/source/gdi/salprn.cxx
+++ b/vcl/win/source/gdi/salprn.cxx
@@ -38,7 +38,7 @@
#include <osl/module.h>
#include <tools/urlobj.hxx>
-#include <tools/svwin.h>
+
#ifdef __MINGW32__
#include <excpt.h>
#endif
diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx
index 84ba52f..2b12352 100644
--- a/vcl/win/source/gdi/winlayout.cxx
+++ b/vcl/win/source/gdi/winlayout.cxx
@@ -35,8 +35,6 @@
#include "osl/module.h"
#include "osl/file.h"
-#include "tools/svwin.h"
-
#include "vcl/svapp.hxx"
#include "win/salgdi.h"
diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx
index 17bb32f..3dbeeac 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -70,6 +70,7 @@
// Warning in SDK header
#if defined(_MSC_VER) && (_MSC_VER > 1400)
#pragma warning( disable: 4242 4244 )
+#endif
#include <win/wincomp.hxx>
#include <win/salids.hrc>
#include <win/saldata.hxx>
diff --git a/vcl/win/source/window/salobj.cxx b/vcl/win/source/window/salobj.cxx
index cd4d658..552b060 100755
--- a/vcl/win/source/window/salobj.cxx
+++ b/vcl/win/source/window/salobj.cxx
@@ -33,7 +33,6 @@
#include <svsys.h>
#include <tools/debug.hxx>
-#include <tools/svwin.h>
#include <vcl/svapp.hxx>
commit 2aa2747c5cea438a171068c17719f8af0038e1d6
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Sat May 28 22:38:56 2011 +0300
chmod -x
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
old mode 100755
new mode 100644
diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk
old mode 100755
new mode 100644
diff --git a/vcl/Library_vclplug_gtk.mk b/vcl/Library_vclplug_gtk.mk
old mode 100755
new mode 100644
diff --git a/vcl/Library_vclplug_kde.mk b/vcl/Library_vclplug_kde.mk
old mode 100755
new mode 100644
diff --git a/vcl/Library_vclplug_kde4.mk b/vcl/Library_vclplug_kde4.mk
old mode 100755
new mode 100644
diff --git a/vcl/Library_vclplug_svp.mk b/vcl/Library_vclplug_svp.mk
old mode 100755
new mode 100644
diff --git a/vcl/StaticLibrary_vclmain.mk b/vcl/StaticLibrary_vclmain.mk
old mode 100755
new mode 100644
diff --git a/vcl/WinResTarget_vcl.mk b/vcl/WinResTarget_vcl.mk
old mode 100755
new mode 100644
commit 8f038beebe478ef1caf92a2f7c2b3ffa518de4ac
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Sat May 28 22:38:33 2011 +0300
Attempt to fix vcl build on Windows
diff --git a/vcl/AllLangResTarget_vcl.mk b/vcl/AllLangResTarget_vcl.mk
index 9a3453a..307f8ae 100644
--- a/vcl/AllLangResTarget_vcl.mk
+++ b/vcl/AllLangResTarget_vcl.mk
@@ -37,7 +37,7 @@ $(eval $(call gb_SrsTarget_SrsTarget,vcl/source/src))
$(eval $(call gb_SrsTarget_set_include,vcl/source/src,\
$$(INCLUDE) \
- -I$(SRCDIR)/vcl/inc \
+ -I$(realpath $(SRCDIR)/vcl/inc) \
))
$(eval $(call gb_SrsTarget_add_files,vcl/source/src,\
diff --git a/vcl/Library_desktop_detector.mk b/vcl/Library_desktop_detector.mk
index 7963b1c..c36f9e8 100644
--- a/vcl/Library_desktop_detector.mk
+++ b/vcl/Library_desktop_detector.mk
@@ -33,8 +33,8 @@ $(eval $(call gb_Library_add_precompiled_header,desktop_detector,$(SRCDIR)/vcl/i
$(eval $(call gb_Library_set_include,desktop_detector,\
$$(INCLUDE) \
- -I$(SRCDIR)/vcl/inc \
- -I$(SRCDIR)/vcl/inc/pch \
+ -I$(realpath $(SRCDIR)/vcl/inc) \
+ -I$(realpath $(SRCDIR)/vcl/inc/pch) \
-I$(SRCDIR)/solenv/inc \
-I$(OUTDIR)/inc/offuh \
-I$(OUTDIR)/inc \
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 44df1f0..06bd0d7 100755
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -40,12 +40,12 @@ $(eval $(call gb_Library_add_package_headers,vcl,vcl_afmhash))
$(eval $(call gb_Library_set_include,vcl,\
$$(INCLUDE) \
- -I$(SRCDIR)/vcl/inc \
- -I$(SRCDIR)/vcl/inc/pch \
+ -I$(realpath $(SRCDIR)/vcl/inc) \
+ -I$(realpath $(SRCDIR)/vcl/inc/pch) \
-I$(SRCDIR)/solenv/inc \
-I$(OUTDIR)/inc/offuh \
-I$(OUTDIR)/inc \
- -I$(WORKDIR)/CustomTarget/vcl/unx/generic/fontmanager \
+ -I$(WORKDIR)/CustomTarget/vcl/unx/generic/fontmanager \
))
ifeq ($(GUIBASE),unx)
$(eval $(call gb_Library_set_cxxflags,vcl,\
@@ -80,13 +80,6 @@ $(eval $(call gb_Library_add_linked_libs,vcl,\
$(gb_STDLIBS) \
))
-ifneq ($(ENABLE_GRAPHITE),)
-ifeq ($(OS),WNT)
-$(eval $(call gb_Library_add_linked_libs,vcl,\
- graphite_dll \
-))
-endif
-endif
ifeq ($(GUIBASE),unx)
$(eval $(call gb_Library_add_linked_libs,vcl,\
freetype \
diff --git a/vcl/StaticLibrary_vclmain.mk b/vcl/StaticLibrary_vclmain.mk
index cc38a27..044ce10 100755
--- a/vcl/StaticLibrary_vclmain.mk
+++ b/vcl/StaticLibrary_vclmain.mk
@@ -29,8 +29,8 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,vclmain))
$(eval $(call gb_StaticLibrary_set_include,vclmain,\
$$(INCLUDE) \
- -I$(SRCDIR)/vcl/inc \
- -I$(SRCDIR)/vcl/inc/pch \
+ -I$(realpath $(SRCDIR)/vcl/inc) \
+ -I$(realpath $(SRCDIR)/vcl/inc/pch) \
-I$(SRCDIR)/solenv/inc \
-I$(OUTDIR)/inc/offuh \
-I$(OUTDIR)/inc \
diff --git a/vcl/WinResTarget_vcl.mk b/vcl/WinResTarget_vcl.mk
index 68fe30c..a878f43 100755
--- a/vcl/WinResTarget_vcl.mk
+++ b/vcl/WinResTarget_vcl.mk
@@ -29,7 +29,7 @@ $(eval $(call gb_WinResTarget_WinResTarget,vcl/src))
$(eval $(call gb_WinResTarget_set_include,vcl/src,\
$$(INCLUDE) \
- -I$(SRCDIR)/vcl/inc \
+ -I$(realpath $(SRCDIR)/vcl/inc) \
))
$(eval $(call gb_WinResTarget_add_file,vcl/src,\
More information about the Libreoffice-commits
mailing list