* Changed path of 64-bit pthread libraries from "pthread-w32" to "pthread-w64" to improve clarity of directory structure

This commit is contained in:
Philippose Rajan 2010-02-26 23:13:13 +00:00
parent 083330c033
commit f9fdcdca9f

View File

@ -136,7 +136,7 @@
Optimization="0" Optimization="0"
EnableIntrinsicFunctions="false" EnableIntrinsicFunctions="false"
WholeProgramOptimization="false" WholeProgramOptimization="false"
AdditionalIncludeDirectories=""$(SolutionDir)..";"$(SolutionDir)..\ng";"$(SolutionDir)..\libsrc\include";"$(SolutionDir)..\libsrc\interface";"$(SolutionDir)..\..\ext_libs\tcl-64\include";"$(SolutionDir)..\..\ext_libs\pthread-w32\include"" AdditionalIncludeDirectories=""$(SolutionDir)..";"$(SolutionDir)..\ng";"$(SolutionDir)..\libsrc\include";"$(SolutionDir)..\libsrc\interface";"$(SolutionDir)..\..\ext_libs\tcl-64\include";"$(SolutionDir)..\..\ext_libs\pthread-w64\include""
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;DEBUG;MSVC_EXPRESS;OPENGL;_WIN32_WINNT=0x0502;NGINTERFACE_EXPORTS" PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;DEBUG;MSVC_EXPRESS;OPENGL;_WIN32_WINNT=0x0502;NGINTERFACE_EXPORTS"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
@ -162,7 +162,7 @@
ShowProgress="0" ShowProgress="0"
Version="" Version=""
LinkIncremental="0" LinkIncremental="0"
AdditionalLibraryDirectories=""$(SolutionDir)..\..\ext_libs\tcl-64\lib";"$(SolutionDir)..\..\ext_libs\pthread-w32\lib"" AdditionalLibraryDirectories=""$(SolutionDir)..\..\ext_libs\tcl-64\lib";"$(SolutionDir)..\..\ext_libs\pthread-w64\lib""
GenerateManifest="true" GenerateManifest="true"
EnableUAC="true" EnableUAC="true"
GenerateDebugInformation="true" GenerateDebugInformation="true"
@ -320,7 +320,7 @@
EnableIntrinsicFunctions="true" EnableIntrinsicFunctions="true"
FavorSizeOrSpeed="1" FavorSizeOrSpeed="1"
WholeProgramOptimization="true" WholeProgramOptimization="true"
AdditionalIncludeDirectories=""$(SolutionDir)..";"$(SolutionDir)..\ng";"$(SolutionDir)..\libsrc\include";"$(SolutionDir)..\libsrc\interface";"$(SolutionDir)..\..\ext_libs\tcl-64\include";"$(SolutionDir)..\..\ext_libs\pthread-w32\include"" AdditionalIncludeDirectories=""$(SolutionDir)..";"$(SolutionDir)..\ng";"$(SolutionDir)..\libsrc\include";"$(SolutionDir)..\libsrc\interface";"$(SolutionDir)..\..\ext_libs\tcl-64\include";"$(SolutionDir)..\..\ext_libs\pthread-w64\include""
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;MSVC_EXPRESS;OPENGL;_WIN32_WINNT=0x0502;NGINTERFACE_EXPORTS" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;MSVC_EXPRESS;OPENGL;_WIN32_WINNT=0x0502;NGINTERFACE_EXPORTS"
StringPooling="true" StringPooling="true"
RuntimeLibrary="2" RuntimeLibrary="2"
@ -347,7 +347,7 @@
OutputFile="$(OutDir)\$(ProjectName).exe" OutputFile="$(OutDir)\$(ProjectName).exe"
Version="" Version=""
LinkIncremental="0" LinkIncremental="0"
AdditionalLibraryDirectories=""$(SolutionDir)..\..\ext_libs\tcl-64\lib";"$(SolutionDir)..\..\ext_libs\pthread-w32\lib"" AdditionalLibraryDirectories=""$(SolutionDir)..\..\ext_libs\tcl-64\lib";"$(SolutionDir)..\..\ext_libs\pthread-w64\lib""
GenerateManifest="true" GenerateManifest="true"
EnableUAC="true" EnableUAC="true"
GenerateDebugInformation="false" GenerateDebugInformation="false"
@ -509,7 +509,7 @@
EnableIntrinsicFunctions="true" EnableIntrinsicFunctions="true"
FavorSizeOrSpeed="1" FavorSizeOrSpeed="1"
WholeProgramOptimization="true" WholeProgramOptimization="true"
AdditionalIncludeDirectories=""$(SolutionDir)..";"$(SolutionDir)..\ng";"$(SolutionDir)..\libsrc\include";"$(SolutionDir)..\libsrc\interface";"$(SolutionDir)..\..\ext_libs\tcl-64\include";"$(SolutionDir)..\..\ext_libs\pthread-w32\include";"$(CASROOT)\inc"" AdditionalIncludeDirectories=""$(SolutionDir)..";"$(SolutionDir)..\ng";"$(SolutionDir)..\libsrc\include";"$(SolutionDir)..\libsrc\interface";"$(SolutionDir)..\..\ext_libs\tcl-64\include";"$(SolutionDir)..\..\ext_libs\pthread-w64\include";"$(CASROOT)\inc""
PreprocessorDefinitions="WIN32;WNT;NDEBUG;_CONSOLE;MSVC_EXPRESS;_OCC64;OCCGEOMETRY;OPENGL;_WIN32_WINNT=0x0502;NGINTERFACE_EXPORTS" PreprocessorDefinitions="WIN32;WNT;NDEBUG;_CONSOLE;MSVC_EXPRESS;_OCC64;OCCGEOMETRY;OPENGL;_WIN32_WINNT=0x0502;NGINTERFACE_EXPORTS"
StringPooling="true" StringPooling="true"
RuntimeLibrary="2" RuntimeLibrary="2"
@ -535,7 +535,7 @@
ShowProgress="0" ShowProgress="0"
Version="" Version=""
LinkIncremental="0" LinkIncremental="0"
AdditionalLibraryDirectories=""$(SolutionDir)..\..\ext_libs\tcl-64\lib";"$(SolutionDir)..\..\ext_libs\pthread-w32\lib";"$(CASROOT)\win64\lib"" AdditionalLibraryDirectories=""$(SolutionDir)..\..\ext_libs\tcl-64\lib";"$(SolutionDir)..\..\ext_libs\pthread-w64\lib";"$(CASROOT)\win64\lib""
GenerateManifest="true" GenerateManifest="true"
EnableUAC="true" EnableUAC="true"
EmbedManagedResourceFile="" EmbedManagedResourceFile=""
@ -690,7 +690,7 @@
Optimization="0" Optimization="0"
EnableIntrinsicFunctions="false" EnableIntrinsicFunctions="false"
WholeProgramOptimization="false" WholeProgramOptimization="false"
AdditionalIncludeDirectories=""$(SolutionDir)..";"$(SolutionDir)..\ng";"$(SolutionDir)..\libsrc\include";"$(SolutionDir)..\libsrc\interface";"$(SolutionDir)..\..\ext_libs\tcl-64\include";"$(SolutionDir)..\..\ext_libs\pthread-w32\include";"$(CASROOT)\inc"" AdditionalIncludeDirectories=""$(SolutionDir)..";"$(SolutionDir)..\ng";"$(SolutionDir)..\libsrc\include";"$(SolutionDir)..\libsrc\interface";"$(SolutionDir)..\..\ext_libs\tcl-64\include";"$(SolutionDir)..\..\ext_libs\pthread-w64\include";"$(CASROOT)\inc""
PreprocessorDefinitions="WIN32;WNT;_DEBUG;_CONSOLE;DEBUG;MSVC_EXPRESS;_OCC64;OCCGEOMETRY;OPENGL;_WIN32_WINNT=0x0502;NGINTERFACE_EXPORTS" PreprocessorDefinitions="WIN32;WNT;_DEBUG;_CONSOLE;DEBUG;MSVC_EXPRESS;_OCC64;OCCGEOMETRY;OPENGL;_WIN32_WINNT=0x0502;NGINTERFACE_EXPORTS"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
@ -716,7 +716,7 @@
ShowProgress="0" ShowProgress="0"
Version="" Version=""
LinkIncremental="0" LinkIncremental="0"
AdditionalLibraryDirectories=""$(SolutionDir)..\..\ext_libs\tcl\lib";"$(SolutionDir)..\..\ext_libs\pthread-w32\lib";"$(CASROOT)\win32\lib"" AdditionalLibraryDirectories=""$(SolutionDir)..\..\ext_libs\tcl-64\lib";"$(SolutionDir)..\..\ext_libs\pthread-w64\lib";"$(CASROOT)\win64\lib""
GenerateManifest="true" GenerateManifest="true"
EnableUAC="true" EnableUAC="true"
GenerateDebugInformation="true" GenerateDebugInformation="true"
@ -944,11 +944,11 @@
> >
</File> </File>
<File <File
RelativePath="..\libsrc\include\gprim.hpp" RelativePath="..\libsrc\gprim\gprim.hpp"
> >
</File> </File>
<File <File
RelativePath="..\libsrc\gprim\gprim.hpp" RelativePath="..\libsrc\include\gprim.hpp"
> >
</File> </File>
<File <File
@ -1032,11 +1032,11 @@
> >
</File> </File>
<File <File
RelativePath="..\libsrc\meshing\meshing.hpp" RelativePath="..\libsrc\include\meshing.hpp"
> >
</File> </File>
<File <File
RelativePath="..\libsrc\include\meshing.hpp" RelativePath="..\libsrc\meshing\meshing.hpp"
> >
</File> </File>
<File <File
@ -1116,11 +1116,11 @@
> >
</File> </File>
<File <File
RelativePath="..\libsrc\include\occgeom.hpp" RelativePath="..\libsrc\occ\occgeom.hpp"
> >
</File> </File>
<File <File
RelativePath="..\libsrc\occ\occgeom.hpp" RelativePath="..\libsrc\include\occgeom.hpp"
> >
</File> </File>
<File <File
@ -1128,11 +1128,11 @@
> >
</File> </File>
<File <File
RelativePath="..\libsrc\include\opti.hpp" RelativePath="..\libsrc\linalg\opti.hpp"
> >
</File> </File>
<File <File
RelativePath="..\libsrc\linalg\opti.hpp" RelativePath="..\libsrc\include\opti.hpp"
> >
</File> </File>
<File <File
@ -1240,11 +1240,11 @@
> >
</File> </File>
<File <File
RelativePath="..\libsrc\include\stlgeom.hpp" RelativePath="..\libsrc\stlgeom\stlgeom.hpp"
> >
</File> </File>
<File <File
RelativePath="..\libsrc\stlgeom\stlgeom.hpp" RelativePath="..\libsrc\include\stlgeom.hpp"
> >
</File> </File>
<File <File
@ -1308,11 +1308,11 @@
> >
</File> </File>
<File <File
RelativePath="..\libsrc\visualization\visual.hpp" RelativePath="..\libsrc\include\visual.hpp"
> >
</File> </File>
<File <File
RelativePath="..\libsrc\include\visual.hpp" RelativePath="..\libsrc\visualization\visual.hpp"
> >
</File> </File>
<File <File