Created visual studio solution with separate projects for each compon…

…ent. Does not yet have a distribute project, as we need to decide how we want the end results to be. Need to update projects with proper environment paths, currently using PolicyLib_ prefixes, but want to change that to a single folder Tinia_3rdParty. Fixed Win32 error in siut2/dsrv/Utils.hpp where M_2_PI was not defined, but if including math.h with #math_defines would collide with qmath.h for M_PI. Created ignore files for files not needed to keep in the repo, including emacs~ files.
sintefmath · Apr 24, 2012 · 6c21cc2 · 6c21cc2
1 parent 7b4bc87
commit 6c21cc2
Show file tree

Hide file tree

Showing 12 changed files with 1,407 additions and 12 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,13 @@
+*.user
+*.sdf
+*~
+/Tinia.suo
+/msvc/jobobserver/Debug
+/msvc/jobobserver/Release
+/msvc/policy/Debug
+/msvc/policy/Release
+/msvc/qtobserver/Release
+/msvc/qtobserver/Debug
+/msvc/qtobserver/GeneratedFiles
+/msvc/renderlist/Release
+/msvc/renderlist/Debug
diff --git a/Tinia.sln b/Tinia.sln
@@ -0,0 +1,46 @@
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qtobserver", "msvc\qtobserver\qtobserver.vcxproj", "{1507DFC6-011F-4FA3-A0DE-2E0C89885F63}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "policy", "msvc\policy\policy.vcxproj", "{9B784825-66F1-4DB3-A3F4-A13E67B2643B}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JobObserver", "msvc\jobobserver\jobobserver.vcxproj", "{70AD6BBC-2A98-4141-BA48-6527F82E3427}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{C4DE395F-8583-4950-844D-F6FF26862C10}"
+	ProjectSection(SolutionItems) = preProject
+		README.txt = README.txt
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "renderlist", "msvc\renderlist\renderlist.vcxproj", "{B0DEAA56-B73E-44D9-B7FE-4354AB4368C5}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Release|Win32 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{1507DFC6-011F-4FA3-A0DE-2E0C89885F63}.Debug|Win32.ActiveCfg = Debug|Win32
+		{1507DFC6-011F-4FA3-A0DE-2E0C89885F63}.Debug|Win32.Build.0 = Debug|Win32
+		{1507DFC6-011F-4FA3-A0DE-2E0C89885F63}.Release|Win32.ActiveCfg = Release|Win32
+		{1507DFC6-011F-4FA3-A0DE-2E0C89885F63}.Release|Win32.Build.0 = Release|Win32
+		{9B784825-66F1-4DB3-A3F4-A13E67B2643B}.Debug|Win32.ActiveCfg = Debug|Win32
+		{9B784825-66F1-4DB3-A3F4-A13E67B2643B}.Debug|Win32.Build.0 = Debug|Win32
+		{9B784825-66F1-4DB3-A3F4-A13E67B2643B}.Release|Win32.ActiveCfg = Release|Win32
+		{9B784825-66F1-4DB3-A3F4-A13E67B2643B}.Release|Win32.Build.0 = Release|Win32
+		{70AD6BBC-2A98-4141-BA48-6527F82E3427}.Debug|Win32.ActiveCfg = Debug|Win32
+		{70AD6BBC-2A98-4141-BA48-6527F82E3427}.Debug|Win32.Build.0 = Debug|Win32
+		{70AD6BBC-2A98-4141-BA48-6527F82E3427}.Release|Win32.ActiveCfg = Release|Win32
+		{70AD6BBC-2A98-4141-BA48-6527F82E3427}.Release|Win32.Build.0 = Release|Win32
+		{B0DEAA56-B73E-44D9-B7FE-4354AB4368C5}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B0DEAA56-B73E-44D9-B7FE-4354AB4368C5}.Debug|Win32.Build.0 = Debug|Win32
+		{B0DEAA56-B73E-44D9-B7FE-4354AB4368C5}.Release|Win32.ActiveCfg = Release|Win32
+		{B0DEAA56-B73E-44D9-B7FE-4354AB4368C5}.Release|Win32.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		QtVersion = 4.8.0
+	EndGlobalSection
+EndGlobal
diff --git a/debian/postinst~ b/debian/postinst~
diff --git a/lib/.gitignore b/lib/.gitignore
@@ -0,0 +1,2 @@
+
+*.lib
diff --git a/msvc/jobobserver/jobobserver.vcxproj b/msvc/jobobserver/jobobserver.vcxproj
@@ -0,0 +1,100 @@
+<?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="Distribute|Win32">
+      <Configuration>Distribute</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Package|Win32">
+      <Configuration>Package</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\include\tinia\jobobserver\ComputeJob.hpp" />
+    <ClInclude Include="..\..\include\tinia\jobobserver\Job.hpp" />
+    <ClInclude Include="..\..\include\tinia\jobobserver\Observer.hpp" />
+    <ClInclude Include="..\..\include\tinia\jobobserver\OpenGLJob.hpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\src\jobobserver\ComputeJob.cpp" />
+    <ClCompile Include="..\..\src\jobobserver\Job.cpp" />
+    <ClCompile Include="..\..\src\jobobserver\Observer.cpp" />
+    <ClCompile Include="..\..\src\jobobserver\OpenGLJob.cpp" />
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{70AD6BBC-2A98-4141-BA48-6527F82E3427}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>JobObsever</RootNamespace>
+    <ProjectName>JobObserver</ProjectName>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>$(SolutionDir)\lib\$(Configuration)\</OutDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>$(SolutionDir)\lib\$(Configuration)\</OutDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(SolutionDir)\include;$(PolicyLib_BOOST_INC_PATH)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(SolutionDir)\include;$(PolicyLib_BOOST_INC_PATH)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
diff --git a/msvc/jobobserver/jobobserver.vcxproj.filters b/msvc/jobobserver/jobobserver.vcxproj.filters
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <ClCompile Include="..\..\src\jobobserver\ComputeJob.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\jobobserver\OpenGLJob.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\jobobserver\Job.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\jobobserver\Observer.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\include\tinia\jobobserver\ComputeJob.hpp">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\tinia\jobobserver\Job.hpp">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\tinia\jobobserver\Observer.hpp">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\tinia\jobobserver\OpenGLJob.hpp">
+      <Filter>include</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <Filter Include="include">
+      <UniqueIdentifier>{e8d10bd4-8b5b-4c14-a745-7172def17fed}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="src">
+      <UniqueIdentifier>{ca09169a-4891-4f0e-b621-f3279fbf7e22}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+</Project>
diff --git a/msvc/policy/policy.vcxproj b/msvc/policy/policy.vcxproj
@@ -0,0 +1,131 @@
+<?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="Distribute|Win32">
+      <Configuration>Distribute</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Package|Win32">
+      <Configuration>Package</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{9B784825-66F1-4DB3-A3F4-A13E67B2643B}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>Policy</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LinkIncremental>true</LinkIncremental>
+    <OutDir>$(SolutionDir)\lib\$(Configuration)\</OutDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(SolutionDir)\lib\$(Configuration)\</OutDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(SolutionDir)\include;$(PolicyLib_BOOST_INC_PATH);</AdditionalIncludeDirectories>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+    <Lib>
+      <AdditionalLibraryDirectories>$(PolicyLib_BOOST_LIB_PATH);</AdditionalLibraryDirectories>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(SolutionDir)\include;$(PolicyLib_BOOST_INC_PATH);</AdditionalIncludeDirectories>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+    <Lib>
+      <AdditionalLibraryDirectories>$(PolicyLib_BOOST_LIB_PATH);</AdditionalLibraryDirectories>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\include\tinia\policy\ElementData.hpp" />
+    <ClInclude Include="..\..\include\tinia\policy\ElementDataFactory.hpp" />
+    <ClInclude Include="..\..\include\tinia\policy\File.hpp" />
+    <ClInclude Include="..\..\include\tinia\policy\GUIElement.hpp" />
+    <ClInclude Include="..\..\include\tinia\policy\GUILayoutListener.hpp" />
+    <ClInclude Include="..\..\include\tinia\policy\GUILayoutListenerHandler.hpp" />
+    <ClInclude Include="..\..\include\tinia\policy\Policy.hpp" />
+    <ClInclude Include="..\..\include\tinia\policy\PolicyLock.hpp" />
+    <ClInclude Include="..\..\include\tinia\policy\StateElement.hpp" />
+    <ClInclude Include="..\..\include\tinia\policy\StateListener.hpp" />
+    <ClInclude Include="..\..\include\tinia\policy\StateListenerHandler.hpp" />
+    <ClInclude Include="..\..\include\tinia\policy\StateSchemaElement.hpp" />
+    <ClInclude Include="..\..\include\tinia\policy\StateSchemaListener.hpp" />
+    <ClInclude Include="..\..\include\tinia\policy\StateSchemaListenerHandler.hpp" />
+    <ClInclude Include="..\..\include\tinia\policy\TypeToXSDType.hpp" />
+    <ClInclude Include="..\..\include\tinia\policy\utils.hpp" />
+    <ClInclude Include="..\..\include\tinia\policy\Viewer.hpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\src\policy\ElementData.cpp" />
+    <ClCompile Include="..\..\src\policy\File.cpp" />
+    <ClCompile Include="..\..\src\policy\Policy.cpp" />
+    <ClCompile Include="..\..\src\policy\PolicyLock.cpp" />
+    <ClCompile Include="..\..\src\policy\StateElement.cpp" />
+    <ClCompile Include="..\..\src\policy\StateListener.cpp" />
+    <ClCompile Include="..\..\src\policy\StateListenerHandler.cpp" />
+    <ClCompile Include="..\..\src\policy\StateSchemaElement.cpp" />
+    <ClCompile Include="..\..\src\policy\StateSchemaListener.cpp" />
+    <ClCompile Include="..\..\src\policy\StateSchemaListenerHandler.cpp" />
+    <ClCompile Include="..\..\src\policy\utils.cpp" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>