fpgui intf: added readme for hint how to get the sources. added src and include paths in codetools. changed Makefile for new layout

git-svn-id: trunk@10898 -

.gitattributes

@@ -2446,6 +2446,7 @@ lcl/interfaces/carbon/carbonwstoolwin.pp svneol=native#text/pascal
 lcl/interfaces/carbon/interfaces.pas svneol=native#text/pascal
 lcl/interfaces/carbon/mackeycodes.inc svneol=native#text/pascal
 lcl/interfaces/fpgui/Makefile.fpc svneol=native#text/plain
+lcl/interfaces/fpgui/README.txt svneol=native#text/plain
 lcl/interfaces/fpgui/fpguiint.pp svneol=native#text/pascal
 lcl/interfaces/fpgui/fpguiobject.inc svneol=native#text/pascal
 lcl/interfaces/fpgui/fpguiwsactnlist.pp svneol=native#text/pascal

components/codetools/codetoolsstrconsts.pas

@@ -191,6 +191,8 @@ ResourceString
   ctsInstallerDirectories = 'Installer directories';
   ctsDefsForLazarusSources = 'Definitions for the Lazarus Sources';
   ctsAddsDirToSourcePath = 'adds %s to SrcPath';
+  ctsIfDefMSWindows = 'IfDef MSWindows';
+  ctsIfDefLinux = 'IfDef Linux';
   ctsAddsDirToIncludePath = 'adds %s to IncPath';
   ctsSetsIncPathTo = 'sets IncPath to %s';
   ctsSetsSrcPathTo = 'sets SrcPath to %s';

components/codetools/definetemplates.pas

@@ -3775,12 +3775,6 @@ end;
 function TDefinePool.CreateLazarusSrcTemplate(
   const LazarusSrcDir, WidgetType, ExtraOptions: string;
   Owner: TObject): TDefineTemplate;
-type
-  TLazWidgetSet = (wsGtk, wsGtk2, wsWin32, wsWinCE, wsCarbon, wsQT);
-const
-  ds: char = PathDelim;
-  LazWidgetSets: array[TLazWidgetSet] of string = (
-    'gtk','gtk2','win32','wince','carbon','qt');
 
   function D(const Filename: string): string;
   begin
@@ -3791,7 +3785,7 @@ var
   MainDir, DirTempl, SubDirTempl, IntfDirTemplate, IfTemplate,
   LCLUnitsDir, LCLUnitsCPUOSDir, LCLUnitsCPUOSWidgetSetDir,
   SubTempl: TDefineTemplate;
-  TargetOS, SrcOS, SrcPath, IncPath: string;
+  TargetOS, SrcOS, SrcPath, IncPath, CompiledSrcPath: string;
   i: Integer;
   CurCPU, CurOS, CurWidgetSet, ExtraSrcPath: string;
   ElseTemplate: TDefineTemplate;
@@ -3811,6 +3805,7 @@ begin
   SrcOS:='$('+ExternalMacroStart+'SrcOS)';
   SrcPath:='$('+ExternalMacroStart+'SrcPath)';
   IncPath:='$('+ExternalMacroStart+'IncPath)';
+  CompiledSrcPath:='$('+ExternalMacroStart+'CompiledSrcPath)';
 
   // <LazarusSrcDir>
   MainDir:=TDefineTemplate.Create(
@@ -4163,10 +4158,40 @@ begin
       ExtraSrcPath:='../../../interfaces/'+CurWidgetSet;
       if (CurWidgetSet='gtk2') then
         ExtraSrcPath:=ExtraSrcPath+';../../../interfaces/gtk';
+      if (CurWidgetSet='fpgui') then begin
+        ExtraSrcPath:=ExtraSrcPath
+          +';../../../interfaces/fpgui/gfx'
+          +';../../../interfaces/fpgui/gui';
+        if (CurOS='linux') then
+          ExtraSrcPath:=ExtraSrcPath+';../../../interfaces/fpgui/gfx/x11';
+        if (CurOS='win32') or (CurOS='wince') then
+          ExtraSrcPath:=ExtraSrcPath+';../../../interfaces/fpgui/gfx/gdi';
+      end;
       LCLUnitsCPUOSWidgetSetDir.AddChild(
         TDefineTemplate.Create('CompiledSrcPath',
           ctsSrcPathForCompiledUnits,CompiledSrcPathMacroName,
           d(ExtraSrcPath),da_Define));
+      // ifdef linux
+      IfTemplate:=TDefineTemplate.Create('IFDEF linux',
+        ctsIfDefLinux, 'linux', '', da_IfDef);
+        // then add gfx/x11 to CompiledSrcPath
+        IfTemplate.AddChild(TDefineTemplate.Create('Add gfx/x11 to CompiledSrcPath',
+          Format(ctsAddsDirToSourcePath,['gfx/x11']),
+            ExternalMacroStart+'SrcPath',
+            d(LazarusSrcDir+'/lcl/interfaces/fpgui/gfx/x11')
+            +';'+CompiledSrcPath
+            ,da_Define));
+      // ifdef mswindows
+      IfTemplate:=TDefineTemplate.Create('IFDEF mswindows',
+        ctsIfDefMSWindows, 'mswindows', '', da_IfDef);
+        // then add gfx/gdi to CompiledSrcPath
+        IfTemplate.AddChild(TDefineTemplate.Create('Add gfx/gdi to CompiledSrcPath',
+          Format(ctsAddsDirToSourcePath,['gfx/gdi']),
+            ExternalMacroStart+'CompiledSrcPath',
+            d(LazarusSrcDir+'/lcl/interfaces/fpgui/gfx/gdi')
+            +';'+CompiledSrcPath
+            ,da_Define));
+      LCLUnitsCPUOSWidgetSetDir.AddChild(IfTemplate);
     end;
   end;
 
@@ -4244,7 +4269,45 @@ begin
   SubDirTempl.AddChild(IntfDirTemplate);
 
   // <LazarusSrcDir>/lcl/interfaces/fpgui
-  // no special
+  IntfDirTemplate:=TDefineTemplate.Create('fpgui',
+    ctsIntfDirectory,'','fpgui',da_Directory);
+    // add unit paths
+    IntfDirTemplate.AddChild(TDefineTemplate.Create('Add gui, gfx to SrcPath',
+    Format(ctsAddsDirToSourcePath,['gui, gfx']),
+      ExternalMacroStart+'SrcPath',
+      d(LazarusSrcDir+'/lcl/interfaces/fpgui/gui')
+      +d(LazarusSrcDir+'/lcl/interfaces/fpgui/gfx')
+      +';'+SrcPath
+      ,da_DefineRecurse));
+    // ifdef linux
+    IfTemplate:=TDefineTemplate.Create('IFDEF linux',
+      ctsIfDefLinux, 'linux', '', da_IfDef);
+      // then add gfx/x11 to SrcPath
+      IfTemplate.AddChild(TDefineTemplate.Create('Add x11 to SrcPath',
+        Format(ctsAddsDirToSourcePath,['x11']),
+          ExternalMacroStart+'SrcPath',
+          d(LazarusSrcDir+'/lcl/interfaces/fpgui/gfx/x11')
+          +';'+SrcPath
+          ,da_DefineRecurse));
+    // ifdef mswindows
+    IfTemplate:=TDefineTemplate.Create('IFDEF mswindows',
+      ctsIfDefMSWindows, 'mswindows', '', da_IfDef);
+      // then add gdi to SrcPath
+      IfTemplate.AddChild(TDefineTemplate.Create('Add gdi to SrcPath',
+        Format(ctsAddsDirToSourcePath,['gdi']),
+          ExternalMacroStart+'SrcPath',
+          d(LazarusSrcDir+'/lcl/interfaces/fpgui/gfx/gdi')
+          +';'+SrcPath
+          ,da_DefineRecurse));
+    IntfDirTemplate.AddChild(IfTemplate);
+    // add include paths
+    IntfDirTemplate.AddChild(TDefineTemplate.Create('Add gfx to IncPath',
+    Format(ctsAddsDirToSourcePath,['gfx']),
+      ExternalMacroStart+'IncPath',
+      d(LazarusSrcDir+'/lcl/interfaces/fpgui/gfx')
+      +';'+IncPath
+      ,da_DefineRecurse));
+  SubDirTempl.AddChild(IntfDirTemplate);
 
   // <LazarusSrcDir>/components
   DirTempl:=TDefineTemplate.Create('Components',ctsComponentsDirectory,

components/codetools/extractproctool.pas

@@ -263,8 +263,10 @@ type
   TParameterType = (ptNone, ptConst, ptVar, ptOut, ptNoSpecifier);
 const
   ShortProcFormat = [phpWithoutClassKeyword];
+  {$IFDEF CTDebug}
   ParameterTypeNames: array[TParameterType] of string = (
     'ptNone', 'ptConst', 'ptVar', 'ptOut', 'ptNoSpecifier');
+  {$ENDIF}
 var
   BlockStartPos, BlockEndPos: integer; // the selection
   ProcNode: TCodeTreeNode; // the main proc node of the selection

components/codetools/stdcodetools.pas

@@ -2670,12 +2670,15 @@ type
     scatInherited, scatPoint, scatUp,
     scatEdgedBracketOpen, scatEdgedBracketClose,
     scatRoundBracketOpen, scatRoundBracketClose);
+
+{$IFDEF VerboseGetStringConstBounds}
 const
   StrConstTokenTypeName: array[TStrConstTokenType] of string = (
     'scatNone', 'scatStrConst', 'scatPlus', 'scatIdent',
     'scatInherited', 'scatPoint', 'scatUp',
     'scatEdgedBracketOpen', 'scatEdgedBracketClose',
     'scatRoundBracketOpen', 'scatRoundBracketClose');
+{$ENDIF}
 
   function GetCurrentTokenType: TStrConstTokenType;
   begin
@@ -4227,7 +4230,7 @@ var
       // read all property infos of current class
       TypeData:=GetTypeData(TypeInfo);
       // skip unitname
-      PropInfo:=PPropInfo(@TypeData^.UnitName+Length(TypeData^.UnitName)+1);
+      PropInfo:=PPropInfo(PByte(@TypeData^.UnitName)+Length(TypeData^.UnitName)+1);
       // read property count
       CurCount:=PWord(PropInfo)^;
       inc(PtrInt(PropInfo),SizeOf(Word));

lcl/interfaces/fpgui/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2007/03/27]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2007/04/02]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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 sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded
@@ -231,6 +231,18 @@ endif
 PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
 override PACKAGE_NAME=lcl
 PACKAGEDIR_MAIN:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /lcl/Makefile.fpc,$(PACKAGESDIR))))))
+ifeq ($(OS_TARGET),linux)
+fpGUIPlatform=x11
+endif
+ifeq ($(OS_TARGET),win32)
+fpGUIPlatform=gdi
+endif
+ifeq ($(OS_TARGET),wince)
+fpGUIPlatform=gdi
+endif
+ifeq ($(OS_TARGET),win64)
+fpGUIPlatform=gdi
+endif
 ifeq ($(FULL_TARGET),i386-linux)
 override TARGET_UNITS+=interfaces
 endif
@@ -700,160 +712,160 @@ ifeq ($(FULL_TARGET),powerpc64-embedded)
 override COMPILER_OPTIONS+=-gl -dfpgui
 endif
 ifeq ($(FULL_TARGET),i386-linux)
-override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) .
+override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) . gfx gui gfx/$(fpGUIPlatform)
 endif
 ifeq ($(FULL_TARGET),i386-go32v2)
-override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) .
+override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) . gfx gui gfx/$(fpGUIPlatform)
 endif
 ifeq ($(FULL_TARGET),i386-win32)
-override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) .
+override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) . gfx gui gfx/$(fpGUIPlatform)
 endif
 ifeq ($(FULL_TARGET),i386-os2)
-override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) .
+override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) . gfx gui gfx/$(fpGUIPlatform)
 endif
 ifeq ($(FULL_TARGET),i386-freebsd)
-override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) .
+override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) . gfx gui gfx/$(fpGUIPlatform)
 endif
 ifeq ($(FULL_TARGET),i386-beos)
-override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) .
+override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) . gfx gui gfx/$(fpGUIPlatform)
 endif
 ifeq ($(FULL_TARGET),i386-netbsd)
-override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) .
+override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) . gfx gui gfx/$(fpGUIPlatform)
 endif
 ifeq ($(FULL_TARGET),i386-solaris)
-override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) .
+override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) . gfx gui gfx/$(fpGUIPlatform)
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
-override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) .
+override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) . gfx gui gfx/$(fpGUIPlatform)
 endif
 ifeq ($(FULL_TARGET),i386-netware)
-override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) .
+override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) . gfx gui gfx/$(fpGUIPlatform)
 endif
 ifeq ($(FULL_TARGET),i386-openbsd)
-override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) .
+override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) . gfx gui gfx/$(fpGUIPlatform)
 endif
 ifeq ($(FULL_TARGET),i386-wdosx)
-override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) .
+override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) . gfx gui gfx/$(fpGUIPlatform)
 endif
 ifeq ($(FULL_TARGET),i386-darwin)
-override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) .
+override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) . gfx gui gfx/$(fpGUIPlatform)
 endif
 ifeq ($(FULL_TARGET),i386-emx)
-override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) .
+override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) . gfx gui gfx/$(fpGUIPlatform)
 endif
 ifeq ($(FULL_TARGET),i386-watcom)
-override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) .
+override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) . gfx gui gfx/$(fpGUIPlatform)
 endif
 ifeq ($(FULL_TARGET),i386-netwlibc)
-override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) .
+override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) . gfx gui gfx/$(fpGUIPlatform)
 endif
 ifeq ($(FULL_TARGET),i386-wince)
-override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) .
+override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) . gfx gui gfx/$(fpGUIPlatform)
 endif
 ifeq ($(FULL_TARGET),i386-embedded)
-override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) .
+override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) . gfx gui gfx/$(fpGUIPlatform)
 endif
 ifeq ($(FULL_TARGET),i386-symbian)
-override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) .
+override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) . gfx gui gfx/$(fpGUIPlatform)
 endif
 ifeq ($(FULL_TARGET),m68k-linux)
-override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) .
+override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) . gfx gui gfx/$(fpGUIPlatform)
 endif
 ifeq ($(FULL_TARGET),m68k-freebsd)
-override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) .
+override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) . gfx gui gfx/$(fpGUIPlatform)
 endif
 ifeq ($(FULL_TARGET),m68k-netbsd)
-override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) .
+override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) . gfx gui gfx/$(fpGUIPlatform)
 endif
 ifeq ($(FULL_TARGET),m68k-amiga)
-override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) .
+override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) . gfx gui gfx/$(fpGUIPlatform)
 endif
 ifeq ($(FULL_TARGET),m68k-atari)
-override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) .
+override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) . gfx gui gfx/$(fpGUIPlatform)
 endif
 ifeq ($(FULL_TARGET),m68k-openbsd)
-override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) .
+override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) . gfx gui gfx/$(fpGUIPlatform)
 endif
 ifeq ($(FULL_TARGET),m68k-palmos)
-override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) .
+override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) . gfx gui gfx/$(fpGUIPlatform)
 endif
 ifeq ($(FULL_TARGET),m68k-embedded)
-override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) .
+override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) . gfx gui gfx/$(fpGUIPlatform)
 endif
 ifeq ($(FULL_TARGET),powerpc-linux)
-override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) .
+override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) . gfx gui gfx/$(fpGUIPlatform)
 endif
 ifeq ($(FULL_TARGET),powerpc-netbsd)
-override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) .
+override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) . gfx gui gfx/$(fpGUIPlatform)
 endif
 ifeq ($(FULL_TARGET),powerpc-amiga)
-override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) .
+override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) . gfx gui gfx/$(fpGUIPlatform)
 endif
 ifeq ($(FULL_TARGET),powerpc-macos)
-override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) .
+override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) . gfx gui gfx/$(fpGUIPlatform)
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
-override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) .
+override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) . gfx gui gfx/$(fpGUIPlatform)
 endif
 ifeq ($(FULL_TARGET),powerpc-morphos)
-override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) .
+override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) . gfx gui gfx/$(fpGUIPlatform)
 endif
 ifeq ($(FULL_TARGET),powerpc-embedded)
-override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) .
+override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) . gfx gui gfx/$(fpGUIPlatform)
 endif
 ifeq ($(FULL_TARGET),sparc-linux)
-override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) .
+override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) . gfx gui gfx/$(fpGUIPlatform)
 endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
-override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) .
+override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) . gfx gui gfx/$(fpGUIPlatform)
 endif
 ifeq ($(FULL_TARGET),sparc-solaris)
-override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) .
+override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) . gfx gui gfx/$(fpGUIPlatform)
 endif
 ifeq ($(FULL_TARGET),sparc-embedded)
-override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) .
+override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) . gfx gui gfx/$(fpGUIPlatform)
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
-override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) .
+override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) . gfx gui gfx/$(fpGUIPlatform)
 endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
-override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) .
+override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) . gfx gui gfx/$(fpGUIPlatform)
 endif
 ifeq ($(FULL_TARGET),x86_64-win64)
-override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) .
+override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) . gfx gui gfx/$(fpGUIPlatform)
 endif
 ifeq ($(FULL_TARGET),x86_64-embedded)
-override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) .
+override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) . gfx gui gfx/$(fpGUIPlatform)
 endif
 ifeq ($(FULL_TARGET),arm-linux)
-override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) .
+override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) . gfx gui gfx/$(fpGUIPlatform)
 endif
 ifeq ($(FULL_TARGET),arm-palmos)
-override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) .
+override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) . gfx gui gfx/$(fpGUIPlatform)
 endif
 ifeq ($(FULL_TARGET),arm-wince)
-override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) .
+override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) . gfx gui gfx/$(fpGUIPlatform)
 endif
 ifeq ($(FULL_TARGET),arm-gba)
-override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) .
+override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) . gfx gui gfx/$(fpGUIPlatform)
 endif
 ifeq ($(FULL_TARGET),arm-nds)
-override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) .
+override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) . gfx gui gfx/$(fpGUIPlatform)
 endif
 ifeq ($(FULL_TARGET),arm-embedded)
-override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) .
+override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) . gfx gui gfx/$(fpGUIPlatform)
 endif
 ifeq ($(FULL_TARGET),arm-symbian)
-override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) .
+override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) . gfx gui gfx/$(fpGUIPlatform)
 endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
-override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) .
+override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) . gfx gui gfx/$(fpGUIPlatform)
 endif
 ifeq ($(FULL_TARGET),powerpc64-darwin)
-override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) .
+override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) . gfx gui gfx/$(fpGUIPlatform)
 endif
 ifeq ($(FULL_TARGET),powerpc64-embedded)
-override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) .
+override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) . gfx gui gfx/$(fpGUIPlatform)
 endif
 ifeq ($(FULL_TARGET),i386-linux)
 override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/fpgui

lcl/interfaces/fpgui/Makefile.fpc

@@ -12,9 +12,23 @@ packages=rtl fcl
 [target]
 units=interfaces
 
+[prerules]
+ifeq ($(OS_TARGET),linux)
+fpGUIPlatform=x11
+endif
+ifeq ($(OS_TARGET),win32)
+fpGUIPlatform=gdi
+endif
+ifeq ($(OS_TARGET),wince)
+fpGUIPlatform=gdi
+endif
+ifeq ($(OS_TARGET),win64)
+fpGUIPlatform=gdi
+endif
+
 [compiler]
 options=-gl -dfpgui
-unitdir=../../units/$(CPU_TARGET)-$(OS_TARGET) .
+unitdir=../../units/$(CPU_TARGET)-$(OS_TARGET) . gfx gui gfx/$(fpGUIPlatform)
 unittargetdir=../../units/$(CPU_TARGET)-$(OS_TARGET)/fpgui
 
 [clean]

lcl/interfaces/fpgui/README.txt

@@ -0,0 +1,7 @@
+The Lazarus svn does not contain the fpGUI sources.
+You can get the fpGUI sources with
+
+cd lcl/interfaces/fpgui
+svn co https://fpgui.svn.sourceforge.net/svnroot/fpgui/trunk/gfx gfx
+svn co https://fpgui.svn.sourceforge.net/svnroot/fpgui/trunk/gui gui
+