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,19 +13,25 @@ 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');	
-	
-	if NV_DEBUG then
-	  for i := 0 to High(NV_DEBUG_FLAGS) do
+    //P.Options.Add('-MObjFPC');
+    P.Options.Add('-Sc');
+
+    if NV_DEBUG then
+      for i := 0 to High(NV_DEBUG_FLAGS) do
         P.Options.Add(NV_DEBUG_FLAGS[i]);
-	  
-	if NV_PROFILE then
-	  for i := 0 to High(NV_PROFILE_FLAGS) do
+
+    if NV_PROFILE then
+      for i := 0 to High(NV_PROFILE_FLAGS) do
         P.Options.Add(NV_PROFILE_FLAGS[i]);
 	  
     //base widget units
@@ -35,28 +40,28 @@ begin
     P.Targets.AddUnit('nvcontext.pas');
     P.Targets.AddUnit('nvpainter.pas');
 
-	write('package ', P.Name, ' configured for ');
+    write('package ', P.Name, ' configured for ');
 
 	//select font class
     case NV_ACTIVE_FONT of
-	  GLFREETYPE: begin
-	                write('FreeType font ');
-	                P.Targets.AddUnit('./gl/glfreetype.pas');	
-	                P.Targets.AddUnit('./gl/glfreetypefont.pas');	
-			      end;
-	  GLUTBITMAP: begin
-	                write('GLUT font ');
-	                P.Targets.AddUnit('./glut/glutbitmapfont.pas');	
-                  end;	  
-	end;
+      GLFREETYPE: begin
+	            write('FreeType font ');
+	            P.Targets.AddUnit('./gl/glfreetype.pas');
+	            P.Targets.AddUnit('./gl/glfreetypefont.pas');
+                  end;
+      GLUTBITMAP: begin
+	            write('GLUT font ');
+	            P.Targets.AddUnit('./glut/glutbitmapfont.pas');
+                  end;
+    end;
 	
     //context units
     case NV_ACTIVE_CONTEXT of
-	  GLUT: begin
-	          write('the GLUT context');
-	          P.Targets.AddUnit('./glut/nvglutcontext.pas');	
-			end;
-	end;
+      GLUT: begin
+	      write('the GLUT context');
+	      P.Targets.AddUnit('./glut/nvglutcontext.pas');
+	    end;
+    end;
 	
     //painter units
     case NV_ACTIVE_PAINTER of
@@ -66,9 +71,10 @@ begin
 	      P.Targets.AddUnit('./gl/nvshaderutils.pas');	
 	      P.Targets.AddUnit('./gl/nvglpainter.pas');	
 	    end;
-	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}