Author: aljen Date: 2010-05-23 17:57:51 +0200 (Sun, 23 May 2010) New Revision: 36914 Changeset: http://dev.haiku-os.org/changeset/36914/haiku Modified: haiku/branches/components/gallium3d/build/jam/HaikuImage Log: * Added drm & test drivers into the image * Removed *_dri.so & SoftPipe for now Modified: haiku/branches/components/gallium3d/build/jam/HaikuImage =================================================================== --- haiku/branches/components/gallium3d/build/jam/HaikuImage 2010-05-23 15:48:44 UTC (rev 36913) +++ haiku/branches/components/gallium3d/build/jam/HaikuImage 2010-05-23 15:57:51 UTC (rev 36914) @@ -159,6 +159,7 @@ SYSTEM_ADD_ONS_SCREENSAVERS = DebugNow Flurry Haiku Icons IFS Spider Message ; SYSTEM_ADD_ONS_DRIVERS_AUDIO = auich auvia echo3g emuxki hda ; SYSTEM_ADD_ONS_DRIVERS_AUDIO_OLD = ; #cmedia sis7018 usb_audio ; +SYSTEM_ADD_ONS_DRIVERS_DRM = drm_test drm_test2 ; SYSTEM_ADD_ONS_DRIVERS_GRAPHICS = $(X86_ONLY)radeon $(X86_ONLY)nvidia $(X86_ONLY)neomagic $(X86_ONLY)matrox $(X86_ONLY)intel_extreme $(X86_ONLY)s3 $(X86_ONLY)vesa #$(X86_ONLY)via #$(X86_ONLY)vmware @@ -225,6 +226,7 @@ <kdebug>invalidate_on_exit <kdebug>usb_keyboard <kdebug>run_on_exit ; AddFilesToHaikuImage system add-ons kernel file_systems : $(SYSTEM_ADD_ONS_FILE_SYSTEMS) ; +AddFilesToHaikuImage system add-ons kernel drm : drm ; AddFilesToHaikuImage system add-ons kernel generic : $(ATA_ONLY)ata_adapter dpc $(IDE_ONLY)ide_adapter locked_pool mpu401 scsi_periph ; @@ -251,6 +253,7 @@ AddDriversToHaikuImage bus : usb_raw fw_raw ; AddDriversToHaikuImage disk floppy : $(X86_ONLY)pc_floppy ; AddDriversToHaikuImage disk usb : usb_disk ; +AddDriversToHaikuImage drm : $(SYSTEM_ADD_ONS_DRIVERS_DRM) ; AddDriversToHaikuImage printer usb : usb_printer ; AddDriversToHaikuImage disk virtual : nbd ; AddDriversToHaikuImage dvb : cx23882 ; @@ -302,10 +305,10 @@ # dri libs SYSTEM_DRI_LIBS = - <gallium>i915_dri.so - <gallium>vmwgfx_dri.so +# <gallium>i915_dri.so +# <gallium>vmwgfx_dri.so ; -AddFilesToHaikuHybridImage system lib dri : $(SYSTEM_DRI_LIBS) : : true ; +#AddFilesToHaikuHybridImage system lib dri : $(SYSTEM_DRI_LIBS) : : true ; # servers AddFilesToHaikuImage system servers : $(SYSTEM_SERVERS) ; @@ -518,8 +521,8 @@ # add-ons AddFilesToHaikuImage system add-ons accelerants : $(SYSTEM_ADD_ONS_ACCELERANTS) ; -AddFilesToHaikuImage system add-ons opengl - : SoftPipe ; +#AddFilesToHaikuImage system add-ons opengl +# : SoftPipe ; AddFilesToHaikuHybridImage system add-ons Translators : $(SYSTEM_ADD_ONS_TRANSLATORS) : : true ; AddFilesToHaikuImage system add-ons locale catalogs