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

0026741: Problem with building samples and demo

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

16
samples/CSharp/OCCTProxy/OCCTProxy.vcproj
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"

16
samples/CSharp/OCCTProxy/OCCTProxy.vcxproj
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>

16
samples/CSharp/OCCTProxy_D3D/OCCTProxy_D3D.vcproj
View File

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

16
samples/CSharp/OCCTProxy_D3D/OCCTProxy_D3D.vcxproj
View File

@@ -83,7 +83,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\OCC\;$(CSF_OPT_INC);$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\OCC\;$(CASROOT)/inc;$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WNT;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
@@ -95,7 +95,7 @@
</ClCompile>
<Link>
<OutputFile>$(OutDir)OCCTProxy_D3D.dll</OutputFile>
<AdditionalLibraryDirectories>$(CSF_OPT_LIB32D);$(DXSDK_DIR)Lib\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>$(CASROOT)/win32/$(VCVER)/libd;$(DXSDK_DIR)Lib\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AssemblyDebug>true</AssemblyDebug>
<ProgramDatabaseFile>$(OutDir)OCCTProxy_D3D.pdb</ProgramDatabaseFile>
@@ -114,7 +114,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\OCC\;$(CSF_OPT_INC);$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\OCC\;$(CASROOT)/inc;$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WNT;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
@@ -126,7 +126,7 @@
</ClCompile>
<Link>
<OutputFile>$(OutDir)OCCTProxy_D3D.dll</OutputFile>
<AdditionalLibraryDirectories>$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>$(CASROOT)/win64/$(VCVER)/libd;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AssemblyDebug>true</AssemblyDebug>
<ProgramDatabaseFile>$(OutDir)OCCTProxy_D3D.pdb</ProgramDatabaseFile>
@@ -140,7 +140,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<AdditionalIncludeDirectories>..\OCC\;$(CSF_OPT_INC);$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\OCC\;$(CASROOT)/inc;$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<PrecompiledHeader>
@@ -150,7 +150,7 @@
</ClCompile>
<Link>
<OutputFile>$(OutDir)OCCTProxy_D3D.dll</OutputFile>
<AdditionalLibraryDirectories>$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>$(CASROOT)/win32/$(VCVER)/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
@@ -167,7 +167,7 @@
<TargetEnvironment>X64</TargetEnvironment>
</Midl>
<ClCompile>
<AdditionalIncludeDirectories>..\OCC\;$(CSF_OPT_INC);$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\OCC\;$(CASROOT)/inc;$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<PrecompiledHeader>
@@ -177,7 +177,7 @@
</ClCompile>
<Link>
<OutputFile>$(OutDir)OCCTProxy_D3D.dll</OutputFile>
<AdditionalLibraryDirectories>$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>$(CASROOT)/win64/$(VCVER)/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences>

41
samples/CSharp/msvc.bat
View File

@@ -1,7 +1,38 @@
call "%~dp0..\..\env.bat" %1 %2 %3
@echo off
if ["%CASDEB%"] == [""] (
call "%~dp0..\..\msvc.bat" %VCVER% win%ARCH% Release %~dp0\CSharp.sln
rem Setup environment
call "%~dp0../../env.bat" %1 %2 %3
rem Define path to project file
set "PRJFILE=%~dp0\CSharp.sln"
set "VisualStudioExpressName=VCExpress"
if "%VCVER%" == "vc8" (
set "DevEnvDir=%VS80COMNTOOLS%..\IDE"
) else if "%VCVER%" == "vc9" (
set "DevEnvDir=%VS90COMNTOOLS%..\IDE"
) else if "%VCVER%" == "vc10" (
set "DevEnvDir=%VS100COMNTOOLS%..\IDE"
) else if "%VCVER%" == "vc11" (
set "DevEnvDir=%VS110COMNTOOLS%..\IDE"
rem Visual Studio Express starting from VS 2012 is called "for Windows Desktop"
rem and has a new name for executable - WDExpress
set "VisualStudioExpressName=WDExpress"
) else if "%VCVER%" == "vc12" (
set "DevEnvDir=%VS120COMNTOOLS%..\IDE"
set "VisualStudioExpressName=WDExpress"
) else (
call "%~dp0..\..\msvc.bat" %VCVER% win%ARCH% Debug %~dp0\CSharp.sln
)
echo Error: wrong VS identifier
exit /B
)
rem Launch Visual Studio - either professional (devenv) or Express, as available
if exist "%DevEnvDir%\devenv.exe" (
start "%DevEnvDir%\devenv.exe" "%PRJFILE%"
) else if exist "%DevEnvDir%\%VisualStudioExpressName%.exe" (
start "%DevEnvDir%\%VisualStudioExpressName%.exe" "%PRJFILE%"
) else (
echo Error: Could not find MS Visual Studio ^(%VCVER%^)
echo Check relevant environment variable ^(e.g. VS80COMNTOOLS for vc8^)
)

37
samples/CSharp/msvc_D3D.bat
View File

@@ -1,5 +1,6 @@
@echo off
rem Setup environment
call "%~dp0..\..\env.bat" %1 %2 %3
if NOT DEFINED DXSDK_DIR (
@@ -13,8 +14,36 @@ if NOT DEFINED DXSDK_DIR (
)
)
if ["%CASDEB%"] == [""] (
call "%~dp0..\..\msvc.bat" %VCVER% win%ARCH% Release %~dp0\CSharp_D3D.sln
rem Define path to project file
set "PRJFILE=%~dp0\CSharp_D3D.sln"
set "VisualStudioExpressName=VCExpress"
if "%VCVER%" == "vc8" (
set "DevEnvDir=%VS80COMNTOOLS%..\IDE"
) else if "%VCVER%" == "vc9" (
set "DevEnvDir=%VS90COMNTOOLS%..\IDE"
) else if "%VCVER%" == "vc10" (
set "DevEnvDir=%VS100COMNTOOLS%..\IDE"
) else if "%VCVER%" == "vc11" (
set "DevEnvDir=%VS110COMNTOOLS%..\IDE"
rem Visual Studio Express starting from VS 2012 is called "for Windows Desktop"
rem and has a new name for executable - WDExpress
set "VisualStudioExpressName=WDExpress"
) else if "%VCVER%" == "vc12" (
set "DevEnvDir=%VS120COMNTOOLS%..\IDE"
set "VisualStudioExpressName=WDExpress"
) else (
call "%~dp0..\..\msvc.bat" %VCVER% win%ARCH% Debug %~dp0\CSharp_D3D.sln
)
echo Error: wrong VS identifier
exit /B
)
rem Launch Visual Studio - either professional (devenv) or Express, as available
if exist "%DevEnvDir%\devenv.exe" (
start "%DevEnvDir%\devenv.exe" "%PRJFILE%"
) else if exist "%DevEnvDir%\%VisualStudioExpressName%.exe" (
start "%DevEnvDir%\%VisualStudioExpressName%.exe" "%PRJFILE%"
) else (
echo Error: Could not find MS Visual Studio ^(%VCVER%^)
echo Check relevant environment variable ^(e.g. VS80COMNTOOLS for vc8^)
)