From a576c3e54dea7613e1f23e331d8f47a9ccfa00f2 Mon Sep 17 00:00:00 2001
From: bugmaster <bugmaster@opencascade.com>
Date: Wed, 23 Sep 2015 16:38:36 +0300
Subject: [PATCH] Updating service files of Voxel demo
---
samples/qt/VoxelDemo/VoxelDemo.vcproj | 290 -------------------------
samples/qt/VoxelDemo/VoxelDemo.vcxproj | 128 -----------
samples/qt/VoxelDemo/genproj.bat | 43 ++++
3 files changed, 43 insertions(+), 418 deletions(-)
delete mode 100644 samples/qt/VoxelDemo/VoxelDemo.vcproj
delete mode 100644 samples/qt/VoxelDemo/VoxelDemo.vcxproj
create mode 100644 samples/qt/VoxelDemo/genproj.bat
diff --git a/samples/qt/VoxelDemo/VoxelDemo.vcproj b/samples/qt/VoxelDemo/VoxelDemo.vcproj
deleted file mode 100644
index 68d7d2e44f..0000000000
--- a/samples/qt/VoxelDemo/VoxelDemo.vcproj
+++ /dev/null
@@ -1,290 +0,0 @@
-<?xml version="1.0" encoding="windows-1251"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="9.00"
- Name="VoxelDemo"
- ProjectGUID="{EF9DFAE9-E10E-42D4-87D1-52431728AFDF}"
- RootNamespace="VoxelDemo"
- Keyword="Win32Proj"
- TargetFrameworkVersion="131072"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
- ConfigurationType="1"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=".\inc;$(CSF_OPT_INC)"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WNT"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="false"
- DebugInformationFormat="4"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="opengl32.lib glu32.lib TKernel.lib TKMath.lib TKGeomBase.lib TKV3d.lib TKService.lib TKG3d.lib TKVoxel.lib TKTopAlgo.lib TKBRep.lib TKPrim.lib TKOpenGl.lib vfw32.lib QtCore4.lib QtGui4.lib "
- LinkIncremental="2"
- AdditionalLibraryDirectories="$(CSF_OPT_LIB32D)"
- GenerateDebugInformation="true"
- SubSystem="1"
- RandomizedBaseAddress="1"
- DataExecutionPrevention="0"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
- ConfigurationType="1"
- CharacterSet="1"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="$(CSF_OPT_INC);.\inc"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WNT"
- RuntimeLibrary="2"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="false"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="opengl32.lib glu32.lib TKernel.lib TKMath.lib TKGeomBase.lib TKV3d.lib TKService.lib TKG3d.lib TKVoxel.lib TKTopAlgo.lib TKBRep.lib TKPrim.lib TKOpenGl.lib vfw32.lib QtCore4.lib QtGui4.lib "
- LinkIncremental="1"
- AdditionalLibraryDirectories="$(CSF_OPT_LIB32)"
- GenerateDebugInformation="true"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- RandomizedBaseAddress="1"
- DataExecutionPrevention="0"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- >
- <File
- RelativePath=".\src\Application.cpp"
- >
- </File>
- <File
- RelativePath=".\src\ConversionThread.cpp"
- >
- </File>
- <File
- RelativePath=".\src\Main.cpp"
- >
- </File>
- <File
- RelativePath=".\src\Timer.cpp"
- >
- </File>
- <File
- RelativePath=".\src\Viewer.cpp"
- >
- </File>
- <File
- RelativePath=".\src\VoxelClient_VisDrawer.cxx"
- >
- </File>
- </Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl;inc;xsd"
- UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
- >
- <File
- RelativePath=".\inc\Application.h"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCustomBuildTool"
- CommandLine="moc.exe inc\$(InputFileName) -o moc\moc_$(InputName).cpp
"
- Outputs="moc\moc_$(InputName).cpp"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCustomBuildTool"
- CommandLine="moc.exe inc\$(InputFileName) -o moc\moc_$(InputName).cpp
"
- Outputs="moc\moc_$(InputName).cpp"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath=".\inc\ConversionThread.h"
- >
- </File>
- <File
- RelativePath=".\inc\Timer.h"
- >
- </File>
- <File
- RelativePath=".\inc\Viewer.h"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCustomBuildTool"
- CommandLine="moc.exe inc\$(InputFileName) -o moc\moc_$(InputName).cpp
"
- Outputs="moc\moc_$(InputName).cpp"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCustomBuildTool"
- CommandLine="moc.exe inc\$(InputFileName) -o moc\moc_$(InputName).cpp
"
- Outputs="moc\moc_$(InputName).cpp"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath=".\inc\VoxelClient_VisDrawer.h"
- >
- </File>
- </Filter>
- <Filter
- Name="Resource Files"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- >
- </Filter>
- <Filter
- Name="moc"
- >
- <File
- RelativePath=".\moc\moc_Application.cpp"
- >
- </File>
- <File
- RelativePath=".\moc\moc_Viewer.cpp"
- >
- </File>
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/samples/qt/VoxelDemo/VoxelDemo.vcxproj b/samples/qt/VoxelDemo/VoxelDemo.vcxproj
deleted file mode 100644
index ad02b85aac..0000000000
--- a/samples/qt/VoxelDemo/VoxelDemo.vcxproj
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{EF9DFAE9-E10E-42D4-87D1-52431728AFDF}</ProjectGuid>
- <RootNamespace>VoxelDemo</RootNamespace>
- <Keyword>Win32Proj</Keyword>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>.\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;WNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- </ClCompile>
- <Link>
- <AdditionalDependencies>opengl32.lib;glu32.lib;TKernel.lib;TKMath.lib;TKGeomBase.lib;TKV3d.lib;TKService.lib;TKG3d.lib;TKVoxel.lib;TKTopAlgo.lib;TKBRep.lib;TKPrim.lib;TKOpenGl.lib;vfw32.lib;QtCore4.lib;QtGui4.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <AdditionalLibraryDirectories>$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Console</SubSystem>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <DataExecutionPrevention>
- </DataExecutionPrevention>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <ClCompile>
- <AdditionalIncludeDirectories>$(CSF_OPT_INC);.\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;WNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- </ClCompile>
- <Link>
- <AdditionalDependencies>opengl32.lib;glu32.lib;TKernel.lib;TKMath.lib;TKGeomBase.lib;TKV3d.lib;TKService.lib;TKG3d.lib;TKVoxel.lib;TKTopAlgo.lib;TKBRep.lib;TKPrim.lib;TKOpenGl.lib;vfw32.lib;QtCore4.lib;QtGui4.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <AdditionalLibraryDirectories>$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Console</SubSystem>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <DataExecutionPrevention>
- </DataExecutionPrevention>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="src\Application.cpp" />
- <ClCompile Include="src\ConversionThread.cpp" />
- <ClCompile Include="src\Main.cpp" />
- <ClCompile Include="src\Timer.cpp" />
- <ClCompile Include="src\Viewer.cpp" />
- <ClCompile Include="src\VoxelClient_VisDrawer.cxx" />
- <ClCompile Include="moc\moc_Application.cpp" />
- <ClCompile Include="moc\moc_Viewer.cpp" />
- </ItemGroup>
- <ItemGroup>
- <CustomBuild Include="inc\Application.h">
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">moc.exe inc\%(Filename)%(Extension) -o moc\moc_%(Filename).cpp
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">moc\moc_%(Filename).cpp;%(Outputs)</Outputs>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">moc.exe inc\%(Filename)%(Extension) -o moc\moc_%(Filename).cpp
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">moc\moc_%(Filename).cpp;%(Outputs)</Outputs>
- </CustomBuild>
- <ClInclude Include="inc\ConversionThread.h" />
- <ClInclude Include="inc\Timer.h" />
- <CustomBuild Include="inc\Viewer.h">
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">moc.exe inc\%(Filename)%(Extension) -o moc\moc_%(Filename).cpp
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">moc\moc_%(Filename).cpp;%(Outputs)</Outputs>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">moc.exe inc\%(Filename)%(Extension) -o moc\moc_%(Filename).cpp
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">moc\moc_%(Filename).cpp;%(Outputs)</Outputs>
- </CustomBuild>
- <ClInclude Include="inc\VoxelClient_VisDrawer.h" />
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/samples/qt/VoxelDemo/genproj.bat b/samples/qt/VoxelDemo/genproj.bat
new file mode 100644
index 0000000000..997b1612b8
--- /dev/null
+++ b/samples/qt/VoxelDemo/genproj.bat
@@ -0,0 +1,43 @@
+REM Generation of vcproj files with qmake utilite
+REM Variable QTDIR and PATH to qmake executable must be defined without fail
+
+REM Use first argument to specify version of Visual Studio (vc8, vc9, or vc10),
+REM second argument specifies architecture) (win32 or win64)
+REM third argument specifies Debug or Release mode
+
+call "%~dp0../../../env.bat" %1 %2 %3
+
+set EXT=vcxproj
+
+if not "%1" == "" (
+ if /I "%1" == "vc8" (
+ set VCVER=vc8
+ set "VCVARS=%VS80COMNTOOLS%..\..\VC\vcvarsall.bat"
+ ) else if /I "%1" == "vc9" (
+ set VCVER=vc9
+ set "VCVARS=%VS90COMNTOOLS%..\..\VC\vcvarsall.bat"
+ ) else if /I "%1" == "vc10" (
+ set VCVER=vc10
+ set EXT=vcxproj
+ set "VCVARS=%VS100COMNTOOLS%..\..\VC\vcvarsall.bat"
+ ) else if /I "%1" == "vc11" (
+ set VCVER=vc11
+ set EXT=vcxproj
+ set "VCVARS=%VS110COMNTOOLS%..\..\VC\vcvarsall.bat"
+ ) else if /I "%1" == "vc12" (
+ set VCVER=vc12
+ set EXT=vcxproj
+ set "VCVARS=%VS120COMNTOOLS%..\..\VC\vcvarsall.bat"
+ ) else (
+ echo Error: first argument ^(%1^) should specify supported version of Visual C++,
+ echo one of: vc8 ^(VS 2005 SP1^), vc9 ^(VS 2008 SP1^), vc10 ^(VS 2010^) or vc11 ^(VS 2012^)
+ exit
+ )
+)
+
+if ["%ARCH%"] == ["32"] set VCARCH=x86
+if ["%ARCH%"] == ["64"] set VCARCH=amd64
+
+call "%VCVARS%" %VCARCH%
+
+qmake -tp vc -o VoxelDemo.%EXT% VoxelDemo.pro