1
0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-14 13:30:48 +03:00

0026741: Problem with building samples and demo

Scripts and project files were changed to use corrent environment.
This commit is contained in:
ski
2015-10-08 15:09:38 +03:00
committed by bugmaster
parent c82b2ad7b8
commit 06562706d2
62 changed files with 576 additions and 485 deletions

View File

@@ -46,7 +46,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\OCC\;$(CSF_OPT_INC)"
AdditionalIncludeDirectories="..\OCC\;$(CASROOT)/inc"
PreprocessorDefinitions="WNT"
MinimalRebuild="false"
BasicRuntimeChecks="0"
@@ -68,7 +68,7 @@
Name="VCLinkerTool"
OutputFile="$(OutDir)/OCCTProxy.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="$(CSF_OPT_LIB32D)"
AdditionalLibraryDirectories="$(CASROOT)/win32/$(VCVER)/libd"
GenerateDebugInformation="true"
AssemblyDebug="1"
ProgramDatabaseFile="$(OutDir)/OCCTProxy.pdb"
@@ -128,7 +128,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\OCC\;$(CSF_OPT_INC)"
AdditionalIncludeDirectories="..\OCC\;$(CASROOT)/inc"
PreprocessorDefinitions="WNT"
MinimalRebuild="false"
BasicRuntimeChecks="0"
@@ -150,7 +150,7 @@
Name="VCLinkerTool"
OutputFile="$(OutDir)/OCCTProxy.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="$(CSF_OPT_LIB64D)"
AdditionalLibraryDirectories="$(CASROOT)/win64/$(VCVER)/libd"
GenerateDebugInformation="true"
AssemblyDebug="1"
ProgramDatabaseFile="$(OutDir)/OCCTProxy.pdb"
@@ -208,7 +208,7 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\OCC\;$(CSF_OPT_INC)"
AdditionalIncludeDirectories="..\OCC\;$(CASROOT)/inc"
PreprocessorDefinitions="WNT"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
@@ -228,7 +228,7 @@
Name="VCLinkerTool"
OutputFile="$(OutDir)/OCCTProxy.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="$(CSF_OPT_LIB32)"
AdditionalLibraryDirectories="$(CASROOT)/win32/$(VCVER)/lib"
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"
@@ -287,7 +287,7 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\OCC\;$(CSF_OPT_INC)"
AdditionalIncludeDirectories="..\OCC\;$(CASROOT)/inc"
PreprocessorDefinitions="WNT"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
@@ -307,7 +307,7 @@
Name="VCLinkerTool"
OutputFile="$(OutDir)/OCCTProxy.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="$(CSF_OPT_LIB64)"
AdditionalLibraryDirectories="$(CASROOT)/win64/$(VCVER)/lib"
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"

View File

@@ -82,7 +82,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\OCC\;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\OCC\;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
@@ -94,7 +94,7 @@
</ClCompile>
<Link>
<OutputFile>$(OutDir)OCCTProxy.dll</OutputFile>
<AdditionalLibraryDirectories>$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>$(CASROOT)/win32/$(VCVER)/libd;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AssemblyDebug>true</AssemblyDebug>
<ProgramDatabaseFile>$(OutDir)OCCTProxy.pdb</ProgramDatabaseFile>
@@ -112,7 +112,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\OCC\;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\OCC\;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
@@ -124,7 +124,7 @@
</ClCompile>
<Link>
<OutputFile>$(OutDir)OCCTProxy.dll</OutputFile>
<AdditionalLibraryDirectories>$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>$(CASROOT)/win64/$(VCVER)/libd;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AssemblyDebug>true</AssemblyDebug>
<ProgramDatabaseFile>$(OutDir)OCCTProxy.pdb</ProgramDatabaseFile>
@@ -138,7 +138,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<AdditionalIncludeDirectories>..\OCC\;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\OCC\;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<PrecompiledHeader>
@@ -148,7 +148,7 @@
</ClCompile>
<Link>
<OutputFile>$(OutDir)OCCTProxy.dll</OutputFile>
<AdditionalLibraryDirectories>$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>$(CASROOT)/win32/$(VCVER)/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
@@ -165,7 +165,7 @@
<TargetEnvironment>X64</TargetEnvironment>
</Midl>
<ClCompile>
<AdditionalIncludeDirectories>..\OCC\;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\OCC\;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<PrecompiledHeader>
@@ -175,7 +175,7 @@
</ClCompile>
<Link>
<OutputFile>$(OutDir)OCCTProxy.dll</OutputFile>
<AdditionalLibraryDirectories>$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>$(CASROOT)/win64/$(VCVER)/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences>