boost/build
2
0
Fork 0
mirror of https://github.com/boostorg/build.git synced 2026-02-20 02:32:13 +00:00
Code Issues Projects Releases Wiki Activity

More QT fixes.

Browse Source 
* new/qt.jam:
    (add-properties): Really, using gcc-specific <linkflags> wasn't the
    best idea of mine. Use toolset independent flags now.

* new/borland.jam: Handle <find-static-lib> and <find-shared-lib>

* new/kylix.jam: Add link action and handle libraries.


[SVN r17003]
This commit is contained in:
Vladimir Prus
2003-01-23 11:11:36 +00:00
parent 85d01052a6
commit bcc1f33b35
8 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
new/borland.jam
View File

@@ -45,13 +45,15 @@ actions compile
# Declare flags and action for linking
toolset.flags borland.link OPTIONS <debug-symbols>on : -v ;
toolset.flags borland.link LINKPATH <library-path> ;
toolset.flags borland.link FINDLIBS <find-library> ;
toolset.flags borland.link FINDLIBS-ST <find-static-library> ;
toolset.flags borland.link FINDLIBS-SA <find-shared-library> ;
toolset.flags borland.link LIBRARIES <library-file> ;
toolset.flags borland.link LIBRARIES <library> ;
toolset.flags gcc.link-dll LINKPATH <library-path> ;
actions link bind LIBRARIES
{
$(LINKER_NAME) $(OPTIONS) -q -L$(LINKPATH) -e$(<[1]) $(>) $(LIBRARIES) -l$(FINDLIBS)
$(LINKER_NAME) $(OPTIONS) -q -L$(LINKPATH) -e$(<[1]) $(>) $(LIBRARIES) $(FINDLIBS-ST).lib lib$(FINDLIBS-SA).dll
}
# Declare action for archives

6
new/kylix.jam
View File

@@ -14,3 +14,9 @@ toolset.inherit kylix : borland ;
COMPILER_NAME = bc++ ;
LINKER_NAME = bc++ ;
actions link bind LIBRARIES
{
$(LINKER_NAME) $(OPTIONS) -q -L$(LINKPATH) -e$(<[1]) $(>) $(LIBRARIES) lib$(FINDLIBS-ST).a lib$(FINDLIBS-SA).so
}

2
new/qt.jam
View File

@@ -69,7 +69,7 @@ rule init ( prefix ? )
rule qt.add-properties ( property )
{
return <include>$(.prefix)/include <linkflags>-Wl,-rpath,$(.prefix)/lib <linkflags>-L$(.prefix)/lib <linkflags>-lqt-mt ;
return <include>$(.prefix)/include <dll-path>$(.prefix)/lib <library-path>$(.prefix)/lib <find-shared-library>qt-mt ;
}
# -f forces moc to include the processed source file.

2
new/targets.jam
View File

@@ -445,7 +445,7 @@ rule generate-dependencies ( properties * : project : extra-properties * )
# targets.
rule basic-target ( name : project
: sources * : requirements * : default-build * : usage-requirements * )
{
{
import build-request ;
import virtual-target ;

6
v2/borland.jam
View File

@@ -45,13 +45,15 @@ actions compile
# Declare flags and action for linking
toolset.flags borland.link OPTIONS <debug-symbols>on : -v ;
toolset.flags borland.link LINKPATH <library-path> ;
toolset.flags borland.link FINDLIBS <find-library> ;
toolset.flags borland.link FINDLIBS-ST <find-static-library> ;
toolset.flags borland.link FINDLIBS-SA <find-shared-library> ;
toolset.flags borland.link LIBRARIES <library-file> ;
toolset.flags borland.link LIBRARIES <library> ;
toolset.flags gcc.link-dll LINKPATH <library-path> ;
actions link bind LIBRARIES
{
$(LINKER_NAME) $(OPTIONS) -q -L$(LINKPATH) -e$(<[1]) $(>) $(LIBRARIES) -l$(FINDLIBS)
$(LINKER_NAME) $(OPTIONS) -q -L$(LINKPATH) -e$(<[1]) $(>) $(LIBRARIES) $(FINDLIBS-ST).lib lib$(FINDLIBS-SA).dll
}
# Declare action for archives

2
v2/build/targets.jam
View File

@@ -445,7 +445,7 @@ rule generate-dependencies ( properties * : project : extra-properties * )
# targets.
rule basic-target ( name : project
: sources * : requirements * : default-build * : usage-requirements * )
{
{
import build-request ;
import virtual-target ;

6
v2/kylix.jam
View File

@@ -14,3 +14,9 @@ toolset.inherit kylix : borland ;
COMPILER_NAME = bc++ ;
LINKER_NAME = bc++ ;
actions link bind LIBRARIES
{
$(LINKER_NAME) $(OPTIONS) -q -L$(LINKPATH) -e$(<[1]) $(>) $(LIBRARIES) lib$(FINDLIBS-ST).a lib$(FINDLIBS-SA).so
}

2
v2/qt.jam
View File

@@ -69,7 +69,7 @@ rule init ( prefix ? )
rule qt.add-properties ( property )
{
return <include>$(.prefix)/include <linkflags>-Wl,-rpath,$(.prefix)/lib <linkflags>-L$(.prefix)/lib <linkflags>-lqt-mt ;
return <include>$(.prefix)/include <dll-path>$(.prefix)/lib <library-path>$(.prefix)/lib <find-shared-library>qt-mt ;
}
# -f forces moc to include the processed source file.