diff options
author | Thomas Leyh <thomas.leyh@mailbox.org> | 2019-05-01 01:56:59 +0200 |
---|---|---|
committer | Thomas Leyh <thomas.leyh@mailbox.org> | 2019-05-01 01:56:59 +0200 |
commit | 8b54fbf00da73a3e4801a25690618132f1e039a4 (patch) | |
tree | f00a0ba891789d0b494d73f44561e5a681c8b3ce /V3 | |
parent | ced3d03bdb3ce866d832e03fb212865140905a9a (diff) | |
download | V3-8b54fbf00da73a3e4801a25690618132f1e039a4.tar.gz V3-8b54fbf00da73a3e4801a25690618132f1e039a4.tar.bz2 |
Use Monogame 3.7 package and add Setup project.
Diffstat (limited to 'V3')
-rw-r--r-- | V3/ClassDiagram1.cd | 2 | ||||
-rw-r--r-- | V3/OpenTK.dll.config | 25 | ||||
-rw-r--r-- | V3/V3.csproj | 120 | ||||
-rw-r--r-- | V3/packages.config | 1 |
4 files changed, 83 insertions, 65 deletions
diff --git a/V3/ClassDiagram1.cd b/V3/ClassDiagram1.cd deleted file mode 100644 index 7b89419..0000000 --- a/V3/ClassDiagram1.cd +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<ClassDiagram />
\ No newline at end of file diff --git a/V3/OpenTK.dll.config b/V3/OpenTK.dll.config deleted file mode 100644 index 3f888cc..0000000 --- a/V3/OpenTK.dll.config +++ /dev/null @@ -1,25 +0,0 @@ -<configuration> - <dllmap os="linux" dll="opengl32.dll" target="libGL.so.1"/> - <dllmap os="linux" dll="glu32.dll" target="libGLU.so.1"/> - <dllmap os="linux" dll="openal32.dll" target="libopenal.so.1"/> - <dllmap os="linux" dll="alut.dll" target="libalut.so.0"/> - <dllmap os="linux" dll="opencl.dll" target="libOpenCL.so"/> - <dllmap os="linux" dll="libX11" target="libX11.so.6"/> - <dllmap os="linux" dll="libXi" target="libXi.so.6"/> - <dllmap os="linux" dll="SDL2.dll" target="libSDL2-2.0.so.0.disabled"/> - <dllmap os="osx" dll="opengl32.dll" target="/System/Library/Frameworks/OpenGL.framework/OpenGL"/> - <dllmap os="osx" dll="openal32.dll" target="/System/Library/Frameworks/OpenAL.framework/OpenAL" /> - <dllmap os="osx" dll="alut.dll" target="/System/Library/Frameworks/OpenAL.framework/OpenAL" /> - <dllmap os="osx" dll="libGLES.dll" target="/System/Library/Frameworks/OpenGLES.framework/OpenGLES" /> - <dllmap os="osx" dll="libGLESv1_CM.dll" target="/System/Library/Frameworks/OpenGLES.framework/OpenGLES" /> - <dllmap os="osx" dll="libGLESv2.dll" target="/System/Library/Frameworks/OpenGLES.framework/OpenGLES" /> - <dllmap os="osx" dll="opencl.dll" target="/System/Library/Frameworks/OpenCL.framework/OpenCL"/> - <dllmap os="osx" dll="SDL2.dll" target="libSDL2.dylib"/> - <!-- XQuartz compatibility (X11 on Mac) --> - <dllmap os="osx" dll="libGL.so.1" target="/usr/X11/lib/libGL.dylib"/> - <dllmap os="osx" dll="libX11" target="/usr/X11/lib/libX11.dylib"/> - <dllmap os="osx" dll="libXcursor.so.1" target="/usr/X11/lib/libXcursor.dylib"/> - <dllmap os="osx" dll="libXi" target="/usr/X11/lib/libXi.dylib"/> - <dllmap os="osx" dll="libXinerama" target="/usr/X11/lib/libXinerama.dylib"/> - <dllmap os="osx" dll="libXrandr.so.2" target="/usr/X11/lib/libXrandr.dylib"/> -</configuration> diff --git a/V3/V3.csproj b/V3/V3.csproj index 56f7461..5cf5cfc 100644 --- a/V3/V3.csproj +++ b/V3/V3.csproj @@ -14,6 +14,7 @@ <FileAlignment>512</FileAlignment> <MonoGamePlatform>DesktopGL</MonoGamePlatform> <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> + <IsWebBootstrapper>false</IsWebBootstrapper> <PublishUrl>publish\</PublishUrl> <Install>true</Install> <InstallFrom>Disk</InstallFrom> @@ -26,9 +27,10 @@ <MapFileExtensions>true</MapFileExtensions> <ApplicationRevision>0</ApplicationRevision> <ApplicationVersion>1.0.0.%2a</ApplicationVersion> - <IsWebBootstrapper>false</IsWebBootstrapper> <UseApplicationTrust>false</UseApplicationTrust> <BootstrapperEnabled>true</BootstrapperEnabled> + <NuGetPackageImportStamp> + </NuGetPackageImportStamp> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> <PlatformTarget>x86</PlatformTarget> @@ -92,6 +94,66 @@ <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> <Prefer32Bit>true</Prefer32Bit> </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'"> + <DebugSymbols>true</DebugSymbols> + <OutputPath>bin\x64\Debug\</OutputPath> + <DefineConstants>TRACE;DEBUG;LINUX</DefineConstants> + <DebugType>full</DebugType> + <PlatformTarget>x64</PlatformTarget> + <ErrorReport>prompt</ErrorReport> + <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> + <Prefer32Bit>true</Prefer32Bit> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'"> + <OutputPath>bin\x64\Release\</OutputPath> + <DefineConstants>TRACE;LINUX NEWMAP</DefineConstants> + <Optimize>true</Optimize> + <DebugType>pdbonly</DebugType> + <PlatformTarget>x64</PlatformTarget> + <ErrorReport>prompt</ErrorReport> + <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> + <Prefer32Bit>true</Prefer32Bit> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Pool|x64'"> + <DebugSymbols>true</DebugSymbols> + <OutputPath>bin\x64\Pool\</OutputPath> + <DefineConstants>TRACE;DEBUG;LINUX NO_AUDIO</DefineConstants> + <DebugType>full</DebugType> + <PlatformTarget>x64</PlatformTarget> + <ErrorReport>prompt</ErrorReport> + <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> + <Prefer32Bit>true</Prefer32Bit> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Feature|x64'"> + <DebugSymbols>true</DebugSymbols> + <OutputPath>bin\x64\Feature\</OutputPath> + <DefineConstants>TRACE;DEBUG;LINUX TEST_OBJECTSMANAGER NEW_MUSIC</DefineConstants> + <DebugType>full</DebugType> + <PlatformTarget>x64</PlatformTarget> + <ErrorReport>prompt</ErrorReport> + <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> + <Prefer32Bit>true</Prefer32Bit> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Old Debug|x64'"> + <DebugSymbols>true</DebugSymbols> + <OutputPath>bin\x64\Old Debug\</OutputPath> + <DefineConstants>TRACE;DEBUG;LINUX</DefineConstants> + <DebugType>full</DebugType> + <PlatformTarget>x64</PlatformTarget> + <ErrorReport>prompt</ErrorReport> + <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> + <Prefer32Bit>true</Prefer32Bit> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Larger Map|x64'"> + <DebugSymbols>true</DebugSymbols> + <OutputPath>bin\x64\Larger Map\</OutputPath> + <DefineConstants>TRACE;DEBUG;LINUX NEWMAP</DefineConstants> + <DebugType>full</DebugType> + <PlatformTarget>x64</PlatformTarget> + <ErrorReport>prompt</ErrorReport> + <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> + <Prefer32Bit>true</Prefer32Bit> + </PropertyGroup> <ItemGroup> <Compile Include="AchievementsAndStatistics.cs" /> <Compile Include="Bindings.cs" /> @@ -289,6 +351,9 @@ <HintPath>..\packages\Castle.Core.3.2.0\lib\net45\Castle.Core.dll</HintPath> <Private>True</Private> </Reference> + <Reference Include="MonoGame.Framework, Version=3.7.1.189, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\packages\MonoGame.Framework.DesktopGL.3.7.1.189\lib\net45\MonoGame.Framework.dll</HintPath> + </Reference> <Reference Include="Ninject, Version=3.2.0.0, Culture=neutral, PublicKeyToken=c7192dc5380945e7, processorArchitecture=MSIL"> <HintPath>..\packages\Ninject.3.2.2.0\lib\net45-full\Ninject.dll</HintPath> <Private>True</Private> @@ -297,15 +362,6 @@ <HintPath>..\packages\Ninject.Extensions.Factory.3.2.1.0\lib\net45-full\Ninject.Extensions.Factory.dll</HintPath> <Private>True</Private> </Reference> - <Reference Include="OpenTK"> - <HintPath>$(MonoGameInstallDirectory)\MonoGame\v3.0\Assemblies\DesktopGL\OpenTK.dll</HintPath> - </Reference> - <Reference Include="NVorbis"> - <HintPath>$(MonoGameInstallDirectory)\MonoGame\v3.0\Assemblies\DesktopGL\NVorbis.dll</HintPath> - </Reference> - <Reference Include="MonoGame.Framework"> - <HintPath>$(MonoGameInstallDirectory)\MonoGame\v3.0\Assemblies\DesktopGL\MonoGame.Framework.dll</HintPath> - </Reference> <Reference Include="System" /> <Reference Include="System.Xml" /> </ItemGroup> @@ -314,33 +370,19 @@ <CopyToOutputDirectory>Always</CopyToOutputDirectory> </None> <EmbeddedResource Include="Icon.ico" /> - <Content Include="Content\Buttons\Button-01.png"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </Content> + <Content Include="Content\Buttons\Button-01.png" /> <Content Include="Content\Buttons\Button-01_Pressed.png" /> - <Content Include="Content\Buttons\Button-02.png"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </Content> + <Content Include="Content\Buttons\Button-02.png" /> <Content Include="Content\Buttons\Button-02_Pressed.png" /> - <Content Include="Content\Buttons\Button-03.png"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </Content> + <Content Include="Content\Buttons\Button-03.png" /> <Content Include="Content\Buttons\Button-03_Pressed.png" /> - <Content Include="Content\Buttons\Button-04.png"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </Content> + <Content Include="Content\Buttons\Button-04.png" /> <Content Include="Content\Buttons\Button-04_Pressed.png" /> - <Content Include="Content\Buttons\Button-05.png"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </Content> + <Content Include="Content\Buttons\Button-05.png" /> <Content Include="Content\Buttons\Button-05_Pressed.png" /> - <Content Include="Content\Buttons\Button-06.png"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </Content> + <Content Include="Content\Buttons\Button-06.png" /> <Content Include="Content\Buttons\Button-06_Pressed.png" /> - <Content Include="Content\Buttons\Button-07.png"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </Content> + <Content Include="Content\Buttons\Button-07.png" /> <Content Include="Content\Buttons\Button-07_Pressed.png" /> <Content Include="Content\Effects\blood_hit_01.png" /> <Content Include="Content\Effects\blood_hit_02.png" /> @@ -354,9 +396,7 @@ <Content Include="Content\Effects\particlefx_04.png" /> <Content Include="Content\Effects\particlefx_05.png" /> <Content Include="Content\Effects\quake.png" /> - <Content Include="Content\Menu\arrow_white.png"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </Content> + <Content Include="Content\Menu\arrow_white.png" /> <Content Include="Content\Menu\mainscreen.jpg" /> <Content Include="Content\Menu\Titel.png" /> <Content Include="Content\Sounds\Afraid_to_Go.mp3" /> @@ -434,15 +474,11 @@ <None Include="CREDITS.md"> <CopyToOutputDirectory>Always</CopyToOutputDirectory> </None> - <Content Include="OpenTK.dll.config"> - <CopyToOutputDirectory>Always</CopyToOutputDirectory> - </Content> </ItemGroup> <ItemGroup> <MonoGameContentReference Include="Content\Content.mgcb" /> </ItemGroup> <ItemGroup> - <None Include="ClassDiagram1.cd" /> <None Include="Content\Fonts\Blutschrift.ttf" /> <None Include="Content\Fonts\DeathFont.spritefont" /> <None Include="Content\Fonts\DejaVuSans.ttf" /> @@ -493,6 +529,14 @@ <Install>false</Install> </BootstrapperPackage> </ItemGroup> + <ItemGroup /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildExtensionsPath)\MonoGame\v3.0\MonoGame.Content.Builder.targets" /> + <Import Project="..\packages\MonoGame.Framework.DesktopGL.3.7.1.189\build\MonoGame.Framework.DesktopGL.targets" Condition="Exists('..\packages\MonoGame.Framework.DesktopGL.3.7.1.189\build\MonoGame.Framework.DesktopGL.targets')" /> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> + <PropertyGroup> + <ErrorText>Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Verwenden Sie die Wiederherstellung von NuGet-Paketen, um die fehlenden Dateien herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}".</ErrorText> + </PropertyGroup> + <Error Condition="!Exists('..\packages\MonoGame.Framework.DesktopGL.3.7.1.189\build\MonoGame.Framework.DesktopGL.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MonoGame.Framework.DesktopGL.3.7.1.189\build\MonoGame.Framework.DesktopGL.targets'))" /> + </Target> </Project>
\ No newline at end of file diff --git a/V3/packages.config b/V3/packages.config index 8839ef8..49d1bbf 100644 --- a/V3/packages.config +++ b/V3/packages.config @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> <package id="Castle.Core" version="3.2.0" targetFramework="net45" /> + <package id="MonoGame.Framework.DesktopGL" version="3.7.1.189" targetFramework="net45" /> <package id="Ninject" version="3.2.2.0" targetFramework="net45" /> <package id="Ninject.Extensions.Factory" version="3.2.1.0" targetFramework="net45" /> </packages>
\ No newline at end of file |