Browse Source

EXTRA_IPATH, EXTRA_LPATH

David Rose 20 years ago
parent
commit
a79366061a

+ 1 - 1
dtool/pptempl/Template.gmsvc.pp

@@ -136,7 +136,7 @@
 
 
 // $[complete_lpath] is rather like $[complete_ipath]: the list of
 // $[complete_lpath] is rather like $[complete_ipath]: the list of
 // directories (from within this tree) we should add to our -L list.
 // directories (from within this tree) we should add to our -L list.
-#defer complete_lpath $[static_libs $[RELDIR:%=%/$[ODIR]],$[actual_local_libs]] $[dynamic_libs $[RELDIR:%=%/$[ODIR]],$[actual_local_libs]]
+#defer complete_lpath $[static_libs $[RELDIR:%=%/$[ODIR]],$[actual_local_libs]] $[dynamic_libs $[RELDIR:%=%/$[ODIR]],$[actual_local_libs]] $[EXTRA_LPATH]
 
 
 // $[lpath] is like $[target_ipath]: it's the list of directories we
 // $[lpath] is like $[target_ipath]: it's the list of directories we
 // should add to our -L list, from the context of a particular target.
 // should add to our -L list, from the context of a particular target.

+ 2 - 2
dtool/pptempl/Template.msvc.pp

@@ -149,7 +149,7 @@
 // each directory named in the $[complete_local_libs], above, plus
 // each directory named in the $[complete_local_libs], above, plus
 // whatever else the user might have explicitly named in
 // whatever else the user might have explicitly named in
 // $[LOCAL_INCS].
 // $[LOCAL_INCS].
-#defer complete_ipath $[all_libs $[RELDIR],$[complete_local_libs]] $[RELDIR($[LOCAL_INCS:%=%\])]
+#defer complete_ipath $[all_libs $[RELDIR],$[complete_local_libs]] $[RELDIR($[LOCAL_INCS:%=%\])] $[EXTRA_IPATH]
 
 
 // $[target_ipath] is the proper ipath to put on the command line,
 // $[target_ipath] is the proper ipath to put on the command line,
 // from the context of a particular target.
 // from the context of a particular target.
@@ -175,7 +175,7 @@
 
 
 // $[complete_lpath] is rather like $[complete_ipath]: the list of
 // $[complete_lpath] is rather like $[complete_ipath]: the list of
 // directories (from within this tree) we should add to our -L list.
 // directories (from within this tree) we should add to our -L list.
-#defer complete_lpath $[static_libs $[RELDIR:%=%\$[ODIR]],$[actual_local_libs]] $[dynamic_libs $[RELDIR:%=%\$[ODIR]],$[actual_local_libs]]
+#defer complete_lpath $[static_libs $[RELDIR:%=%\$[ODIR]],$[actual_local_libs]] $[dynamic_libs $[RELDIR:%=%\$[ODIR]],$[actual_local_libs]] $[EXTRA_LPATH]
 
 
 // $[lpath] is like $[target_ipath]: it's the list of directories we
 // $[lpath] is like $[target_ipath]: it's the list of directories we
 // should add to our -L list, from the context of a particular target.
 // should add to our -L list, from the context of a particular target.

+ 2 - 2
dtool/pptempl/Template.unix.pp

@@ -98,7 +98,7 @@
 // each directory named in the $[complete_local_libs], above, plus
 // each directory named in the $[complete_local_libs], above, plus
 // whatever else the user might have explicitly named in
 // whatever else the user might have explicitly named in
 // $[LOCAL_INCS].
 // $[LOCAL_INCS].
-#defer complete_ipath $[all_libs $[RELDIR],$[complete_local_libs]] $[RELDIR($[LOCAL_INCS:%=%/])]
+#defer complete_ipath $[all_libs $[RELDIR],$[complete_local_libs]] $[RELDIR($[LOCAL_INCS:%=%/])] $[EXTRA_IPATH]
 
 
 // $[target_ipath] is the proper ipath to put on the command line,
 // $[target_ipath] is the proper ipath to put on the command line,
 // from the context of a particular target.
 // from the context of a particular target.
@@ -112,7 +112,7 @@
 
 
 // $[complete_lpath] is rather like $[complete_ipath]: the list of
 // $[complete_lpath] is rather like $[complete_ipath]: the list of
 // directories (from within this tree) we should add to our -L list.
 // directories (from within this tree) we should add to our -L list.
-#defer complete_lpath $[static_libs $[RELDIR:%=%/$[ODIR]],$[actual_local_libs]] $[dynamic_libs $[RELDIR:%=%/$[ODIR]],$[actual_local_libs]]
+#defer complete_lpath $[static_libs $[RELDIR:%=%/$[ODIR]],$[actual_local_libs]] $[dynamic_libs $[RELDIR:%=%/$[ODIR]],$[actual_local_libs]] $[EXTRA_LPATH]
 
 
 // $[lpath] is like $[target_ipath]: it's the list of directories we
 // $[lpath] is like $[target_ipath]: it's the list of directories we
 // should add to our -L list, from the context of a particular target.
 // should add to our -L list, from the context of a particular target.