Author: ydario
Date: Mon Sep 14 16:10:03 2015
New Revision: 1702986
URL: http://svn.apache.org/r1702986
Log:
#i118923# OS/2, use pmbidi header from dev toolkit.
Modified:
openoffice/trunk/main/solenv/inc/svpm.h
openoffice/trunk/main/vcl/Library_vcl.mk
openoffice/trunk/main/vcl/inc/os2/salframe.h
openoffice/trunk/main/vcl/os2/source/window/salframe.cxx
Modified: openoffice/trunk/main/solenv/inc/svpm.h
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/inc/svpm.h?rev=1702986&r1=1702985&r2=1702986&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/inc/svpm.h (original)
+++ openoffice/trunk/main/solenv/inc/svpm.h Mon Sep 14 16:10:03 2015
@@ -61,6 +61,9 @@ extern "C" {
#include <os2.h>
#include <unikbd.h>
+#ifdef VCL_OS2
+#include <pmbidi.h>
+#endif
#undef BOOL
#undef BYTE
Modified: openoffice/trunk/main/vcl/Library_vcl.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/Library_vcl.mk?rev=1702986&r1=1702985&r2=1702986&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/Library_vcl.mk (original)
+++ openoffice/trunk/main/vcl/Library_vcl.mk Mon Sep 14 16:10:03 2015
@@ -45,6 +45,12 @@ $(eval $(call gb_Library_set_include,vcl
-I$(OUTDIR)/inc \
$$(FREETYPE_CFLAGS) \
))
+ifeq ($(GUIBASE),os2)
+$(eval $(call gb_Library_set_include,vcl,\
+ $$(INCLUDE) \
+ -idirafter /@unixroot/usr/dev/toolkit452/h \
+))
+endif
ifeq ($(GUIBASE),unx)
$(eval $(call gb_Library_set_cxxflags,vcl,\
$$(CXXFLAGS) \
Modified: openoffice/trunk/main/vcl/inc/os2/salframe.h
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/inc/os2/salframe.h?rev=1702986&r1=1702985&r2=1702986&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/inc/os2/salframe.h (original)
+++ openoffice/trunk/main/vcl/inc/os2/salframe.h Mon Sep 14 16:10:03 2015
@@ -27,10 +27,6 @@
#include <vcl/sysdata.hxx>
#include <salframe.hxx>
-#ifndef PM_BIDI_INCLUDED
-#include <pmbidi.h>
-#endif
-
#ifndef __UCONV_H__
#include <uconv.h>
#endif
Modified: openoffice/trunk/main/vcl/os2/source/window/salframe.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/os2/source/window/salframe.cxx?rev=1702986&r1=1702985&r2=1702986&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/os2/source/window/salframe.cxx (original)
+++ openoffice/trunk/main/vcl/os2/source/window/salframe.cxx Mon Sep 14
16:10:03 2015
@@ -24,6 +24,7 @@
#define INCL_DOS
#define INCL_PM
#define INCL_WIN
+#define VCL_OS2
#include <svpm.h>
#include <string.h>
