moved config file, one level down

fixed build system (linked all fpmake files together)



git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@2258 8e941d3f-bd1b-0410-a28a-d453659cc2b4

components/nvidia-widgets/examples/fpmake.pp

@@ -1,3 +1,4 @@
+{$ifndef ALLPACKAGES}
 program fpmake;
 
 {$mode objfpc} {$H+}
@@ -12,17 +13,23 @@ var
 begin
   with Installer do
   begin
+{$endif ALLPACKAGES}
+
     //create nvwidgets package
     P := AddPackage('nvwidget_examples');
 
+{$ifdef ALLPACKAGES}
+    P.Directory := 'examples';
+{$endif ALLPACKAGES}
+
     P.Dependencies.Add('nvwidget');
-    P.UnitPath.Add('../src');
 	
     //example applications
     P.Targets.AddUnit('example.pp');
     P.Targets.AddUnit('widget_test.pp');
 	
+{$ifndef ALLPACKAGES}
     Run;
   end;
 end.
-
+{$endif ALLPACKAGES}

components/nvidia-widgets/examples/widget_test.pp

@@ -4,7 +4,7 @@ program widget_test;
 
 uses
   Classes, SysUtils, GLut, GL, GLu, nvGLPainter, nvGlutContext, GLFreeTypeFont,
-  GLFreeType, GLUTBitmapFont, nvTypes, nvPainter, nvContext;
+  GLFreeType, {GLUTBitmapFont,} nvTypes, nvPainter, nvContext;
 
 var
   ui: GlutUIContext;
@@ -187,8 +187,6 @@ var
 var
   texture_data: array [0..3] of cardinal = ($FFFF0000, $FF0000FF, $FF00FF00, $FF00FF00);
 
-{$R *.res}
-
 begin
   glutInit(@argc, argv);
   glutInitWindowSize(win_w, win_h);

components/nvidia-widgets/fpmake.pp

@@ -7,9 +7,13 @@ uses
   Classes,
   SysUtils;
 
+{$define ALLPACKAGES}
+{$include config.inc}
+
 var
   P: TPackage;
   be: TBuildEngine;
+  i: integer;
 
   procedure CreateClassChart(Sender: TObject);
   var

components/nvidia-widgets/fpmake_add.inc

@@ -1,3 +1,3 @@
-  add_examples;
-  add_src;
   add_utils;
+  add_src;
+  add_examples;

components/nvidia-widgets/src/fpmake.pp

@@ -1,3 +1,4 @@
+{$ifndef ALLPACKAGES}
 program fpmake;
 
 {$mode objfpc} {$H+}
@@ -5,8 +6,6 @@ program fpmake;
 uses
   fpmkunit;
 
-{$include config.inc}
-
 var
   P: TPackage;
   i: integer;
@@ -14,9 +13,15 @@ var
 begin
   with Installer do
   begin
+{$endif ALLPACKAGES}
+
     //create nvwidgets package
     P := AddPackage('nvwidget');
 
+{$ifdef ALLPACKAGES}
+    P.Directory := 'src';
+{$endif ALLPACKAGES}
+
     P.Version := '1.00';
     //P.Options.Add('-MObjFPC');
     P.Options.Add('-Sc');
@@ -68,7 +73,8 @@ begin
 	    end;
     end;
 	
+{$ifndef ALLPACKAGES}
     Run;
   end;
 end.
-
+{$endif ALLPACKAGES}

components/nvidia-widgets/utils/fpmake.pp

@@ -1,3 +1,4 @@
+{$ifndef ALLPACKAGES}
 program fpmake;
 
 {$mode objfpc} {$H+}
@@ -12,13 +13,20 @@ var
 begin
   with Installer do
   begin
+{$endif ALLPACKAGES}
+
     //create nvwidgets package
     P := AddPackage('nvwidget_utils');
 
+{$ifdef ALLPACKAGES}
+    P.Directory := 'utils';
+{$endif ALLPACKAGES}
+
     //utility applications
     P.Targets.AddUnit('crop.pp');
 	
+{$ifndef ALLPACKAGES}
     Run;
   end;
 end.
-
+{$endif ALLPACKAGES}