Update of /cvsroot/quantlibaddin/QuantLibAddin/Addins/Calc
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv8613/Addins/Calc
Modified Files:
Tag: R000313f0-branch
AddinCalc.vcproj Makefile.vc qladdin.cpp
Log Message:
fixes for calc build environment
Index: Makefile.vc
===================================================================
RCS file: /cvsroot/quantlibaddin/QuantLibAddin/Addins/Calc/Attic/Makefile.vc,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** Makefile.vc 2 Aug 2006 13:03:46 -0000 1.1.2.1
--- Makefile.vc 10 Aug 2006 15:48:09 -0000 1.1.2.2
***************
*** 1,7 ****
OFFICE_PROGRAM_PATH=C:\Program Files\OpenOffice.org 2.0\program
OFFICE_SDK_PATH=C:\OpenOffice.org_2.0_SDK
COMPONENT_NAME=QuantLibAddinCalc
! DLL_NAME=$(COMPONENT_NAME)-vc71-mt-gd-0_3_12
DLL_DIR=dll
INT_DIR=build\vc71\DebugCRTDLL
--- 1,12 ----
+ # makefile for Calc Addin
+ # this makefile supports only one build environment:
+ # VC7 (Visual Studio 2003), configuration "Release CRTDLL"
+ # for further info: http://www.quantlibaddin.org/calc.html
+
OFFICE_PROGRAM_PATH=C:\Program Files\OpenOffice.org 2.0\program
OFFICE_SDK_PATH=C:\OpenOffice.org_2.0_SDK
COMPONENT_NAME=QuantLibAddinCalc
! DLL_NAME=$(COMPONENT_NAME)-vc71-mt-0_3_13
DLL_DIR=dll
INT_DIR=build\vc71\DebugCRTDLL
***************
*** 19,24 ****
FLAG6=$(INT_DIR)\$(COMPONENT_NAME).flag6
! CC_INCLUDES=-I. -I..\.. -I"$(QL_DIR)" -I"$(OBJECT_HANDLER_DIR)" \
! -I"$(LOG4CXX_DIR)/include" -I"$(OFFICE_SDK_PATH)\include"
CC_FLAGS=/c /nologo /MD /GX /GR \
--- 24,31 ----
FLAG6=$(INT_DIR)\$(COMPONENT_NAME).flag6
! CC_INCLUDES=-I. -I..\.. \
! -I"$(QL_DIR)" -I"$(QL_DIR)\functions" \
! -I"$(OBJECT_HANDLER_DIR)" \
! -I"$(OFFICE_SDK_PATH)\include"
CC_FLAGS=/c /nologo /MD /GX /GR \
***************
*** 26,50 ****
/DWIN32 /DWNT /DCPPU_ENV=msci /Fo"$(INT_DIR)\\"
- # - CC_FLAGS that will be required for debug build
- #/Zi full debug info in pdb
- #/Od disable optimization
- #/GZ runtime error checks
- # - other defines that may be needed?
- #CC_DEFINES=/D_DEBUG /DWINDOWS /D_MBCS /D_USRDLL
-
OBJECTS= \
"$(INT_DIR)\calcutils.obj" \
"$(INT_DIR)\conversions.obj" \
"$(INT_DIR)\exercise.obj" \
"$(INT_DIR)\funcdef.obj" \
"$(INT_DIR)\options.obj" \
"$(INT_DIR)\payoffs.obj" \
"$(INT_DIR)\pricingengines.obj" \
"$(INT_DIR)\processes.obj" \
"$(INT_DIR)\qladdin.obj" \
"$(INT_DIR)\session.obj" \
"$(INT_DIR)\utilities.obj" \
"$(INT_DIR)\volatilities.obj"
!
LFLAGS=/nologo /dll /out:$(DLL_FILE) \
/def:.\$(COMPONENT_NAME).def \
--- 33,71 ----
/DWIN32 /DWNT /DCPPU_ENV=msci /Fo"$(INT_DIR)\\"
OBJECTS= \
+ "$(INT_DIR)\bonds.obj" \
"$(INT_DIR)\calcutils.obj" \
+ "$(INT_DIR)\calendar.obj" \
+ "$(INT_DIR)\capfloor.obj" \
+ "$(INT_DIR)\capletvolstructure.obj" \
"$(INT_DIR)\conversions.obj" \
+ "$(INT_DIR)\couponvectors.obj" \
+ "$(INT_DIR)\date.obj" \
"$(INT_DIR)\exercise.obj" \
+ "$(INT_DIR)\forwardrateagreement.obj" \
"$(INT_DIR)\funcdef.obj" \
+ "$(INT_DIR)\instruments.obj" \
+ "$(INT_DIR)\interpolation.obj" \
+ "$(INT_DIR)\mathf.obj" \
+ "$(INT_DIR)\optimization.obj" \
"$(INT_DIR)\options.obj" \
"$(INT_DIR)\payoffs.obj" \
+ "$(INT_DIR)\prices.obj" \
"$(INT_DIR)\pricingengines.obj" \
"$(INT_DIR)\processes.obj" \
"$(INT_DIR)\qladdin.obj" \
+ "$(INT_DIR)\randomsequencegenerator.obj" \
+ "$(INT_DIR)\ratehelpers.obj" \
+ "$(INT_DIR)\schedule.obj" \
"$(INT_DIR)\session.obj" \
+ "$(INT_DIR)\shortratemodels.obj" \
+ "$(INT_DIR)\swap.obj" \
+ "$(INT_DIR)\swaption.obj" \
+ "$(INT_DIR)\swaptionvolstructure.obj" \
+ "$(INT_DIR)\termstructures.obj" \
"$(INT_DIR)\utilities.obj" \
+ "$(INT_DIR)\vanillaswap.obj" \
"$(INT_DIR)\volatilities.obj"
!
LFLAGS=/nologo /dll /out:$(DLL_FILE) \
/def:.\$(COMPONENT_NAME).def \
***************
*** 52,57 ****
/libpath:"$(OFFICE_SDK_PATH)\windows\lib" \
/libpath:"$(QL_DIR)\lib" \
- /libpath:"$(LOG4CXX_DIR)\msvc\lib" \
/libpath:"$(OBJECT_HANDLER_DIR)\lib" \
kernel32.lib wsock32.lib advapi32.lib \
oldnames.lib netapi32.lib advapi32.lib gdi32.lib comdlg32.lib \
--- 73,78 ----
/libpath:"$(OFFICE_SDK_PATH)\windows\lib" \
/libpath:"$(QL_DIR)\lib" \
/libpath:"$(OBJECT_HANDLER_DIR)\lib" \
+ /libpath:"$(LOG4CXX_DIR)\msvc\lib" \
kernel32.lib wsock32.lib advapi32.lib \
oldnames.lib netapi32.lib advapi32.lib gdi32.lib comdlg32.lib \
Index: AddinCalc.vcproj
===================================================================
RCS file: /cvsroot/quantlibaddin/QuantLibAddin/Addins/Calc/AddinCalc.vcproj,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -C2 -d -r1.3.2.1 -r1.3.2.2
*** AddinCalc.vcproj 2 Aug 2006 13:03:46 -0000 1.3.2.1
--- AddinCalc.vcproj 10 Aug 2006 15:48:09 -0000 1.3.2.2
***************
*** 13,19 ****
<Configurations>
<Configuration
! Name="Debug CRTDLL|Win32"
! OutputDirectory="build\vc71\DebugCRTDLL"
! IntermediateDirectory="build\vc71\DebugCRTDLL"
ConfigurationType="0"
UseOfMFC="0"
--- 13,19 ----
<Configurations>
<Configuration
! Name="Release CRTDLL|Win32"
! OutputDirectory="$(ConfigurationName)"
! IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="0"
UseOfMFC="0"
***************
*** 23,28 ****
BuildCommandLine="nmake /f "Makefile.vc""
ReBuildCommandLine="nmake /f "Makefile.vc" /a"
! CleanCommandLine="nmake /f "Makefile.vc" clean"
! Output="AddinCalc.exe"/>
</Configuration>
</Configurations>
--- 23,27 ----
BuildCommandLine="nmake /f "Makefile.vc""
ReBuildCommandLine="nmake /f "Makefile.vc" /a"
! CleanCommandLine="nmake /f "Makefile.vc" clean"/>
</Configuration>
</Configurations>
Index: qladdin.cpp
===================================================================
RCS file: /cvsroot/quantlibaddin/QuantLibAddin/Addins/Calc/qladdin.cpp,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -C2 -d -r1.2.2.2 -r1.2.2.3
*** qladdin.cpp 4 Aug 2006 22:39:26 -0000 1.2.2.2
--- qladdin.cpp 10 Aug 2006 15:48:09 -0000 1.2.2.3
***************
*** 1,5 ****
/*
! Copyright (C) 2004, 2005 Eric Ehlers
This file is part of QuantLib, a free-software/open-source library
--- 1,5 ----
/*
! Copyright (C) 2004, 2005, 2006 Eric Ehlers
This file is part of QuantLib, a free-software/open-source library
***************
*** 38,42 ****
# include <qlo/qladdindefines.hpp>
# include <qlo/auto_link.hpp>
- # include <log4cxx/auto_link.hpp>
# undef BOOST_LIB_DIAGNOSTIC
#endif
--- 38,41 ----
|