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

0027176: Configuration, CMake - INSTALL_DIR is a common prefix for all other install variables

Browse Source 
Possibility to customize layout of installation of OCCT is introduced by:
- variable INSTALL_DIR_LAYOUT - select one of the two predefined layouts: either Windows (classic OCCT layout) or Unix (Linux standard)
- variables INSTALL_DIR_* (BIN, LIB, INCLUDE, RESOURCE, DOC, TESTS, SCRIPT, SAMPLES, DATA) - specify locations of relevant components
- variable INSTALL_DIR_WITH_VERSION (bool) - specifies whether full version of OCCT should be used in paths in Unix layout

Files LICENSE_LGPL_21.txt and OCCT_LGPL_EXCEPTION.txt are always installed.

Environment is extended to support non-default layouts.
For that, environment variables "CSF_OCCT*Path" are defined, corresponding to CMake variables INSTALL_DIR_* described above.
Visual Studio environment, DRAW, tests, samples are amended to use these variables instead of (or as alternative to) CASROOT.

Settings of Products-specific vars are removed from environment scripts.

File genconf.bat was corrected to avoid error message for the case when path to TCL contains spaces.

Product name in rc files changed to "Open CASCADE Technology".
This commit is contained in:
ski
2016-03-18 08:25:53 +03:00
committed by abv
parent cb492860f1
commit 4b3541c68b
154 changed files with 1372 additions and 1310 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\;$(CASROOT)/inc"
AdditionalIncludeDirectories="..\OCC\;$(CSF_OCCTIncludePath)"
MinimalRebuild="false"
BasicRuntimeChecks="0"
RuntimeLibrary="3"
@@ -67,7 +67,7 @@
Name="VCLinkerTool"
OutputFile="$(OutDir)/OCCTProxy.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="$(CASROOT)/win32/$(VCVER)/libd"
AdditionalLibraryDirectories="$(CSF_OCCTLibPath)"
GenerateDebugInformation="true"
AssemblyDebug="1"
ProgramDatabaseFile="$(OutDir)/OCCTProxy.pdb"
@@ -127,7 +127,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\OCC\;$(CASROOT)/inc"
AdditionalIncludeDirectories="..\OCC\;$(CSF_OCCTIncludePath)"
MinimalRebuild="false"
BasicRuntimeChecks="0"
RuntimeLibrary="3"
@@ -148,7 +148,7 @@
Name="VCLinkerTool"
OutputFile="$(OutDir)/OCCTProxy.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="$(CASROOT)/win64/$(VCVER)/libd"
AdditionalLibraryDirectories="$(CSF_OCCTLibPath)"
GenerateDebugInformation="true"
AssemblyDebug="1"
ProgramDatabaseFile="$(OutDir)/OCCTProxy.pdb"
@@ -206,7 +206,7 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\OCC\;$(CASROOT)/inc"
AdditionalIncludeDirectories="..\OCC\;$(CSF_OCCTIncludePath)"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="3"
@@ -225,7 +225,7 @@
Name="VCLinkerTool"
OutputFile="$(OutDir)/OCCTProxy.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="$(CASROOT)/win32/$(VCVER)/lib"
AdditionalLibraryDirectories="$(CSF_OCCTLibPath)"
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"
@@ -284,7 +284,7 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\OCC\;$(CASROOT)/inc"
AdditionalIncludeDirectories="..\OCC\;$(CSF_OCCTIncludePath)"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="3"
@@ -303,7 +303,7 @@
Name="VCLinkerTool"
OutputFile="$(OutDir)/OCCTProxy.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="$(CASROOT)/win64/$(VCVER)/lib"
AdditionalLibraryDirectories="$(CSF_OCCTLibPath)"
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\;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\OCC\;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
@@ -94,7 +94,7 @@
</ClCompile>
<Link>
<OutputFile>$(OutDir)OCCTProxy.dll</OutputFile>
<AdditionalLibraryDirectories>$(CASROOT)/win32/$(VCVER)/libd;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AssemblyDebug>true</AssemblyDebug>
<ProgramDatabaseFile>$(OutDir)OCCTProxy.pdb</ProgramDatabaseFile>
@@ -112,7 +112,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\OCC\;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\OCC\;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
@@ -124,7 +124,7 @@
</ClCompile>
<Link>
<OutputFile>$(OutDir)OCCTProxy.dll</OutputFile>
<AdditionalLibraryDirectories>$(CASROOT)/win64/$(VCVER)/libd;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>$(CSF_OCCTLibPath);%(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\;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\OCC\;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<PrecompiledHeader>
@@ -148,7 +148,7 @@
</ClCompile>
<Link>
<OutputFile>$(OutDir)OCCTProxy.dll</OutputFile>
<AdditionalLibraryDirectories>$(CASROOT)/win32/$(VCVER)/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
@@ -165,7 +165,7 @@
<TargetEnvironment>X64</TargetEnvironment>
</Midl>
<ClCompile>
<AdditionalIncludeDirectories>..\OCC\;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\OCC\;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<PrecompiledHeader>
@@ -175,7 +175,7 @@
</ClCompile>
<Link>
<OutputFile>$(OutDir)OCCTProxy.dll</OutputFile>
<AdditionalLibraryDirectories>$(CASROOT)/win64/$(VCVER)/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>$(CSF_OCCTLibPath);%(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\;$(CASROOT)/inc;&quot;$(DXSDK_DIR)Include&quot;"
AdditionalIncludeDirectories="..\OCC\;$(CSF_OCCTIncludePath);&quot;$(DXSDK_DIR)Include&quot;"
PreprocessorDefinitions="_DEBUG"
MinimalRebuild="false"
BasicRuntimeChecks="0"
@@ -68,7 +68,7 @@
Name="VCLinkerTool"
OutputFile="$(OutDir)/OCCTProxy_D3D.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="$(CASROOT)/win32/$(VCVER)/libd"
AdditionalLibraryDirectories="$(CSF_OCCTLibPath)"
GenerateDebugInformation="true"
AssemblyDebug="1"
ProgramDatabaseFile="$(OutDir)/OCCTProxy_D3D.pdb"
@@ -128,7 +128,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\OCC\;$(CASROOT)/inc;&quot;$(DXSDK_DIR)Include&quot;"
AdditionalIncludeDirectories="..\OCC\;$(CSF_OCCTIncludePath);&quot;$(DXSDK_DIR)Include&quot;"
PreprocessorDefinitions="_DEBUG"
MinimalRebuild="false"
BasicRuntimeChecks="0"
@@ -150,7 +150,7 @@
Name="VCLinkerTool"
OutputFile="$(OutDir)/OCCTProxy_D3D.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="$(CASROOT)/win64/$(VCVER)/libd"
AdditionalLibraryDirectories="$(CSF_OCCTLibPath)"
GenerateDebugInformation="true"
AssemblyDebug="1"
ProgramDatabaseFile="$(OutDir)/OCCTProxy_D3D.pdb"
@@ -208,7 +208,7 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\OCC\;$(CASROOT)/inc;&quot;$(DXSDK_DIR)Include&quot;"
AdditionalIncludeDirectories="..\OCC\;$(CSF_OCCTIncludePath);&quot;$(DXSDK_DIR)Include&quot;"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="3"
@@ -227,7 +227,7 @@
Name="VCLinkerTool"
OutputFile="$(OutDir)/OCCTProxy_D3D.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="$(CASROOT)/win32/$(VCVER)/lib"
AdditionalLibraryDirectories="$(CSF_OCCTLibPath)"
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"
@@ -286,7 +286,7 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\OCC\;$(CASROOT)/inc;&quot;$(DXSDK_DIR)Include&quot;"
AdditionalIncludeDirectories="..\OCC\;$(CSF_OCCTIncludePath);&quot;$(DXSDK_DIR)Include&quot;"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="3"
@@ -305,7 +305,7 @@
Name="VCLinkerTool"
OutputFile="$(OutDir)/OCCTProxy_D3D.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="$(CASROOT)/win64/$(VCVER)/lib"
AdditionalLibraryDirectories="$(CSF_OCCTLibPath)"
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\;$(CASROOT)/inc;$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\OCC\;$(CSF_OCCTIncludePath);$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
@@ -95,7 +95,7 @@
</ClCompile>
<Link>
<OutputFile>$(OutDir)OCCTProxy_D3D.dll</OutputFile>
<AdditionalLibraryDirectories>$(CASROOT)/win32/$(VCVER)/libd;$(DXSDK_DIR)Lib\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>$(CSF_OCCTLibPath);$(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\;$(CASROOT)/inc;$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\OCC\;$(CSF_OCCTIncludePath);$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
@@ -126,7 +126,7 @@
</ClCompile>
<Link>
<OutputFile>$(OutDir)OCCTProxy_D3D.dll</OutputFile>
<AdditionalLibraryDirectories>$(CASROOT)/win64/$(VCVER)/libd;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>$(CSF_OCCTLibPath);%(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\;$(CASROOT)/inc;$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\OCC\;$(CSF_OCCTIncludePath);$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<PrecompiledHeader>
@@ -150,7 +150,7 @@
</ClCompile>
<Link>
<OutputFile>$(OutDir)OCCTProxy_D3D.dll</OutputFile>
<AdditionalLibraryDirectories>$(CASROOT)/win32/$(VCVER)/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
@@ -167,7 +167,7 @@
<TargetEnvironment>X64</TargetEnvironment>
</Midl>
<ClCompile>
<AdditionalIncludeDirectories>..\OCC\;$(CASROOT)/inc;$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\OCC\;$(CSF_OCCTIncludePath);$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<PrecompiledHeader>
@@ -177,7 +177,7 @@
</ClCompile>
<Link>
<OutputFile>$(OutDir)OCCTProxy_D3D.dll</OutputFile>
<AdditionalLibraryDirectories>$(CASROOT)/win64/$(VCVER)/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences>

4
samples/CSharp/WPF_D3D/OCCViewer.cs
View File

@@ -96,7 +96,7 @@ namespace IE_WPF_D3D
{
int aFormat = 10;
OpenFileDialog anOpenDialog = new OpenFileDialog ();
string aDataDir = ((Environment.GetEnvironmentVariable ("CASROOT")) + "\\..\\data");
string aDataDir = Environment.GetEnvironmentVariable ("CSF_OCCTDataPath");
string aFilter = "";
switch (theFormat)
@@ -141,7 +141,7 @@ namespace IE_WPF_D3D
{
int aFormat = 10;
SaveFileDialog saveDialog = new SaveFileDialog ();
string aDataDir = ((Environment.GetEnvironmentVariable ("CASROOT")) + "\\..\\data");
string aDataDir = Environment.GetEnvironmentVariable ("CSF_OCCTDataPath");
string aFilter = "";
switch (theFormat)

4
samples/CSharp/WPF_WinForms/OCCViewer.cs
View File

@@ -171,7 +171,7 @@ namespace IE_WPF_WinForms
{
int aFormat = 10;
OpenFileDialog anOpenDialog = new OpenFileDialog();
string aDataDir = ( (Environment.GetEnvironmentVariable("CASROOT")) + "\\..\\data" );
string aDataDir = Environment.GetEnvironmentVariable("CSF_OCCTDataPath");
string aFilter = "";
switch ( theFormat )
@@ -218,7 +218,7 @@ namespace IE_WPF_WinForms
{
int aFormat = 10;
SaveFileDialog saveDialog = new SaveFileDialog();
string aDataDir = ( (Environment.GetEnvironmentVariable("CASROOT") ) + "\\..\\data" );
string aDataDir = Environment.GetEnvironmentVariable("CSF_OCCTDataPath");
string aFilter = "";
switch ( theFormat )

4
samples/CSharp/WinForms/Form2.cs
View File

@@ -646,7 +646,7 @@ namespace IE_WinForms
int theformat = 10;
System.Windows.Forms.OpenFileDialog openDialog = new OpenFileDialog();
string DataDir = ((Environment.GetEnvironmentVariable("CASROOT")) + "\\..\\data");
string DataDir = Environment.GetEnvironmentVariable("CSF_OCCTDataPath");
string filter = "";
@@ -689,7 +689,7 @@ namespace IE_WinForms
{
int theformat = 10;
System.Windows.Forms.SaveFileDialog saveDialog = new SaveFileDialog();
string DataDir = ((Environment.GetEnvironmentVariable("CASROOT")) + "\\..\\data");
string DataDir = Environment.GetEnvironmentVariable("CSF_OCCTDataPath");
string filter = "";
switch (format)
{

14
samples/CSharp/msvc.bat
View File

@@ -1,25 +1,27 @@
@echo off
Setlocal EnableDelayedExpansion
rem Setup environment
call "%~dp0../../env.bat" %1 %2 %3
call "%~dp0env.bat" %1 %2 %3
rem Define path to project file
set "PRJFILE=%~dp0\CSharp.sln"
set "VisualStudioExpressName=VCExpress"
if "%VCVER%" == "vc8" (
if /I "%VCVER%" == "vc8" (
set "DevEnvDir=%VS80COMNTOOLS%..\IDE"
) else if "%VCVER%" == "vc9" (
) else if /I "%VCVER%" == "vc9" (
set "DevEnvDir=%VS90COMNTOOLS%..\IDE"
) else if "%VCVER%" == "vc10" (
) else if /I "%VCVER%" == "vc10" (
set "DevEnvDir=%VS100COMNTOOLS%..\IDE"
) else if "%VCVER%" == "vc11" (
) else if /I "%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" (
) else if /I "%VCVER%" == "vc12" (
set "DevEnvDir=%VS120COMNTOOLS%..\IDE"
set "VisualStudioExpressName=WDExpress"
) else (

18
samples/CSharp/msvc_D3D.bat
View File

@@ -1,14 +1,16 @@
@echo off
Setlocal EnableDelayedExpansion
rem Setup environment
call "%~dp0..\..\env.bat" %1 %2 %3
call "%~dp0env.bat" %1 %2 %3
if NOT DEFINED DXSDK_DIR (
if "%VCVER%" == "vc9" (
if /I "%VCVER%" == "vc9" (
echo ERROR: DirectX SDK is required in order to build the sample but it is not found in your system. Please install DirectX SDK and retry.
exit /B
)
if "%VCVER%" == "vc10" (
if /I "%VCVER%" == "vc10" (
echo ERROR: DirectX SDK is required in order to build the sample but it is not found in your system. Please install DirectX SDK and retry.
exit /B
)
@@ -19,18 +21,18 @@ set "PRJFILE=%~dp0\CSharp_D3D.sln"
set "VisualStudioExpressName=VCExpress"
if "%VCVER%" == "vc8" (
if /I "%VCVER%" == "vc8" (
set "DevEnvDir=%VS80COMNTOOLS%..\IDE"
) else if "%VCVER%" == "vc9" (
) else if /I "%VCVER%" == "vc9" (
set "DevEnvDir=%VS90COMNTOOLS%..\IDE"
) else if "%VCVER%" == "vc10" (
) else if /I "%VCVER%" == "vc10" (
set "DevEnvDir=%VS100COMNTOOLS%..\IDE"
) else if "%VCVER%" == "vc11" (
) else if /I "%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" (
) else if /I "%VCVER%" == "vc12" (
set "DevEnvDir=%VS120COMNTOOLS%..\IDE"
set "VisualStudioExpressName=WDExpress"
) else (

2
samples/CSharp/run.bat
View File

@@ -1,5 +1,7 @@
@echo off
Setlocal EnableDelayedExpansion
if "%1" == "-h" (
goto err_bat
)