Changeset 475


Ignore:
Timestamp:
Aug 22, 2005 5:20:40 PM (14 years ago)
Author:
andreasw
Message:

made compile (also in Release version) for latest version

Location:
branches/dev/Windows/VisualStudio_dotNET
Files:
2 added
2 deleted
5 edited
1 moved

Legend:

Unmodified
Added
Removed
  • branches/dev/Windows/VisualStudio_dotNET/CppExample/CppExample.vcproj

    r437 r475  
    2626                                BasicRuntimeChecks="3"
    2727                                RuntimeLibrary="5"
     28                                DisableLanguageExtensions="TRUE"
     29                                RuntimeTypeInfo="TRUE"
    2830                                UsePrecompiledHeader="0"
    2931                                WarningLevel="3"
     
    7072                        <Tool
    7173                                Name="VCCLCompilerTool"
     74                                AdditionalIncludeDirectories="..\..\..\Interfaces;..\..\..\Common;..\include;..\..\..\Algorithm;..\..\..\LinAlg"
    7275                                PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
    7376                                RuntimeLibrary="4"
    74                                 UsePrecompiledHeader="3"
     77                                DisableLanguageExtensions="TRUE"
     78                                RuntimeTypeInfo="TRUE"
     79                                UsePrecompiledHeader="0"
    7580                                WarningLevel="3"
    7681                                Detect64BitPortabilityProblems="TRUE"
     
    8287                                OutputFile="$(OutDir)/CppExample.exe"
    8388                                LinkIncremental="1"
     89                                AdditionalLibraryDirectories="&quot;C:\Program Files\Intel\Fortran\compiler80\IA32\LIB&quot;"
    8490                                GenerateDebugInformation="TRUE"
    8591                                SubSystem="1"
  • branches/dev/Windows/VisualStudio_dotNET/FortranExample/FortranExample.vfproj

    r437 r475  
    77                                <Tool Name="VFMidlTool" SuppressStartupBanner="true" HeaderFileName="$(InputName).h" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>
    88                                <Tool Name="VFPreBuildEventTool"/>
     9                                <Tool Name="VFPostBuildEventTool"/>
    910                                <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="..\..\..\Interfaces" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtSingleThreadedDebug" CompileOnly="true"/>
    10                                 <Tool Name="VFPostBuildEventTool"/>
    1111                                <Tool Name="VFCustomBuildTool"/>
    1212                                <Tool Name="VFLinkerTool" OutputFile="$(OUTDIR)/FortranExample.exe" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/FortranExample.pdb" SubSystem="subSystemConsole"/>
    13                                 <Tool Name="VFResourceCompilerTool" ResourceOutputFileName="$(IntDir)/$(InputName).res"/>
    14                                 <Tool Name="VFPreLinkEventTool"/></Configuration>
    15                 <Configuration Name="Release|Win32" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true" Command="$(TargetPath)">
    16                                 <Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" HeaderFileName="$(InputName).h" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>
     13                                <Tool Name="VFPreLinkEventTool"/>
     14                                <Tool Name="VFResourceCompilerTool" ResourceOutputFileName="$(IntDir)/$(InputName).res"/></Configuration>
     15                <Configuration Name="Release|Win32" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" Command="$(TargetPath)">
     16                                <Tool Name="VFMidlTool" SuppressStartupBanner="true" HeaderFileName="$(InputName).h" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>
    1717                                <Tool Name="VFPreBuildEventTool"/>
    18                                 <Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" CompileOnly="true"/>
    1918                                <Tool Name="VFPostBuildEventTool"/>
     19                                <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" Optimization="optimizeFull" AdditionalIncludeDirectories="..\..\..\Interfaces" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" CompileOnly="true"/>
    2020                                <Tool Name="VFCustomBuildTool"/>
    21                                 <Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" OutputFile="$(OUTDIR)/FortranExample.exe" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" SubSystem="subSystemConsole"/>
    22                                 <Tool Name="VFResourceCompilerTool" ResourceOutputFileName="$(IntDir)/$(InputName).res"/>
    23                                 <Tool Name="VFPreLinkEventTool"/></Configuration></Configurations>
     21                                <Tool Name="VFLinkerTool" OutputFile="$(OUTDIR)/FortranExample.exe" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" SubSystem="subSystemConsole"/>
     22                                <Tool Name="VFPreLinkEventTool"/>
     23                                <Tool Name="VFResourceCompilerTool" ResourceOutputFileName="$(IntDir)/$(InputName).res"/></Configuration></Configurations>
    2424        <Files>
    2525                <Filter Name="Source Files" Filter="f90;for;f;fpp;ftn;def;odl;idl">
  • branches/dev/Windows/VisualStudio_dotNET/FortranLinAlg/FortranLinAlg.vfproj

    r437 r475  
    77                                <Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>
    88                                <Tool Name="VFPreBuildEventTool"/>
     9                                <Tool Name="VFPostBuildEventTool"/>
    910                                <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtSingleThreadedDebug" CompileOnly="true"/>
    10                                 <Tool Name="VFPostBuildEventTool"/>
    1111                                <Tool Name="VFCustomBuildTool"/>
    12                                 <Tool Name="VFResourceCompilerTool" ResourceOutputFileName="$(IntDir)/$(InputName).res"/>
     12                                <Tool Name="VFLibrarianTool" OutputFile="$(OUTDIR)/FortranLinAlg.lib" SuppressStartupBanner="true"/>
    1313                                <Tool Name="VFPreLinkEventTool"/>
    14                                 <Tool Name="VFLibrarianTool" OutputFile="$(OUTDIR)/FortranLinAlg.lib" SuppressStartupBanner="true"/></Configuration>
    15                 <Configuration Name="Release|Win32" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.lib;$(TargetPath)" ConfigurationType="typeStaticLibrary" MustRebuild="true">
     14                                <Tool Name="VFResourceCompilerTool" ResourceOutputFileName="$(IntDir)/$(InputName).res"/></Configuration>
     15                <Configuration Name="Release|Win32" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.lib;$(TargetPath)" ConfigurationType="typeStaticLibrary">
    1616                                <Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>
    1717                                <Tool Name="VFPreBuildEventTool"/>
    18                                 <Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" DisableDefaultLibSearch="true" CompileOnly="true"/>
    1918                                <Tool Name="VFPostBuildEventTool"/>
     19                                <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" CompileOnly="true"/>
    2020                                <Tool Name="VFCustomBuildTool"/>
    21                                 <Tool Name="VFResourceCompilerTool" ResourceOutputFileName="$(IntDir)/$(InputName).res"/>
     21                                <Tool Name="VFLibrarianTool" OutputFile="$(OUTDIR)/FortranLinAlg.lib" SuppressStartupBanner="true"/>
    2222                                <Tool Name="VFPreLinkEventTool"/>
    23                                 <Tool Name="VFLibrarianTool" SwitchesHaveChanged="true" MustRebuild="true" OutputFile="$(OUTDIR)/FortranLinAlg.lib" SuppressStartupBanner="true"/></Configuration></Configurations>
     23                                <Tool Name="VFResourceCompilerTool" ResourceOutputFileName="$(IntDir)/$(InputName).res"/></Configuration></Configurations>
    2424        <Files>
    2525                <Filter Name="Source Files" Filter="f90;for;f;fpp;ftn;def;odl;idl">
     
    2727                <File RelativePath="..\..\..\Extern\blas\dasum.f"/>
    2828                <File RelativePath="..\..\..\Extern\blas\daxpy.f"/>
    29                 <File RelativePath="..\..\..\Extern\blas\dcabs1.f"/>
    3029                <File RelativePath="..\..\..\Extern\blas\dcopy.f"/>
    3130                <File RelativePath="..\..\..\Extern\blas\ddot.f"/>
    32                 <File RelativePath="..\..\..\Extern\blas\dgbmv.f"/>
    33                 <File RelativePath="..\..\..\Extern\blas\dgemm.f"/>
    34                 <File RelativePath="..\..\..\Extern\blas\dgemv.f"/>
    35                 <File RelativePath="..\..\..\Extern\blas\dger.f"/>
    3631                <File RelativePath="..\..\..\Extern\blas\dnrm2.f"/>
    37                 <File RelativePath="..\..\..\Extern\blas\drot.f"/>
    38                 <File RelativePath="..\..\..\Extern\blas\drotg.f"/>
    39                 <File RelativePath="..\..\..\Extern\blas\drotm.f"/>
    40                 <File RelativePath="..\..\..\Extern\blas\drotmg.f"/>
    41                 <File RelativePath="..\..\..\Extern\blas\dsbmv.f"/>
    4232                <File RelativePath="..\..\..\Extern\blas\dscal.f"/>
    43                 <File RelativePath="..\..\..\Extern\blas\dsdot.f"/>
    44                 <File RelativePath="..\..\..\Extern\blas\dspmv.f"/>
    45                 <File RelativePath="..\..\..\Extern\blas\dspr.f"/>
    46                 <File RelativePath="..\..\..\Extern\blas\dspr2.f"/>
    47                 <File RelativePath="..\..\..\Extern\blas\dswap.f"/>
    48                 <File RelativePath="..\..\..\Extern\blas\dsymm.f"/>
    49                 <File RelativePath="..\..\..\Extern\blas\dsymv.f"/>
    50                 <File RelativePath="..\..\..\Extern\blas\dsyr.f"/>
    51                 <File RelativePath="..\..\..\Extern\blas\dsyr2.f"/>
    52                 <File RelativePath="..\..\..\Extern\blas\dsyr2k.f"/>
    53                 <File RelativePath="..\..\..\Extern\blas\dsyrk.f"/>
    54                 <File RelativePath="..\..\..\Extern\blas\dtbmv.f"/>
    55                 <File RelativePath="..\..\..\Extern\blas\dtbsv.f"/>
    56                 <File RelativePath="..\..\..\Extern\blas\dtpmv.f"/>
    57                 <File RelativePath="..\..\..\Extern\blas\dtpsv.f"/>
    58                 <File RelativePath="..\..\..\Extern\blas\dtrmm.f"/>
    59                 <File RelativePath="..\..\..\Extern\blas\dtrmv.f"/>
    60                 <File RelativePath="..\..\..\Extern\blas\dtrsm.f"/>
    61                 <File RelativePath="..\..\..\Extern\blas\dtrsv.f"/>
    62                 <File RelativePath="..\..\..\Extern\blas\dzasum.f"/>
    63                 <File RelativePath="..\..\..\Extern\blas\dznrm2.f"/>
    64                 <File RelativePath="..\..\..\Extern\blas\idamax.f"/>
    65                 <File RelativePath="..\..\..\Extern\blas\xerbla.f"/></Filter>
     33                <File RelativePath="..\..\..\Extern\blas\idamax.f"/></Filter>
    6634                <Filter Name="HSL">
    6735                <File RelativePath="..\..\..\Extern\HSL\ma27ad.f"/>
  • branches/dev/Windows/VisualStudio_dotNET/README

    r46 r475  
    1 These directories contain the Visual Studio version of NewIpopt.  They
     1These directories contain the Visual Studio version of Ipopt.  They
    22have been created with Microsoft Visual C++ .NET 2003 and Intel
    33Fortran 8.0.
     
    77from netlib and Harwell):
    88
    9 NewIpopt/OTHERS/HSL/ma27ad.f
    10 NewIpopt/OTHERS/blas/dasum.f
    11 NewIpopt/OTHERS/blas/daxpy.f
    12 NewIpopt/OTHERS/blas/dcopy.f
    13 NewIpopt/OTHERS/blas/ddot.f
    14 NewIpopt/OTHERS/blas/dnrm2.f
    15 NewIpopt/OTHERS/blas/dscal.f
    16 NewIpopt/OTHERS/blas/idamax.
     9trunk/Extern/HSL/ma27ad.f
     10trunk/Extern/HSL/mc19ad.f
     11trunk/Extern/blas/dasum.f
     12trunk/Extern/blas/daxpy.f
     13trunk/Extern/blas/dcopy.f
     14trunk/Extern/blas/ddot.f
     15trunk/Extern/blas/dnrm2.f
     16trunk/Extern/blas/dscal.f
     17trunk/Extern/blas/idamax.f
    1718
    1819Then open the solution file
    1920
    20 NewIpopt/VisualStudio/NewIpopt.sln
     21trunk/Windows/VisualStudio_dotNET/Ipopt/Ipopt.sln
    2122
    22 This solution compiles both the Fortran example problem
    23 and the C++ example problem. You should be able to base
    24 your development off of one of these examples.
     23This solution compiles both a Fortran example problem and a C++
     24example problem. You should be able to base your development on one of
     25these examples.
    2526
    2627
     
    3233
    3334- You will need to add the include directories to your C++ project
    34         you can copy these from the NewIpopt project:
    35         Project Properties | C/C++ | General | Additional Include Directories = <copy from NewIpopt>
     35        you can copy these from the Ipopt project:
     36        Project Properties | C/C++ | General | Additional Include Directories = <copy from Ipopt>
    3637
    3738- You must ensure that the run-time libraries between FortranLinAlg and the C++ project are
  • branches/dev/Windows/VisualStudio_dotNET/include/config.h

    r324 r475  
     1/* inc/config.h.  Generated by configure.  */
    12/* inc/config.h.in.  Generated from configure.ac by autoheader.  */
    23
    34/* Define to dummy `main' function (if any) required to link to the Fortran
    45   libraries. */
    5 #undef F77_DUMMY_MAIN
     6/* #undef F77_DUMMY_MAIN */
    67
    78/* Define to a macro mangling the given C identifier (in lower and upper
     
    1314
    1415/* Define if F77 and FC dummy `main' functions are identical. */
    15 #undef FC_DUMMY_MAIN_EQ_F77
     16/* #undef FC_DUMMY_MAIN_EQ_F77 */
     17
     18/* Define to the C type corresponding to Fortran INTEGER */
     19#define FORTRAN_INTEGER_TYPE int
     20
     21/* Define to 1 if you have the <assert.h> header file. */
     22/* #undef HAVE_ASSERT_H */
     23
     24/* Define to 1 if you have the <cassert> header file. */
     25#define HAVE_CASSERT 1
     26
     27/* Define to 1 if you have the <cctype> header file. */
     28#define HAVE_CCTYPE 1
     29
     30/* Define to 1 if you have the <cfloat> header file. */
     31#define HAVE_CFLOAT 1
     32
     33/* Define to 1 if you have the <cieeefp> header file. */
     34/* #undef HAVE_CIEEEFP */
     35
     36/* Define to 1 if you have the <cmath> header file. */
     37#define HAVE_CMATH 1
     38
     39/* Define to 1 if you have the <cstdarg> header file. */
     40#define HAVE_CSTDARG 1
     41
     42/* Define to 1 if you have the <cstdio> header file. */
     43#define HAVE_CSTDIO 1
     44
     45/* Define to 1 if you have the <ctype.h> header file. */
     46/* #undef HAVE_CTYPE_H */
     47
     48/* Define to 1 if you have the <float.h> header file. */
     49/* #undef HAVE_FLOAT_H */
     50
     51/* Define to 1 if you have the <ieeefp.h> header file. */
     52/* #undef HAVE_IEEEFP_H */
    1653
    1754/* Define to 1 if you have the <inttypes.h> header file. */
    18 #undef HAVE_INTTYPES_H
     55/* #undef HAVE_INTTYPES_H */
    1956
    2057/* Define to 1 if MA27 is available */
    2158#define HAVE_MA27 1
     59
     60/* Define to 1 if you have the <math.h> header file. */
     61/* #undef HAVE_MATH_H */
    2262
    2363/* Define to 1 if MC19 is available */
     
    2767#define HAVE_MEMORY_H 1
    2868
     69/* Define to 1 if Pardiso is available (unsupported) */
     70/* #undef HAVE_PARDISO */
     71
     72/* Define to 1 if you have the <stdarg.h> header file. */
     73/* #undef HAVE_STDARG_H */
     74
    2975/* Define to 1 if you have the <stdint.h> header file. */
    30 #undef HAVE_STDINT_H
     76/* #undef HAVE_STDINT_H */
     77
     78/* Define to 1 if you have the <stdio.h> header file. */
     79/* #undef HAVE_STDIO_H */
    3180
    3281/* Define to 1 if you have the <stdlib.h> header file. */
    33 /*#undef HAVE_STDLIB_H*/
    34 #define HAVE_STDLIB_H 1
     82/* #undef HAVE_STDLIB_H */
    3583
    3684/* Define to 1 if you have the <strings.h> header file. */
    37 #undef HAVE_STRINGS_H
     85/* #undef HAVE_STRINGS_H */
    3886
    3987/* Define to 1 if you have the <string.h> header file. */
     
    4694#define HAVE_SYS_TYPES_H 1
    4795
     96/* Define to 1 if TAUCS is available (unsupported) */
     97/* #undef HAVE_TAUCS */
     98
    4899/* Define to 1 if you have the <unistd.h> header file. */
    49 #undef HAVE_UNISTD_H
     100/* #undef HAVE_UNISTD_H */
    50101
    51 /* Define to the C type corresponding to Fortran INTEGER */
    52 #define INTEGER_TYPE long
     102/* Define to 1 if va_copy is avaliable */
     103/* #undef HAVE_VA_COPY */
    53104
    54 /* Define name of finite function */
     105/* If defined, debug sanity checks are performed during runtime */
     106/* #undef IP_DEBUG */
     107
     108/* Define to be the name of C-function for NaNInf check */
    55109#define MY_C_FINITE _finite
    56110
    57111/* Name of package */
    58 #undef PACKAGE
     112#define PACKAGE "ipopt"
    59113
    60114/* Define to the address where bug reports for this package should be sent. */
    61 #undef PACKAGE_BUGREPORT
     115#define PACKAGE_BUGREPORT "coin-ipopt@www-124.ibm.com"
    62116
    63117/* Define to the full name of this package. */
    64 #undef PACKAGE_NAME
     118#define PACKAGE_NAME "Ipopt"
    65119
    66120/* Define to the full name and version of this package. */
    67 #undef PACKAGE_STRING
     121#define PACKAGE_STRING "Ipopt 3.0.-1"
    68122
    69123/* Define to the one symbol short name of this package. */
    70 #undef PACKAGE_TARNAME
     124#define PACKAGE_TARNAME "ipopt"
    71125
    72126/* Define to the version of this package. */
    73 #undef PACKAGE_VERSION
    74 
    75 /* The size of a `double', as computed by sizeof. */
    76 #define SIZEOF_DOUBLE 8
    77 
    78 /* The size of a `int', as computed by sizeof. */
    79 #define SIZEOF_INT 4
    80 
    81 /* The size of a `long', as computed by sizeof. */
    82 #define SIZEOF_LONG 4
     127#define PACKAGE_VERSION "3.0.-1"
    83128
    84129/* Define to 1 if you have the ANSI C header files. */
    85 #define STDC_HEADERS 1
     130/* #undef STDC_HEADERS */
    86131
    87132/* Version number of package */
    88 #undef VERSION
     133#define VERSION "3.0.-1"
Note: See TracChangeset for help on using the changeset viewer.