Ignore:
Timestamp:
Sep 29, 2010 9:34:36 AM (9 years ago)
Author:
kulshres
Message:

Squashed merge branch 'master' of 'gitclone' into svn

  • 'master' of 'gitclone': (5 commits) add colpack to examples build too update windows files make readlink calls more portable work around old autotools version change and small fixes for the obs

Details of the commits:
commit 94ea271ec616f7465309aa857bc44a5192f295af
Author: Kshitij Kulshreshtha <kshitij@…>
Date: Mon Sep 27 14:39:26 2010 +0200

add colpack to examples build too

commit f57d2392671c42600e0d023951f255f062e86d36
Author: Kshitij Kulshreshtha <kshitij@…>
Date: Mon Sep 27 14:33:54 2010 +0200

update windows files

commit d4e3142afab3d490ade8df54c4be7e84e7a0ad82
Author: Kshitij Kulshreshtha <kshitij@…>
Date: Sat Sep 25 15:56:28 2010 +0200

make readlink calls more portable

the switch -f does nearly the same as -e and is older, so use that
to be portable on older systems. not sure if there are readlink versions
even withouf -f

Signed-off-by: Kshitij Kulshreshtha <kshitij@…>

commit 864d51c377b413a6e40abdeecb5893bb4c74e85a
Author: Kshitij Kulshreshtha <kshitij@…>
Date: Sat Sep 25 15:54:42 2010 +0200

work around old autotools

older versions don't seem to define ac_pwd

Signed-off-by: Kshitij Kulshreshtha <kshitij@…>

commit 4b4f54f073ba7bc3f775f6f35d2fe3396f0915bd
Author: Kshitij Kulshreshtha <kshitij@…>
Date: Thu Sep 23 19:52:42 2010 +0200

version change and small fixes for the obs

Signed-off-by: Kshitij Kulshreshtha <kshitij@…>

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/ADOL-C/examples/tapeless_scalar.vcxproj

    r106 r167  
    7070    <ClCompile>
    7171      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    72       <AdditionalIncludeDirectories>../src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     72      <AdditionalIncludeDirectories>..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    7373      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
    7474      <WarningLevel>Level3</WarningLevel>
     
    8585    <ClCompile>
    8686      <PreprocessorDefinitions>WIN64;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    87       <AdditionalIncludeDirectories>../src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     87      <AdditionalIncludeDirectories>..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    8888      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
    8989      <WarningLevel>Level3</WarningLevel>
     
    9999    <ClCompile>
    100100      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    101       <AdditionalIncludeDirectories>../src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     101      <AdditionalIncludeDirectories>..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    102102      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
    103103      <WarningLevel>Level3</WarningLevel>
     
    115115    <ClCompile>
    116116      <PreprocessorDefinitions>WIN64;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    117       <AdditionalIncludeDirectories>../src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     117      <AdditionalIncludeDirectories>..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    118118      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
    119119      <WarningLevel>Level3</WarningLevel>
Note: See TracChangeset for help on using the changeset viewer.