[QuantLibAddin-cvs] QuantLibAddin/Addins/C AddinC.vcproj, 1.5, 1.6 AddinC_vc8.vcproj, 1.6, 1.7 auto_link.h, 1.3, 1.4

[Eric E. <eri...@us...>]

Update of /cvsroot/quantlibaddin/QuantLibAddin/Addins/C
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv25176/Addins/C

Modified Files:
	AddinC.vcproj AddinC_vc8.vcproj auto_link.h 
Log Message:
merge branch and increment version number

Index: auto_link.h
===================================================================
RCS file: /cvsroot/quantlibaddin/QuantLibAddin/Addins/C/auto_link.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** auto_link.h	11 Oct 2006 13:39:05 -0000	1.3
--- auto_link.h	14 Dec 2006 12:29:48 -0000	1.4
***************
*** 19,22 ****
--- 19,24 ----
  #define qla_c_autolink_hpp
  
+ #pragma warning(disable : 4996)
+ 
  // select toolset:
  #if (_MSC_VER < 1300)
***************
*** 56,61 ****
  #endif
  
! #define OH_LIB_NAME "ObjectHandler-" LIB_TOOLSET LIB_THREAD_OPT LIB_RT_OPT "-0_1_4.lib"
! #define QL_LIB_NAME "QuantLib-" LIB_TOOLSET LIB_THREAD_OPT LIB_RT_OPT "-0_3_14.lib"
  
  #pragma message("Linking to lib file: " OH_LIB_NAME)
--- 58,63 ----
  #endif
  
! #define OH_LIB_NAME "ObjectHandler-" LIB_TOOLSET LIB_THREAD_OPT LIB_RT_OPT "-0_2_0.lib"
! #define QL_LIB_NAME "QuantLib-" LIB_TOOLSET LIB_THREAD_OPT LIB_RT_OPT "-0_4_0.lib"
  
  #pragma message("Linking to lib file: " OH_LIB_NAME)

Index: AddinC.vcproj
===================================================================
RCS file: /cvsroot/quantlibaddin/QuantLibAddin/Addins/C/AddinC.vcproj,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** AddinC.vcproj	4 Oct 2006 14:25:56 -0000	1.5
--- AddinC.vcproj	14 Dec 2006 12:29:48 -0000	1.6
***************
*** 40,44 ****
  			<Tool
  				Name="VCLibrarianTool"
! 				OutputFile="lib\AddinC-vc71-mt-gd-0_3_14.lib"
  				SuppressStartupBanner="TRUE"/>
  			<Tool
--- 40,44 ----
  			<Tool
  				Name="VCLibrarianTool"
! 				OutputFile="lib\AddinC-vc71-mt-gd-0_4_0.lib"
  				SuppressStartupBanner="TRUE"/>
  			<Tool
***************
*** 93,97 ****
  			<Tool
  				Name="VCLibrarianTool"
! 				OutputFile="lib\AddinC-vc71-mt-0_3_14.lib"
  				SuppressStartupBanner="TRUE"/>
  			<Tool
--- 93,97 ----
  			<Tool
  				Name="VCLibrarianTool"
! 				OutputFile="lib\AddinC-vc71-mt-0_4_0.lib"
  				SuppressStartupBanner="TRUE"/>
  			<Tool
***************
*** 148,151 ****
--- 148,154 ----
  			</File>
  			<File
+ 				RelativePath=".\settings.cpp">
+ 			</File>
+ 			<File
  				RelativePath="varies.cpp">
  			</File>
***************
*** 158,161 ****
--- 161,167 ----
  			Filter="h;hpp;hxx;hm;inl">
  			<File
+ 				RelativePath=".\auto_link.h">
+ 			</File>
+ 			<File
  				RelativePath="conversions.hpp">
  			</File>
***************
*** 188,191 ****
--- 194,200 ----
  			</File>
  			<File
+ 				RelativePath=".\settings.h">
+ 			</File>
+ 			<File
  				RelativePath="varies.h">
  			</File>

Index: AddinC_vc8.vcproj
===================================================================
RCS file: /cvsroot/quantlibaddin/QuantLibAddin/Addins/C/AddinC_vc8.vcproj,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** AddinC_vc8.vcproj	4 Oct 2006 14:25:57 -0000	1.6
--- AddinC_vc8.vcproj	14 Dec 2006 12:29:48 -0000	1.7
***************
*** 69,73 ****
  			<Tool
  				Name="VCLibrarianTool"
! 				OutputFile="lib\AddinC-vc80-mt-sgd-0_3_14.lib"
  				SuppressStartupBanner="true"
  			/>
--- 69,73 ----
  			<Tool
  				Name="VCLibrarianTool"
! 				OutputFile="lib\AddinC-vc80-mt-sgd-0_4_0.lib"
  				SuppressStartupBanner="true"
  			/>
***************
*** 145,149 ****
  			<Tool
  				Name="VCLibrarianTool"
! 				OutputFile="lib\AddinC-vc80-mt-gd-0_3_14.lib"
  				SuppressStartupBanner="true"
  			/>
--- 145,149 ----
  			<Tool
  				Name="VCLibrarianTool"
! 				OutputFile="lib\AddinC-vc80-mt-gd-0_4_0.lib"
  				SuppressStartupBanner="true"
  			/>
***************
*** 221,225 ****
  			<Tool
  				Name="VCLibrarianTool"
! 				OutputFile="lib\AddinC-vc80-mt-0_3_14.lib"
  				SuppressStartupBanner="true"
  			/>
--- 221,225 ----
  			<Tool
  				Name="VCLibrarianTool"
! 				OutputFile="lib\AddinC-vc80-mt-0_4_0.lib"
  				SuppressStartupBanner="true"
  			/>
***************
*** 297,301 ****
  			<Tool
  				Name="VCLibrarianTool"
! 				OutputFile="lib\AddinC-vc80-mt-s-0_3_14.lib"
  				SuppressStartupBanner="true"
  			/>
--- 297,301 ----
  			<Tool
  				Name="VCLibrarianTool"
! 				OutputFile="lib\AddinC-vc80-mt-s-0_4_0.lib"
  				SuppressStartupBanner="true"
  			/>
***************
*** 359,362 ****
--- 359,366 ----
  			</File>
  			<File
+ 				RelativePath=".\settings.cpp"
+ 				>
+ 			</File>
+ 			<File
  				RelativePath="varies.cpp"
  				>
***************
*** 416,419 ****
--- 420,427 ----
  			</File>
  			<File
+ 				RelativePath=".\settings.h"
+ 				>
+ 			</File>
+ 			<File
  				RelativePath="varies.h"
  				>