* Build activex and comobj for wince.

git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@10921 3ad0048d-3df7-0310-abae-a5850022a9f2

2 files changed, 190 insertions, 6 deletions

diff --git a/packages/winceunits/Makefile b/packages/winceunits/Makefile
index 200f6b5059..df5866dc79 100644
--- a/packages/winceunits/Makefile
+++ b/packages/winceunits/Makefile
@@ -253,20 +253,192 @@ endif
 PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
 override PACKAGE_NAME=winceunits
 override PACKAGE_VERSION=2.2.0
+WINDIR=../winunits-base/src
 ifeq ($(FULL_TARGET),i386-win32)
 override TARGET_UNITS+=rapi cesync
 endif
 ifeq ($(FULL_TARGET),i386-wince)
-override TARGET_UNITS+=buildwinceunits
+override TARGET_UNITS+=buildwinceunits comobj
 endif
 ifeq ($(FULL_TARGET),arm-wince)
-override TARGET_UNITS+=buildwinceunits
+override TARGET_UNITS+=buildwinceunits comobj
 endif
 ifeq ($(FULL_TARGET),i386-wince)
-override TARGET_IMPLICITUNITS+=aygshell commctrl commdlg iphlpapi notify oleaut32 power shellapi simmgr tapi gpsapi todaycmn windbase cesync gx winioctl msgqueue pm service htmlctrl
+override TARGET_IMPLICITUNITS+=aygshell commctrl commdlg iphlpapi notify oleaut32 power shellapi simmgr tapi gpsapi todaycmn windbase cesync gx winioctl msgqueue pm service htmlctrl activex ole2 comconst
 endif
 ifeq ($(FULL_TARGET),arm-wince)
-override TARGET_IMPLICITUNITS+=aygshell commctrl commdlg iphlpapi notify oleaut32 power shellapi simmgr tapi gpsapi todaycmn windbase cesync gx winioctl msgqueue pm service htmlctrl
+override TARGET_IMPLICITUNITS+=aygshell commctrl commdlg iphlpapi notify oleaut32 power shellapi simmgr tapi gpsapi todaycmn windbase cesync gx winioctl msgqueue pm service htmlctrl activex ole2 comconst
+endif
+ifeq ($(FULL_TARGET),i386-linux)
+override TARGET_RSTS+=comconst
+endif
+ifeq ($(FULL_TARGET),i386-go32v2)
+override TARGET_RSTS+=comconst
+endif
+ifeq ($(FULL_TARGET),i386-win32)
+override TARGET_RSTS+=comconst
+endif
+ifeq ($(FULL_TARGET),i386-os2)
+override TARGET_RSTS+=comconst
+endif
+ifeq ($(FULL_TARGET),i386-freebsd)
+override TARGET_RSTS+=comconst
+endif
+ifeq ($(FULL_TARGET),i386-beos)
+override TARGET_RSTS+=comconst
+endif
+ifeq ($(FULL_TARGET),i386-netbsd)
+override TARGET_RSTS+=comconst
+endif
+ifeq ($(FULL_TARGET),i386-solaris)
+override TARGET_RSTS+=comconst
+endif
+ifeq ($(FULL_TARGET),i386-qnx)
+override TARGET_RSTS+=comconst
+endif
+ifeq ($(FULL_TARGET),i386-netware)
+override TARGET_RSTS+=comconst
+endif
+ifeq ($(FULL_TARGET),i386-openbsd)
+override TARGET_RSTS+=comconst
+endif
+ifeq ($(FULL_TARGET),i386-wdosx)
+override TARGET_RSTS+=comconst
+endif
+ifeq ($(FULL_TARGET),i386-darwin)
+override TARGET_RSTS+=comconst
+endif
+ifeq ($(FULL_TARGET),i386-emx)
+override TARGET_RSTS+=comconst
+endif
+ifeq ($(FULL_TARGET),i386-watcom)
+override TARGET_RSTS+=comconst
+endif
+ifeq ($(FULL_TARGET),i386-netwlibc)
+override TARGET_RSTS+=comconst
+endif
+ifeq ($(FULL_TARGET),i386-wince)
+override TARGET_RSTS+=comconst
+endif
+ifeq ($(FULL_TARGET),i386-embedded)
+override TARGET_RSTS+=comconst
+endif
+ifeq ($(FULL_TARGET),i386-symbian)
+override TARGET_RSTS+=comconst
+endif
+ifeq ($(FULL_TARGET),m68k-linux)
+override TARGET_RSTS+=comconst
+endif
+ifeq ($(FULL_TARGET),m68k-freebsd)
+override TARGET_RSTS+=comconst
+endif
+ifeq ($(FULL_TARGET),m68k-netbsd)
+override TARGET_RSTS+=comconst
+endif
+ifeq ($(FULL_TARGET),m68k-amiga)
+override TARGET_RSTS+=comconst
+endif
+ifeq ($(FULL_TARGET),m68k-atari)
+override TARGET_RSTS+=comconst
+endif
+ifeq ($(FULL_TARGET),m68k-openbsd)
+override TARGET_RSTS+=comconst
+endif
+ifeq ($(FULL_TARGET),m68k-palmos)
+override TARGET_RSTS+=comconst
+endif
+ifeq ($(FULL_TARGET),m68k-embedded)
+override TARGET_RSTS+=comconst
+endif
+ifeq ($(FULL_TARGET),powerpc-linux)
+override TARGET_RSTS+=comconst
+endif
+ifeq ($(FULL_TARGET),powerpc-netbsd)
+override TARGET_RSTS+=comconst
+endif
+ifeq ($(FULL_TARGET),powerpc-amiga)
+override TARGET_RSTS+=comconst
+endif
+ifeq ($(FULL_TARGET),powerpc-macos)
+override TARGET_RSTS+=comconst
+endif
+ifeq ($(FULL_TARGET),powerpc-darwin)
+override TARGET_RSTS+=comconst
+endif
+ifeq ($(FULL_TARGET),powerpc-morphos)
+override TARGET_RSTS+=comconst
+endif
+ifeq ($(FULL_TARGET),powerpc-embedded)
+override TARGET_RSTS+=comconst
+endif
+ifeq ($(FULL_TARGET),sparc-linux)
+override TARGET_RSTS+=comconst
+endif
+ifeq ($(FULL_TARGET),sparc-netbsd)
+override TARGET_RSTS+=comconst
+endif
+ifeq ($(FULL_TARGET),sparc-solaris)
+override TARGET_RSTS+=comconst
+endif
+ifeq ($(FULL_TARGET),sparc-embedded)
+override TARGET_RSTS+=comconst
+endif
+ifeq ($(FULL_TARGET),x86_64-linux)
+override TARGET_RSTS+=comconst
+endif
+ifeq ($(FULL_TARGET),x86_64-freebsd)
+override TARGET_RSTS+=comconst
+endif
+ifeq ($(FULL_TARGET),x86_64-darwin)
+override TARGET_RSTS+=comconst
+endif
+ifeq ($(FULL_TARGET),x86_64-win64)
+override TARGET_RSTS+=comconst
+endif
+ifeq ($(FULL_TARGET),x86_64-embedded)
+override TARGET_RSTS+=comconst
+endif
+ifeq ($(FULL_TARGET),arm-linux)
+override TARGET_RSTS+=comconst
+endif
+ifeq ($(FULL_TARGET),arm-palmos)
+override TARGET_RSTS+=comconst
+endif
+ifeq ($(FULL_TARGET),arm-darwin)
+override TARGET_RSTS+=comconst
+endif
+ifeq ($(FULL_TARGET),arm-wince)
+override TARGET_RSTS+=comconst
+endif
+ifeq ($(FULL_TARGET),arm-gba)
+override TARGET_RSTS+=comconst
+endif
+ifeq ($(FULL_TARGET),arm-nds)
+override TARGET_RSTS+=comconst
+endif
+ifeq ($(FULL_TARGET),arm-embedded)
+override TARGET_RSTS+=comconst
+endif
+ifeq ($(FULL_TARGET),arm-symbian)
+override TARGET_RSTS+=comconst
+endif
+ifeq ($(FULL_TARGET),powerpc64-linux)
+override TARGET_RSTS+=comconst
+endif
+ifeq ($(FULL_TARGET),powerpc64-darwin)
+override TARGET_RSTS+=comconst
+endif
+ifeq ($(FULL_TARGET),powerpc64-embedded)
+override TARGET_RSTS+=comconst
+endif
+ifeq ($(FULL_TARGET),avr-embedded)
+override TARGET_RSTS+=comconst
+endif
+ifeq ($(FULL_TARGET),armeb-linux)
+override TARGET_RSTS+=comconst
+endif
+ifeq ($(FULL_TARGET),armeb-embedded)
+override TARGET_RSTS+=comconst
 endif
 override INSTALL_BUILDUNIT=buildwinceunits
 override INSTALL_FPCPACKAGE=y
@@ -2151,3 +2323,5 @@ ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif
 .NOTPARALLEL:
+comobj$(PPUEXT) : $(WINDIR)/comobj.pp $(WINDIR)/activex.pp
+	$(COMPILER) $(WINDIR)/comobj.pp
diff --git a/packages/winceunits/Makefile.fpc b/packages/winceunits/Makefile.fpc
index 78aebea820..132131d2c9 100644
--- a/packages/winceunits/Makefile.fpc
+++ b/packages/winceunits/Makefile.fpc
@@ -7,11 +7,15 @@ name=winceunits
 version=2.2.0
 
 [target]
-units_wince=buildwinceunits
+units_wince=buildwinceunits comobj
 implicitunits_wince=aygshell commctrl commdlg iphlpapi notify oleaut32 power shellapi simmgr tapi \
-                    gpsapi todaycmn windbase cesync gx winioctl msgqueue pm service htmlctrl
+                    gpsapi todaycmn windbase cesync gx winioctl msgqueue pm service htmlctrl \
+                    activex ole2 comconst
+
 units_win32=rapi cesync
 
+rsts=comconst
+
 [install]
 buildunit=buildwinceunits
 fpcpackage=y
@@ -23,5 +27,11 @@ fpcdir=../..
 options=-Ur
 sourcedir=src
 
+[prerules]
+WINDIR=../winunits-base/src
+
 [rules]
 .NOTPARALLEL:
+
+comobj$(PPUEXT) : $(WINDIR)/comobj.pp $(WINDIR)/activex.pp
+        $(COMPILER) $(WINDIR)/comobj.pp