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

Beginnings of an optional "Development" package. Currently only the glue

Browse Source 
code and the library symlinks are installed.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@23895 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold
2008-02-06 13:22:14 +00:00
parent 0b26e0b1d4
commit b2b8943d50
1 changed files with 27 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/HaikuImage
+27 -8
View File
@@ -61,7 +61,7 @@ BEOS_DEMOS = BitmapDrawing BSnow Chart Clock $(X86_ONLY)Cortex FontDemo
$(X86_ONLY)GLDirectMode $(X86_ONLY)GLTeapot Mandelbrot PictureTest $(X86_ONLY)GLDirectMode $(X86_ONLY)GLTeapot Mandelbrot PictureTest
Playground Pulse Sudoku Playground Pulse Sudoku
; ;
BEOS_SYSTEM_LIB = libbe.so $(HAIKU_LIBSTDC++) libmedia.so libtracker.so BEOS_SYSTEM_LIBS = libbe.so $(HAIKU_LIBSTDC++) libmedia.so libtracker.so
libtranslation.so libnetwork.so libdebug.so libbsd.so libmail.so libtranslation.so libnetwork.so libdebug.so libbsd.so libmail.so
libtextencoding.so libz.so libfreetype.so libpng.so libmidi.so libmidi2.so libtextencoding.so libz.so libfreetype.so libpng.so libmidi.so libmidi2.so
libdevice.so libgame.so libscreensaver.so <revisioned>libroot.so libdevice.so libgame.so libscreensaver.so <revisioned>libroot.so
@@ -176,14 +176,18 @@ AddDriversToHaikuImage net : $(BEOS_ADD_ONS_DRIVERS_NET) ;
AddFilesToHaikuImage beos system : <revisioned>kernel_$(TARGET_ARCH) ; AddFilesToHaikuImage beos system : <revisioned>kernel_$(TARGET_ARCH) ;
# libs # libs
AddFilesToHaikuImage beos system lib : $(BEOS_SYSTEM_LIB) ; AddFilesToHaikuImage beos system lib : $(BEOS_SYSTEM_LIBS) ;
# libnetwork.so replaces quite a few libraries # libnetwork.so replaces quite a few libraries
AddSymlinkToHaikuImage beos system lib : libnetwork.so : libsocket.so ; BEOS_SYSTEM_LIBS_LIBNETWORK_ALIASES
AddSymlinkToHaikuImage beos system lib : libnetwork.so : libbind.so ; = libsocket.so libbind.so libnet.so libnetapi.so libbnetapi.so ;
AddSymlinkToHaikuImage beos system lib : libnetwork.so : libnet.so ;
AddSymlinkToHaikuImage beos system lib : libnetwork.so : libnetapi.so ; local lib ;
AddSymlinkToHaikuImage beos system lib : libnetwork.so : libbnetapi.so ; for lib in $(BEOS_SYSTEM_LIBS_LIBNETWORK_ALIASES) {
# libGL.so have GLUT built-in AddSymlinkToHaikuImage beos system lib : libnetwork.so : $(lib) ;
}
# libGL.so has GLUT built-in
if $(TARGET_ARCH) = x86 { if $(TARGET_ARCH) = x86 {
AddSymlinkToHaikuImage beos system lib : $(X86_ONLY)libGL.so : libglut.so ; AddSymlinkToHaikuImage beos system lib : $(X86_ONLY)libGL.so : libglut.so ;
} }
@@ -473,6 +477,21 @@ if $(HAIKU_ADD_POSIX_TEST_SUITE_TO_IMAGE) {
#pragma mark - Optional Packages #pragma mark - Optional Packages
# Development
if [ IsOptionalHaikuImagePackageAdded Development ]
&& $(TARGET_ARCH) = x86 {
# glue code
AddFilesToHaikuImage develop lib x86
: <src!system!glue!arch!x86>crti.o <src!system!glue!arch!x86>crtn.o
<src!system!glue>init_term_dyn.o <src!system!glue>start_dyn.o ;
# library symlinks
local lib ;
for lib in $(BEOS_SYSTEM_LIBS) $(BEOS_SYSTEM_LIBS_LIBNETWORK_ALIASES) {
AddSymlinkToHaikuImage develop lib x86 : /system/lib/$(lib:BS) ;
}
}
# Vision # Vision
if [ IsOptionalHaikuImagePackageAdded Vision ] { if [ IsOptionalHaikuImagePackageAdded Vision ] {
InstallOptionalHaikuImagePackage Vision InstallOptionalHaikuImagePackage Vision