Changeset 9c42267 in tol


Ignore:
Timestamp:
Sep 2, 2010, 8:45:21 AM (16 years ago)
Author:
Víctor de Buen <vdebuen@…>
Branches:
1941-docker-image-to-test, devel, master
Children:
f100bb9
Parents:
c91df70
Message:

refs #969
Trying to use just high level ZipArchive routines disabling USE_ZIP_ARCHIVE

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@2509 be4846ae-f051-483a-831f-b64e7d08527f

Location:
tol/win-VC8
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • tol/win-VC8/tollib.vcproj

    rc91df70 r9c42267  
    22<VisualStudioProject
    33        ProjectType="Visual C++"
    4         Version="8.00"
     4        Version="8,00"
    55        Name="tollib"
    66        ProjectGUID="{9DFD4DC8-3362-4F04-A5FB-AFAF343CDF43}"
    … …  
    2727                        <Tool
    2828                                Name="VCPreBuildEventTool"
    29                                 CommandLine="cd ..&#x0D;&#x0A;win-vc8\Debug\build_date_gen.exe&#x0D;&#x0A;"
     29                                CommandLine="cd ..&#x0D;&#x0A;win-vc8\Debug\build_date_gen.exe&#x0D;&#x0A;tolsh -v svn_info.tol&#x0D;&#x0A;"
    3030                        />
    3131                        <Tool
    … …  
    5050                                Name="VCCLCompilerTool"
    5151                                Optimization="0"
    52                                 AdditionalIncludeDirectories=".;..;../..;&quot;$(BOOST)&quot;;&quot;$(LTDL_INC)&quot;;&quot;$(BZIP2_INC)&quot;;&quot;$(ATLAS_INC)&quot;;&quot;$(CHOLMOD_INC)&quot;;&quot;$(ANN_INCLUDE)&quot;;&quot;$(GSL_INC)&quot;;&quot;$(ZipArchive_INC)&quot;;&quot;$(GOOGLE_SPARSEHASH)&quot;;../bbasic;../bmath;../bmath/barith;../bmath/bfunct;../bmath/blinalg;../bmath/bprdist;../bmath/bstat;../bmath/csparse;../bmath/dcdflib;../bmath/mathobjects;../bmath/gsl_ext;../bparser;../btol;../btol/bdb;../btol/bgrammar;../btol/bgsl;../btol/bmodel;../btol/code_type;../btol/complex_type;../btol/date_type;../btol/ctime_type;../btol/matrix_type;../btol/vmatrix_type;../btol/polynomial_type;../btol/ratio_type;../btol/real_type;../btol/serie_type;../btol/set_type;../btol/text_type;../btol/timeset_type;../btol/ctimeset_type;../btol/cseries_type;../lang;../ois"
     52                                AdditionalIncludeDirectories=".;..;../..;&quot;$(BOOST)&quot;;&quot;$(LTDL_INC)&quot;;&quot;$(BZIP2_INC)&quot;;&quot;$(ATLAS_INC)&quot;;&quot;$(CHOLMOD_INC)&quot;;&quot;$(ANN_INCLUDE)&quot;;&quot;$(GSL_INC)&quot;;&quot;$(ZipArchive_INC)&quot;;&quot;$(GOOGLE_SPARSEHASH)&quot;;../bbasic;../bmath;../bmath/barith;../bmath/bfunct;../bmath/blinalg;../bmath/bprdist;../bmath/bstat;../bmath/csparse;../bmath/dcdflib;../bmath/mathobjects;../bmath/gsl_ext;../bparser;../btol;../btol/bdb;../btol/bgrammar;../btol/bgsl;../btol/bmodel;../btol/code_type;../btol/complex_type;../btol/date_type;../btol/ctime_type;../btol/matrix_type;../btol/vmatrix_type;../btol/polynomial_type;../btol/ratio_type;../btol/real_type;../btol/serie_type;../btol/set_type;../btol/text_type;../btol/timeset_type;../btol/ctimeset_type;../btol/cseries_type;../lang;../ois;../PackArchive"
    5353                                PreprocessorDefinitions="_DEBUG;__WIN32__;WIN32;_WINDOWS;_USRDLL;HAVE_CONFIG_H;TOLDLL_EXPORTS;__USE_DYNSCOPE__;__USE_ZIP_ARCHIVE__"
    5454                                MinimalRebuild="true"
    … …  
    129129                        <Tool
    130130                                Name="VCPreBuildEventTool"
    131                                 CommandLine="Echo TOL Contrib Environment&#x0D;&#x0A;set  ATLAS_INC&#x0D;&#x0A;set  ATLAS_LIB&#x0D;&#x0A;set  GSL_INC&#x0D;&#x0A;set  GSL_LIB&#x0D;&#x0A;set  CHOLMOD_INC&#x0D;&#x0A;set  CHOLMOD_LIB&#x0D;&#x0A;set  BZIP2_INC&#x0D;&#x0A;set  BZIP2_LIB&#x0D;&#x0A;set  ZipArchive_INC&#x0D;&#x0A;set  ZipArchive_LIB&#x0D;&#x0A;set  MYSQL_INCLUDE&#x0D;&#x0A;set  MYSQL_LIB&#x0D;&#x0A;set  PGSQL_INCLUDE&#x0D;&#x0A;set  PGSQL_LIB&#x0D;&#x0A;set ANN_INCLUDE&#x0D;&#x0A;set ANN_LIB&#x0D;&#x0A;set  GOOGLE_SPARSEHASH&#x0D;&#x0A;&#x0D;&#x0A;cd ..&#x0D;&#x0A;win-vc8\Release\build_date_gen.exe&#x0D;&#x0A;"
     131                                CommandLine="Echo TOL Contrib Environment&#x0D;&#x0A;set  ATLAS_INC&#x0D;&#x0A;set  ATLAS_LIB&#x0D;&#x0A;set  GSL_INC&#x0D;&#x0A;set  GSL_LIB&#x0D;&#x0A;set  CHOLMOD_INC&#x0D;&#x0A;set  CHOLMOD_LIB&#x0D;&#x0A;set  BZIP2_INC&#x0D;&#x0A;set  BZIP2_LIB&#x0D;&#x0A;set  ZipArchive_INC&#x0D;&#x0A;set  ZipArchive_LIB&#x0D;&#x0A;set  MYSQL_INCLUDE&#x0D;&#x0A;set  MYSQL_LIB&#x0D;&#x0A;set  PGSQL_INCLUDE&#x0D;&#x0A;set  PGSQL_LIB&#x0D;&#x0A;set ANN_INCLUDE&#x0D;&#x0A;set ANN_LIB&#x0D;&#x0A;set  GOOGLE_SPARSEHASH&#x0D;&#x0A;&#x0D;&#x0A;cd ..&#x0D;&#x0A;win-vc8\Release\build_date_gen.exe&#x0D;&#x0A;tolsh -v svn_info.tol&#x0D;&#x0A;"
    132132                        />
    133133                        <Tool
    … …  
    155155                                FavorSizeOrSpeed="1"
    156156                                WholeProgramOptimization="false"
    157                                 AdditionalIncludeDirectories=".;..;../..;&quot;$(LTDL_INC)&quot;;&quot;$(BOOST)&quot;;&quot;$(BZIP2_INC)&quot;;&quot;$(ATLAS_INC)&quot;;&quot;$(ANN_INCLUDE)&quot;;&quot;$(CHOLMOD_INC)&quot;;&quot;$(GSL_INC)&quot;;&quot;$(ZipArchive_INC)&quot;;&quot;$(GOOGLE_SPARSEHASH)&quot;;../bbasic;../bmath;../bmath/barith;../bmath/bfunct;../bmath/blinalg;../bmath/bprdist;../bmath/bstat;../bmath/csparse;../bmath/dcdflib;../bmath/mathobjects;../bmath/gsl_ext;../bparser;../btol;../btol/bdb;../btol/bgrammar;../btol/bgsl;../btol/bmodel;../btol/code_type;../btol/complex_type;../btol/date_type;../btol/ctime_type;../btol/matrix_type;../btol/vmatrix_type;../btol/polynomial_type;../btol/ratio_type;../btol/real_type;../btol/serie_type;../btol/set_type;../btol/text_type;../btol/timeset_type;../btol/ctimeset_type;../btol/cseries_type;../lang;../ois"
     157                                AdditionalIncludeDirectories=".;..;../..;&quot;$(LTDL_INC)&quot;;&quot;$(BOOST)&quot;;&quot;$(BZIP2_INC)&quot;;&quot;$(ATLAS_INC)&quot;;&quot;$(ANN_INCLUDE)&quot;;&quot;$(CHOLMOD_INC)&quot;;&quot;$(GSL_INC)&quot;;&quot;$(ZipArchive_INC)&quot;;&quot;$(GOOGLE_SPARSEHASH)&quot;;../bbasic;../bmath;../bmath/barith;../bmath/bfunct;../bmath/blinalg;../bmath/bprdist;../bmath/bstat;../bmath/csparse;../bmath/dcdflib;../bmath/mathobjects;../bmath/gsl_ext;../bparser;../btol;../btol/bdb;../btol/bgrammar;../btol/bgsl;../btol/bmodel;../btol/code_type;../btol/complex_type;../btol/date_type;../btol/ctime_type;../btol/matrix_type;../btol/vmatrix_type;../btol/polynomial_type;../btol/ratio_type;../btol/real_type;../btol/serie_type;../btol/set_type;../btol/text_type;../btol/timeset_type;../btol/ctimeset_type;../btol/cseries_type;../lang;../ois;../PackArchive"
    158158                                PreprocessorDefinitions="NDEBUG;__WIN32__;WIN32;_WINDOWS;_USRDLL;HAVE_CONFIG_H;TOLDLL_EXPORTS;__USE_DYNSCOPE__;__USE_ZIP_ARCHIVE__"
    159159                                StringPooling="true"
  • tol/win-VC8/win_tolinc.h

    rc91df70 r9c42267  
    189189#pragma include_alias(<tol/tol_oisstream_zip.h>, <tol_oisstream_zip.h>)
    190190
     191#pragma include_alias(<tol/tol_PackArchive.h>, <tol_PackArchive.h>)
     192#pragma include_alias(<tol/tol_StoreZipArchive.h>, <tol_StoreZipArchive.h>)
     193
    191194//inconsistent DLL linkage. dllexport assumed.
    192195#pragma warning(disable : 4273)
Note: See TracChangeset for help on using the changeset viewer.