From fadbe6cd6df5032ee86578d094b98ba8cd159922 Mon Sep 17 00:00:00 2001
From: Jerome Carretero <cJ@zougloub.eu>
Date: Fri, 20 Jan 2012 09:58:55 -0500
Subject: [PATCH] ticgt: support stlib

---
 playground/ti/wscript  | 19 +++++++++++--------
 waflib/extras/ticgt.py |  6 +++---
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/playground/ti/wscript b/playground/ti/wscript
index fde0db87..4595bc51 100644
--- a/playground/ti/wscript
+++ b/playground/ti/wscript
@@ -3,11 +3,6 @@
 # Jérôme Carretero, 2012 (zougloub)
 # Put this file in ti-dsplink-tree/dsplink/dsp/src/samples/message
 
-
-import os, sys
-
-opj = os.path.join
-
 def options(opt):
 	opt.load('ticgt')
 
@@ -35,15 +30,23 @@ def build(bld):
 	)
 
 	bld(
-	 target='message-demo',
-	 features='c cprogram',
+	 target='messagelib',
+	 features='c cstlib',
 	 source=bld.path.ant_glob('*.c'),
 	 use=[
 	  'DSPBIOS', 'DSPLINK',
-	  'message',
 	 ],
 	 # Taken from DSP/Link generated _defines.txt files, replaced a -D by a -d
 	 defines=' -dTSK_MODE -dDDSP_DEBUG -dMAX_DSPS=1 -dMAX_PROCESSORS=2 -dID_GPP=1 -dOMAPL138 -dPROC_COMPONENT -dPOOL_COMPONENT -dNOTIFY_COMPONENT -dMPCS_COMPONENT -dRINGIO_COMPONENT -dMPLIST_COMPONENT -dMSGQ_COMPONENT -dMSGQ_ZCPY_LINK -dCHNL_COMPONENT -dCHNL_ZCPY_LINK -dZCPY_LINK -dPROCID=0 -dDA8XXGEM -dDA8XXGEM_INTERFACE=SHMEM_INTERFACE -dPHYINTERFACE=SHMEM_INTERFACE -dDSP_SWI_MODE'.split(" -d")[1:] + [
 	 ],
 	)
 
+	bld(
+	 target='message-demo',
+	 features='c cprogram',
+	 use=[
+	  'messagelib',
+	  'message',
+	 ],
+	)
+
diff --git a/waflib/extras/ticgt.py b/waflib/extras/ticgt.py
index 92c8e87e..f4c82562 100644
--- a/waflib/extras/ticgt.py
+++ b/waflib/extras/ticgt.py
@@ -31,7 +31,7 @@ def find_tiar(conf):
 	ar = conf.cmd_to_list(ar)
 	conf.env.AR = ar
 	conf.env.AR_NAME = 'tiar'
-	conf.env.ARFLAGS = 'rcs'
+	conf.env.ARFLAGS = 'qru'
 
 @conf
 def ticc_common_flags(conf):
@@ -45,7 +45,7 @@ def ticc_common_flags(conf):
 
 	v['LIB_ST']	      = '-l%s' # template for adding libs
 	v['LIBPATH_ST']	  = '-i%s' # template for adding libpaths
-	v['STLIB_ST']	    = '-l%s'
+	v['STLIB_ST']	    = '-l=%s.lib'
 	v['STLIBPATH_ST']	= '-i%s'
 
 	# program
@@ -53,7 +53,7 @@ def ticc_common_flags(conf):
 
 	# static lib
 	#v['LINKFLAGS_cstlib']    = ['-Wl,-Bstatic']
-	v['cstlib_PATTERN']      = 'lib%s.a'
+	v['cstlib_PATTERN']      = '%s.lib'
 
 def configure(conf):
 	v = conf.env