[haiku-commits] haiku: hrev43657 - build/jam
- From: kallisti5@xxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Sat, 14 Jan 2012 00:37:24 +0100 (CET)
hrev43657 adds 1 changeset to branch 'master'
old head: 58dbd25f6bcb8a60779cd3cca5ffa739d497e3a7
new head: eb3e3882414af34845463a23293a47190a3ff1bf
----------------------------------------------------------------------------
eb3e388: GL: Disable OpenGL applications and libraries on non-x86
* This should definitely be undone once we figure out a
way to cross compile stuff under haiku.
* setgcc ppc gcc4 anyone?
[ Alexander von Gluck IV <kallisti5@xxxxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev43657
Commit: eb3e3882414af34845463a23293a47190a3ff1bf
URL: http://cgit.haiku-os.org/haiku/commit/?id=eb3e388
Author: Alexander von Gluck IV <kallisti5@xxxxxxxxxxx>
Date: Fri Jan 13 23:42:45 2012 UTC
----------------------------------------------------------------------------
1 files changed, 15 insertions(+), 11 deletions(-)
build/jam/HaikuImage | 26 +++++++++++++++-----------
----------------------------------------------------------------------------
diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage
index ebbac1c..972856d 100644
--- a/build/jam/HaikuImage
+++ b/build/jam/HaikuImage
@@ -73,18 +73,18 @@ SYSTEM_APPS = AboutSystem ActivityMonitor
$(X86_ONLY)BootManager CharacterMap
;
SYSTEM_PREFERENCES = Appearance Backgrounds CPUFrequency DataTranslations
<preference>Deskbar E-mail FileTypes Fonts Keyboard Keymap Locale Media
- Mouse Network Notifications OpenGL Printers Screen ScreenSaver Shortcuts
- Sounds Time Touchpad <preference>Tracker VirtualMemory
+ Mouse Network Notifications $(X86_ONLY)OpenGL Printers Screen
ScreenSaver
+ Shortcuts Sounds Time Touchpad <preference>Tracker VirtualMemory
;
-SYSTEM_DEMOS = BSnow Chart Clock Cortex FontDemo GLTeapot
- $(HAIKU_INCLUDE_TRADEMARKS)Haiku3d Mandelbrot OverlayImage Pairs
Playground
- Pulse Sudoku
+SYSTEM_DEMOS = BSnow Chart Clock Cortex FontDemo $(X86_ONLY)GLTeapot
+ $(HAIKU_INCLUDE_TRADEMARKS)$(X86_ONLY)Haiku3d Mandelbrot OverlayImage
Pairs
+ Playground Pulse Sudoku
;
SYSTEM_LIBS =
libbe.so libbsd.so libbnetapi.so
libdebug.so libdevice.so
libfreetype.so
- libgame.so libGL.so libgnu.so
+ libgame.so $(X86_ONLY)libGL.so libgnu.so
libjpeg.so
liblocale.so
libmail.so libmedia.so libmidi.so libmidi2.so
@@ -158,7 +158,7 @@ SYSTEM_ADD_ONS_PRINT_TRANSPORT = HP\ JetDirect IPP LPR
# Parallel\ Port
Print\ To\ File Serial\ Port USB\ Port
;
-SYSTEM_ADD_ONS_SCREENSAVERS = Butterfly DebugNow Flurry
+SYSTEM_ADD_ONS_SCREENSAVERS = Butterfly DebugNow $(X86_ONLY)Flurry
$(HAIKU_INCLUDE_TRADEMARKS)Haiku Icons IFS Leaves Message Spider ;
SYSTEM_ADD_ONS_DRIVERS_AUDIO = auich auvia echo3g emuxki hda sis7018 ;
SYSTEM_ADD_ONS_DRIVERS_AUDIO_OLD = ; #cmedia usb_audio ;
@@ -587,8 +587,10 @@ AddBootModuleSymlinksToHaikuImage
# add-ons
AddFilesToHaikuImage system add-ons accelerants
: $(SYSTEM_ADD_ONS_ACCELERANTS) ;
-AddFilesToHaikuHybridImage system add-ons opengl
- : Mesa\ Software\ Renderer : : true ;
+if $(TARGET_ARCH) = x86 {
+ AddFilesToHaikuHybridImage system add-ons opengl
+ : Mesa\ Software\ Renderer : : true ;
+}
AddFilesToHaikuHybridImage system add-ons Translators
: $(SYSTEM_ADD_ONS_TRANSLATORS) : : true ;
AddFilesToHaikuImage system add-ons locale catalogs
@@ -709,8 +711,10 @@ CopyDirectoryToHaikuImage develop sample-code
: pdflib : -x .svn ;
# Copy Mesa3D GL headers into image
-CopyDirectoryToHaikuImage develop headers os opengl
- : [ FDirName $(HAIKU_MESA_HEADERS) GL ] : : -x .svn ;
+if $(TARGET_ARCH) = x86 {
+ CopyDirectoryToHaikuImage develop headers os opengl
+ : [ FDirName $(HAIKU_MESA_HEADERS) GL ] : : -x .svn ;
+}
#pragma mark - Optional Packages
Other related posts: