* dependency and path updates

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

1 files changed, 23 insertions, 5 deletions

diff --git a/packages/cdrom/fpmake.pp b/packages/cdrom/fpmake.pp
index 4047ab930e..278dbfc51d 100644
--- a/packages/cdrom/fpmake.pp
+++ b/packages/cdrom/fpmake.pp
@@ -16,27 +16,45 @@ begin
 {$ifdef ALLPACKAGES}
     P.Directory:='cdrom';
 {$endif ALLPACKAGES}
-    P.Version:='2.0.0';
+    P.Version:='2.2.1';
+    P.OSes:=[Win32,Win64,Linux];
+
     P.SourcePath.Add('src');
+    P.IncludePath.Add('src');
 
     T:=P.Targets.AddUnit('cdrom.pp');
       with T.Dependencies do
         begin
-          AddInclude('cdromlin.inc');
-          AddUnit('lincd');
+          AddInclude('cdromlin.inc',[Linux]);
+          AddInclude('cdromw32.inc',[Win32,Win64]);
+          AddUnit('lincd',[Linux]);
+          AddUnit('wincd',[Win32,Win64]);
         end;
     T:=P.Targets.AddUnit('discid.pp');
       with T.Dependencies do
         begin
           AddUnit('cdrom');
         end;
-    T:=P.Targets.AddUnit('lincd.pp');
+
+    // Linux
+    T:=P.Targets.AddUnit('lincd.pp',[Linux]);
       with T.Dependencies do
         begin
           AddUnit('major');
         end;
-    T:=P.Targets.AddUnit('major.pp');
+    T:=P.Targets.AddUnit('major.pp',[Linux]);
 
+    // Windows
+    T:=P.Targets.AddUnit('cdromioctl.pp',[Win32,Win64]);
+    T:=P.Targets.AddUnit('scsidefs.pp',[Win32,Win64]);
+    T:=P.Targets.AddUnit('wincd.pp',[Win32,Win64]);
+      with T.Dependencies do
+        begin
+          AddUnit('cdromioctl');
+          AddUnit('wnaspi32');
+          AddUnit('scsidefs');
+        end;
+    T:=P.Targets.AddUnit('wnaspi32.pp',[Win32,Win64]);
 
 {$ifndef ALLPACKAGES}
     Run;