i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Manually merge 1410faca6c.

Browse Source
This commit is contained in:
Rene Gollent
2013-09-17 14:42:08 +02:00
parent 89d18e912d
commit eeebe2843a
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/images/HaikuImage
+6 -6
View File
@@ -115,12 +115,12 @@ SYSTEM_NETWORK_PROTOCOLS = ipv4 tcp udp icmp unix icmp6 ipv6 ;
SYSTEM_ADD_ONS_ACCELERANTS = [ FFilterByBuildFeatures SYSTEM_ADD_ONS_ACCELERANTS = [ FFilterByBuildFeatures
x86,x86_64 @{ x86,x86_64 @{
vesa.accelerant vesa.accelerant intel_extreme.accelerant
}@ # x86,x86_64 }@ # x86,x86_64
x86 @{ x86 @{
3dfx.accelerant ati.accelerant matrox.accelerant neomagic.accelerant 3dfx.accelerant ati.accelerant matrox.accelerant neomagic.accelerant
nvidia.accelerant intel_810.accelerant intel_extreme.accelerant nvidia.accelerant intel_810.accelerant
radeon.accelerant radeon_hd.accelerant s3.accelerant radeon.accelerant radeon_hd.accelerant s3.accelerant
#via.accelerant vmware.accelerant #via.accelerant vmware.accelerant
}@ # x86 }@ # x86
] ; ] ;
@@ -173,10 +173,10 @@ SYSTEM_ADD_ONS_DRIVERS_AUDIO = auich auvia echo3g emuxki hda ice1712 sis7018 ;
SYSTEM_ADD_ONS_DRIVERS_AUDIO_OLD = ; #cmedia usb_audio ; SYSTEM_ADD_ONS_DRIVERS_AUDIO_OLD = ; #cmedia usb_audio ;
SYSTEM_ADD_ONS_DRIVERS_GRAPHICS = [ FFilterByBuildFeatures SYSTEM_ADD_ONS_DRIVERS_GRAPHICS = [ FFilterByBuildFeatures
x86,x86_64 @{ x86,x86_64 @{
vesa vesa intel_extreme
}@ # x86,x86_64 }@ # x86,x86_64
x86 @{ x86 @{
ati 3dfx intel_810 intel_extreme matrox neomagic nvidia radeon radeon_hd ati 3dfx intel_810 matrox neomagic nvidia radeon radeon_hd
s3 #via vmware s3 #via vmware
}@ # x86 }@ # x86
] ; ] ;
@@ -204,7 +204,7 @@ SYSTEM_ADD_ONS_DRIVERS_NET = [ FFilterByBuildFeatures
SYSTEM_ADD_ONS_DRIVERS_POWER = [ FFilterByBuildFeatures acpi_button@x86 ] ; SYSTEM_ADD_ONS_DRIVERS_POWER = [ FFilterByBuildFeatures acpi_button@x86 ] ;
SYSTEM_ADD_ONS_BUS_MANAGERS = [ FFilterByBuildFeatures SYSTEM_ADD_ONS_BUS_MANAGERS = [ FFilterByBuildFeatures
ata@ata pci ps2@x86,x86_64 isa@x86,x86_64 ata@ata pci ps2@x86,x86_64 isa@x86,x86_64
ide@ide scsi config_manager agp_gart@x86 usb firewire@x86 acpi@x86 ide@ide scsi config_manager agp_gart@x86,x86_64 usb firewire@x86 acpi@x86
virtio random virtio random
] ; ] ;
SYSTEM_ADD_ONS_FILE_SYSTEMS = bfs bindfs btrfs cdda exfat ext2 fat iso9660 nfs SYSTEM_ADD_ONS_FILE_SYSTEMS = bfs bindfs btrfs cdda exfat ext2 fat iso9660 nfs