--- Merging r21547 into '.':

   C packages/winceunits/fpmake.pp
Summary of conflicts:
  Tree conflicts: 1

# revisions: 21547
r21547 | marco | 2012-06-08 13:09:31 +0200 (Fri, 08 Jun 2012) | 3 lines
Changed paths:
   M /trunk/packages/winceunits/fpmake.pp

 * Patch from Ludo, follow up to r21474 add more dependent units (stdole2)
   and fix resourcestring registration.

git-svn-id: branches/fixes_2_6@22693 -

packages/winceunits/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/06/03]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/09/04]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux
@@ -1734,12 +1734,16 @@ endif
 ifndef CROSSBOOTSTRAP
 ifneq ($(BINUTILSPREFIX),)
 override FPCOPT+=-XP$(BINUTILSPREFIX)
-override FPCMAKEOPT+=-XP$(BINUTILSPREFIX)
 endif
 ifneq ($(BINUTILSPREFIX),)
 override FPCOPT+=-Xr$(RLINKPATH)
 endif
 endif
+ifndef CROSSCOMPILE
+ifneq ($(BINUTILSPREFIX),)
+override FPCMAKEOPT+=-XP$(BINUTILSPREFIX)
+endif
+endif
 ifdef UNITDIR
 override FPCOPT+=$(addprefix -Fu,$(UNITDIR))
 endif
@@ -2325,4 +2329,5 @@ endif
 comobj$(PPUEXT) : $(WINDIR)/comobj.pp $(WINDIR)/activex.pp $(WINDIR)/eventsink.pp $(WINDIR)/stdole2.pas $(WINDIR)/oleserver.pp
 	$(COMPILER) $(WINDIR)/comobj.pp
 	$(COMPILER) $(WINDIR)/eventsink.pp
-	$(COMPILER) $(WINDIR)/stdole2.pas 
+	$(COMPILER) $(WINDIR)/stdole2.pas
+	$(COMPILER) $(WINDIR)/oleserver.pp

packages/winceunits/Makefile.fpc

@@ -39,4 +39,5 @@ WINDIR=../winunits-base/src
 comobj$(PPUEXT) : $(WINDIR)/comobj.pp $(WINDIR)/activex.pp $(WINDIR)/eventsink.pp $(WINDIR)/stdole2.pas $(WINDIR)/oleserver.pp
         $(COMPILER) $(WINDIR)/comobj.pp
         $(COMPILER) $(WINDIR)/eventsink.pp
-        $(COMPILER) $(WINDIR)/stdole2.pas 
+        $(COMPILER) $(WINDIR)/stdole2.pas
+        $(COMPILER) $(WINDIR)/oleserver.pp

packages/winceunits/src/buildwinceunits.pp

@@ -26,7 +26,7 @@ uses
   sipapi, cpl, bt_api, bt_sdp, bthapi, bthutil, pimstore, ril, sms, ws2bth,
   keybd, nled, phone, connmgr, devload, devmgmt, mmreg, mmsystem, msacm,
   wininet, ras, raserror, sip, projects, wap, tsp, extapi, imm, rapitypes,
-  storemgr, pnp, tlhelp32;
+  oleserver, storemgr, pnp, tlhelp32;
 
 implementation