added Visual Studio Project files

99f0a72a · bader · 7eb00b39 · 99f0a72a · 99f0a72a · 99f0a72a
Commit 99f0a72a authored Jul 17, 2012 by bader
7 changed files
--- a/SWE OpenGL.vcxproj
+++ b/SWE OpenGL.vcxproj
+<?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>{88B845B4-569C-49D1-9C07-967D2E58EAC9}</ProjectGuid>
+    <RootNamespace>SWEOpenGL</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+    <Import Project="$(VCTargetsPath)\BuildCustomizations\CUDA 4.2.props" />
+  </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'">
+    <IncludePath>C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v4.2\include;$(IncludePath)</IncludePath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ReferencePath>C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v4.2\lib;$(ReferencePath)</ReferencePath>
+    <LibraryPath>$(LibraryPath)</LibraryPath>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>SDL\include;$(CudaToolkitIncludeDir)</AdditionalIncludeDirectories>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalLibraryDirectories>SDL\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>opengl32.lib;glu32.lib;sdl.lib;sdlmain.lib;cudart.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+    <CudaCompile>
+      <Runtime>MD</Runtime>
+    </CudaCompile>
+    <PostBuildEvent>
+      <Command>xcopy /y "$(ProjectDir)SDL\lib\SDL.dll" "$(OutDir)" </Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <AdditionalIncludeDirectories>SDL\include;$(CudaToolkitIncludeDir)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>opengl32.lib;glu32.lib;sdl.lib;sdlmain.lib;cudart.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>SDL\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SubSystem>Windows</SubSystem>
+    </Link>
+    <PostBuildEvent>
+      <Command>xcopy /y $(ProjectDir)SDL\lib\SDL.dll $(OutDir) </Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClInclude Include="src\opengl\camera.h" />
+    <ClInclude Include="src\opengl\controller.h" />
+    <ClInclude Include="src\opengl\shader.h" />
+    <ClInclude Include="src\opengl\simulation.h" />
+    <ClInclude Include="src\opengl\visualization.h" />
+    <ClInclude Include="src\scenarios\SWE_simple_scenarios_vis.h" />
+    <ClInclude Include="src\scenarios\SWE_VisInfo.h" />
+    <ClInclude Include="src\scenarios\SWE_VtkScenario.h" />
+    <ClInclude Include="src\scenarios\SWE_VtkScenarioVisInfo.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="src\examples\swe_opengl.cpp" />
+    <ClCompile Include="src\opengl\camera.cpp" />
+    <ClCompile Include="src\opengl\controller.cpp" />
+    <ClCompile Include="src\opengl\shader.cpp" />
+    <ClCompile Include="src\opengl\visualization.cpp" />
+    <ClCompile Include="src\scenarios\SWE_VtkScenario.cpp" />
+    <ClCompile Include="src\scenarios\SWE_VtkScenarioVisInfo.cpp" />
+    <ClCompile Include="src\SWE_Block.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <CudaCompile Include="src\opengl\simulation.cu">
+      <FileType>Document</FileType>
+    </CudaCompile>
+    <CudaCompile Include="src\SWE_BlockCUDA.cu" />
+    <CudaCompile Include="src\SWE_BlockCUDA_kernels.cu" />
+    <CudaCompile Include="src\SWE_RusanovBlockCUDA.cu" />
+    <CudaCompile Include="src\SWE_RusanovBlockCUDA_kernels.cu" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="src\SWE_Block.hh" />
+    <None Include="src\SWE_BlockCUDA.hh" />
+    <None Include="src\SWE_BlockCUDA_kernels.hh" />
+    <None Include="src\SWE_RusanovBlockCUDA.hh" />
+    <None Include="src\SWE_RusanovBlockCUDA_kernels.hh" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+    <Import Project="$(VCTargetsPath)\BuildCustomizations\CUDA 4.2.targets" />
+  </ImportGroup>
+</Project>
\ No newline at end of file
--- a/SWE OpenGL.vcxproj.filters
+++ b/SWE OpenGL.vcxproj.filters
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Quelldateien">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Headerdateien">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Ressourcendateien">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="src\opengl\camera.h">
+      <Filter>Headerdateien</Filter>
+    </ClInclude>
+    <ClInclude Include="src\opengl\controller.h">
+      <Filter>Headerdateien</Filter>
+    </ClInclude>
+    <ClInclude Include="src\opengl\shader.h">
+      <Filter>Headerdateien</Filter>
+    </ClInclude>
+    <ClInclude Include="src\opengl\simulation.h">
+      <Filter>Headerdateien</Filter>
+    </ClInclude>
+    <ClInclude Include="src\opengl\visualization.h">
+      <Filter>Headerdateien</Filter>
+    </ClInclude>
+    <ClInclude Include="src\scenarios\SWE_simple_scenarios_vis.h">
+      <Filter>Headerdateien</Filter>
+    </ClInclude>
+    <ClInclude Include="src\scenarios\SWE_VisInfo.h">
+      <Filter>Headerdateien</Filter>
+    </ClInclude>
+    <ClInclude Include="src\scenarios\SWE_VtkScenario.h">
+      <Filter>Headerdateien</Filter>
+    </ClInclude>
+    <ClInclude Include="src\scenarios\SWE_VtkScenarioVisInfo.h">
+      <Filter>Headerdateien</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="src\examples\swe_opengl.cpp">
+      <Filter>Quelldateien</Filter>
+    </ClCompile>
+    <ClCompile Include="src\opengl\camera.cpp">
+      <Filter>Quelldateien</Filter>
+    </ClCompile>
+    <ClCompile Include="src\opengl\controller.cpp">
+      <Filter>Quelldateien</Filter>
+    </ClCompile>
+    <ClCompile Include="src\opengl\shader.cpp">
+      <Filter>Quelldateien</Filter>
+    </ClCompile>
+    <ClCompile Include="src\opengl\visualization.cpp">
+      <Filter>Quelldateien</Filter>
+    </ClCompile>
+    <ClCompile Include="src\scenarios\SWE_VtkScenario.cpp">
+      <Filter>Quelldateien</Filter>
+    </ClCompile>
+    <ClCompile Include="src\scenarios\SWE_VtkScenarioVisInfo.cpp">
+      <Filter>Quelldateien</Filter>
+    </ClCompile>
+    <ClCompile Include="src\SWE_Block.cpp">
+      <Filter>Quelldateien</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <CudaCompile Include="src\opengl\simulation.cu">
+      <Filter>Quelldateien</Filter>
+    </CudaCompile>
+    <CudaCompile Include="src\SWE_RusanovBlockCUDA_kernels.cu">
+      <Filter>Quelldateien</Filter>
+    </CudaCompile>
+    <CudaCompile Include="src\SWE_BlockCUDA.cu">
+      <Filter>Quelldateien</Filter>
+    </CudaCompile>
+    <CudaCompile Include="src\SWE_BlockCUDA_kernels.cu">
+      <Filter>Quelldateien</Filter>
+    </CudaCompile>
+    <CudaCompile Include="src\SWE_RusanovBlockCUDA.cu">
+      <Filter>Quelldateien</Filter>
+    </CudaCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="src\SWE_RusanovBlockCUDA_kernels.hh">
+      <Filter>Headerdateien</Filter>
+    </None>
+    <None Include="src\SWE_RusanovBlockCUDA.hh">
+      <Filter>Headerdateien</Filter>
+    </None>
+    <None Include="src\SWE_BlockCUDA_kernels.hh">
+      <Filter>Headerdateien</Filter>
+    </None>
+    <None Include="src\SWE_BlockCUDA.hh">
+      <Filter>Headerdateien</Filter>
+    </None>
+    <None Include="src\SWE_Block.hh">
+      <Filter>Headerdateien</Filter>
+    </None>
+  </ItemGroup>
+</Project>
\ No newline at end of file
--- a/SWE OpenGL.vcxproj.user
+++ b/SWE OpenGL.vcxproj.user
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+</Project>
\ No newline at end of file
--- a/SWE for Windows.sln
+++ b/SWE for Windows.sln
@@ -3,6 +3,10 @@ Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual C++ Express 2010
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SWE for Windows", "SWE for Windows.vcxproj", "{2582913D-07C3-6F6B-46E0-6B3942A726C4}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SWE OpenGL", "SWE OpenGL.vcxproj", "{88B845B4-569C-49D1-9C07-967D2E58EAC9}"
+EndProject
+#Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SWE OpenGL", "..\..\..\visual studio 2010\Projects\SWE #OpenGL\SWE OpenGL.vcxproj", "{88B845B4-569C-49D1-9C07-967D2E58EAC9}"
+#EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		CUDA|Win32 = CUDA|Win32
@@ -16,6 +20,16 @@ Global
 		{2582913D-07C3-6F6B-46E0-6B3942A726C4}.Debug|Win32.Build.0 = Debug|Win32
 		{2582913D-07C3-6F6B-46E0-6B3942A726C4}.Release|Win32.ActiveCfg = Release|Win32
 		{2582913D-07C3-6F6B-46E0-6B3942A726C4}.Release|Win32.Build.0 = Release|Win32
+		{88B845B4-569C-49D1-9C07-967D2E58EAC9}.Debug|Win32.ActiveCfg = Debug|Win32
+		{88B845B4-569C-49D1-9C07-967D2E58EAC9}.Debug|Win32.Build.0 = Debug|Win32
+		{88B845B4-569C-49D1-9C07-967D2E58EAC9}.Release|Win32.ActiveCfg = Release|Win32
+		{88B845B4-569C-49D1-9C07-967D2E58EAC9}.Release|Win32.Build.0 = Release|Win32
+#		{88B845B4-569C-49D1-9C07-967D2E58EAC9}.CUDA|Win32.ActiveCfg = Release|Win32
+#		{88B845B4-569C-49D1-9C07-967D2E58EAC9}.CUDA|Win32.Build.0 = Release|Win32
+#		{88B845B4-569C-49D1-9C07-967D2E58EAC9}.Debug|Win32.ActiveCfg = Debug|Win32
+#		{88B845B4-569C-49D1-9C07-967D2E58EAC9}.Debug|Win32.Build.0 = Debug|Win32
+#		{88B845B4-569C-49D1-9C07-967D2E58EAC9}.Release|Win32.ActiveCfg = Release|Win32
+#		{88B845B4-569C-49D1-9C07-967D2E58EAC9}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

--- a/SWE for Windows.vcxproj
+++ b/SWE for Windows.vcxproj
@@ -113,6 +113,12 @@
    <ClInclude Include="src\scenarios\SWE_AsagiScenario.hpp" />
    <ClInclude Include="src\scenarios\SWE_Scenario.h" />
    <ClInclude Include="src\scenarios\SWE_simple_scenarios.h" />
+    <ClInclude Include="src\solvers\augrie.hpp" />
+    <ClInclude Include="src\solvers\augriegeoclaw.hpp" />
+    <ClInclude Include="src\solvers\fwave.hpp" />
+    <ClInclude Include="src\solvers\FWaveCuda.h" />
+    <ClInclude Include="src\solvers\hybrid.hpp" />
+    <ClInclude Include="src\solvers\wavepropagation.hpp" />
    <ClInclude Include="src\tools\Logger.hpp" />
  </ItemGroup>
  <ItemGroup>
@@ -144,6 +150,15 @@
      <FileType>Document</FileType>
    </ClInclude>
  </ItemGroup>
+  <ItemGroup>
+    <None Include="src\swe_block.hh" />
+    <None Include="src\swe_blockcuda.hh" />
+    <None Include="src\SWE_BlockCUDA_kernels.hh" />
+    <None Include="src\swe_rusanovblock.hh" />
+    <None Include="src\SWE_RusanovBlockCUDA.hh" />
+    <None Include="src\SWE_RusanovBlockCUDA_kernels.hh" />
+    <None Include="src\swe_wavepropagationblock.hh" />
+  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
    <Import Project="$(VCTargetsPath)\BuildCustomizations\CUDA 4.2.targets" />

--- a/SWE for Windows.vcxproj.filters
+++ b/SWE for Windows.vcxproj.filters
@@ -43,6 +43,24 @@
    </ClInclude>
    <ClInclude Include="src\SWE_WavePropagationBlockCuda.hh" />
    <ClInclude Include="src\SWE_WavePropagationBlockCuda_kernels.hh" />
+    <ClInclude Include="src\solvers\augrie.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\solvers\augriegeoclaw.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\solvers\fwave.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\solvers\FWaveCuda.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\solvers\hybrid.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\solvers\wavepropagation.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
  </ItemGroup>
  <ItemGroup>
    <CudaCompile Include="src\SWE_BlockCUDA.cu" />
@@ -52,4 +70,13 @@
    <CudaCompile Include="src\SWE_WavePropagationBlockCuda.cu" />
    <CudaCompile Include="src\SWE_WavePropagationBlockCuda_kernels.cu" />
  </ItemGroup>
+  <ItemGroup>
+    <None Include="src\swe_blockcuda.hh" />
+    <None Include="src\swe_rusanovblock.hh" />
+    <None Include="src\SWE_BlockCUDA_kernels.hh" />
+    <None Include="src\swe_block.hh" />
+    <None Include="src\SWE_RusanovBlockCUDA.hh" />
+    <None Include="src\SWE_RusanovBlockCUDA_kernels.hh" />
+    <None Include="src\swe_wavepropagationblock.hh" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
--- a/SWE for Windows.vcxproj.user
+++ b/SWE for Windows.vcxproj.user
@@ -4,4 +4,7 @@
    <LocalDebuggerCommandArguments>160 160 swe_output</LocalDebuggerCommandArguments>
    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
  </PropertyGroup>
+  <PropertyGroup>
+    <ShowAllFiles>true</ShowAllFiles>
+  </PropertyGroup>
 </Project>
\ No newline at end of file