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

added opengl to SetupInclude

Browse Source 
StaticLibrary now accepts static libraries to include (note that jam should be rebuilt)
LibraryFromObjects doesn't FGristFiles now, but Library does


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@13119 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Jérôme Duval
2005-06-14 15:22:55 +00:00
parent a1a86b0306
commit 1cc148a946
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jamrules
+7 -4
View File
@@ -313,12 +313,11 @@ OBOS_FLOPPY = floppy.$(OBOS_ARCH) ;
rule SetupIncludes rule SetupIncludes
{ {
# XXX add "opengl" later
local os_includes = add-ons add-ons/file_system add-ons/graphics local os_includes = add-ons add-ons/file_system add-ons/graphics
add-ons/input_server add-ons/screen_saver add-ons/input_server add-ons/screen_saver
add-ons/tracker app device drivers game interface add-ons/tracker app device drivers game interface
kernel media mail midi midi2 net storage support kernel media mail midi midi2 net storage support
translation ; translation opengl ;
# Overwrite any exiting content when changing HDRS. This rule may be invoked multiple times. # Overwrite any exiting content when changing HDRS. This rule may be invoked multiple times.
@@ -903,7 +902,7 @@ rule MakeLocateObjects
rule StaticLibrary rule StaticLibrary
{ {
# StaticLibrary <name> : <sources> [ : <target dir> ] ; # StaticLibrary <name> : <sources> [ : <target dir> [ : <static libraries> ] ] ;
# Creates a static library from sources. # Creates a static library from sources.
# <name>: Basename of the library, without leading "lib" and trailing ".a". # <name>: Basename of the library, without leading "lib" and trailing ".a".
# Grist is allowed -- it will be re-prepended after constructing # Grist is allowed -- it will be re-prepended after constructing
@@ -914,13 +913,17 @@ rule StaticLibrary
# STATIC_LIBRARY_DIR is supplied (the literal string) # STATIC_LIBRARY_DIR is supplied (the literal string)
# the standard directory for static libs is used, otherwise # the standard directory for static libs is used, otherwise
# the parameter is interpreted as directory path. # the parameter is interpreted as directory path.
# # <static libraries>: static libraries to include (ie: libmesa_x86.a)
local lib = lib$(1:B)$(SUFLIB) ; local lib = lib$(1:B)$(SUFLIB) ;
lib = $(lib:G=$(1:G)) ; lib = $(lib:G=$(1:G)) ;
SetupIncludes ; SetupIncludes ;
SetupObjectsDir ; SetupObjectsDir ;
MakeLocateObjects $(2) ; MakeLocateObjects $(2) ;
Library $(lib) : $(2) ; Library $(lib) : $(2) ;
if $(4) {
LibraryFromObjects $(lib) : $(4) ;
}
local targetDir = $(3) ; local targetDir = $(3) ;
if $(targetDir) { if $(targetDir) {
if $(targetDir) = STATIC_LIBRARY_DIR { if $(targetDir) = STATIC_LIBRARY_DIR {
src/tools/jam/Jambase
+2 -2
View File
@@ -827,7 +827,7 @@ rule Lex
rule Library rule Library
{ {
LibraryFromObjects $(<) : $(>:S=$(SUFOBJ)) ; LibraryFromObjects $(<) : [ FGristFiles $(>:S=$(SUFOBJ)) ] ;
Objects $(>) ; Objects $(>) ;
} }
@@ -837,7 +837,7 @@ rule LibraryFromObjects
# Add grist to file names # Add grist to file names
_s = [ FGristFiles $(>) ] ; _s = $(>) ;
_l = $(<:S=$(SUFLIB)) ; _l = $(<:S=$(SUFLIB)) ;
# library depends on its member objects # library depends on its member objects