Sfoglia il codice sorgente

* compilation fixed

git-svn-id: trunk@29216 -
florian 10 anni fa
parent
commit
8508d25f8e
2 ha cambiato i file con 5 aggiunte e 5 eliminazioni
  1. 4 4
      packages/fpmkunit/src/fpmkunit.pp
  2. 1 1
      utils/fpcm/revision.inc

+ 4 - 4
packages/fpmkunit/src/fpmkunit.pp

@@ -210,8 +210,8 @@ Const
     { android } ( false, true,  false, false, false, false, true,  false, false, false, false, true,  true , false),
     { android } ( false, true,  false, false, false, false, true,  false, false, false, false, true,  true , false),
     { nativent }( false, true,  false, false, false, false, false, false, false, false, false, false, false, false),
     { nativent }( false, true,  false, false, false, false, false, false, false, false, false, false, false, false),
     { msdos }   ( false, false, false, false, false, false, false, false, false, false, false, false, false, true ),
     { msdos }   ( false, false, false, false, false, false, false, false, false, false, false, false, false, true ),
-    { wii }     ( false, false, false, true , false, false, false, false, false, false, false, false, false, false ),
-    { aros }    ( true,  false, false, false, false, false, false, false, false, false, false, false, false, false )
+    { wii }     ( false, false, false, true , false, false, false, false, false, false, false, false, false, false),
+    { aros }    ( true,  false, false, false, false, false, false, false, false, false, false, false, false, false),
     { dragonfly}( false, false, false, false, false, true, false, false, false, false, false, false, false, false )
     { dragonfly}( false, false, false, false, false, true, false, false, false, false, false, false, false, false )
   );
   );
 
 
@@ -3798,7 +3798,7 @@ function TCustomDefaults.GetDocInstallDir: String;
 begin
 begin
   If (FDocInstallDir<>'') then
   If (FDocInstallDir<>'') then
     Result:=FDocInstallDir
     Result:=FDocInstallDir
-  else if Defaults.BuildOS=freebsd or Defaults.BuildOS=dragonfly then
+  else if (Defaults.BuildOS=freebsd) or (Defaults.BuildOS=dragonfly) then
     result := Prefix+PathDelim+'share'+PathDelim+'doc'+PathDelim+'$(PackageName)'
     result := Prefix+PathDelim+'share'+PathDelim+'doc'+PathDelim+'$(PackageName)'
   else If UnixPaths then
   else If UnixPaths then
     Result:=Prefix+'share'+PathDelim+'doc'+PathDelim+'fpc-$(PackageName)-$(PACKAGEVERSION)'
     Result:=Prefix+'share'+PathDelim+'doc'+PathDelim+'fpc-$(PackageName)-$(PACKAGEVERSION)'
@@ -3811,7 +3811,7 @@ function TCustomDefaults.GetExamplesInstallDir: String;
 begin
 begin
   If (FExamplesInstallDir<>'') then
   If (FExamplesInstallDir<>'') then
     Result:=FExamplesInstallDir
     Result:=FExamplesInstallDir
-  else if Defaults.BuildOS=freebsd or Defaults.BuildOS=dragonfly then
+  else if (Defaults.BuildOS=freebsd) or (Defaults.BuildOS=dragonfly) then
     result := Prefix+PathDelim+'share'+PathDelim+'examples'+PathDelim+'$(PackageName)'
     result := Prefix+PathDelim+'share'+PathDelim+'examples'+PathDelim+'$(PackageName)'
   else If UnixPaths then
   else If UnixPaths then
     Result:=Prefix+'share'+PathDelim+'doc'+PathDelim+'fpc-$(PackageName)-$(PACKAGEVERSION)'+PathDelim+'examples'
     Result:=Prefix+'share'+PathDelim+'doc'+PathDelim+'fpc-$(PackageName)-$(PACKAGEVERSION)'+PathDelim+'examples'

+ 1 - 1
utils/fpcm/revision.inc

@@ -1 +1 @@
-'2014-08-17 rev 28432'
+'2014-12-07 rev 29213'