ryujinx/Opentk
1
0
Fork 0
mirror of https://github.com/Ryujinx/Opentk.git synced 2025-01-26 20:41:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #156 from thefiddler/buildfix

Browse source 
Use "Preserve Newest" option on OpenTK.dll.config
This commit is contained in:
thefiddler 2014-07-21 17:56:10 +02:00
parent b5dd2f9c87 b07e5941dd
commit 7c98a9c58d
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.travis.yml
View file

@ -5,7 +5,7 @@ env:
- EnableNuGetPackageRestore=true - EnableNuGetPackageRestore=true
matrix: matrix:
- MONO_VER="2.10.11" - MONO_VER="2.10.11"
- MONO_VER="3.2.6" - MONO_VER="3.4.0"
before_install: before_install:
- wget "http://download.mono-project.com/archive/${MONO_VER}/macos-10-x86/MonoFramework-MDK-${MONO_VER}.macos10.xamarin.x86.pkg" "http://download.mono-project.com/archive/${MONO_VER}/macos-10-x86/MonoFramework-MDK-${MONO_VER}.macos10.xamarin.x86.dmg" || true - wget "http://download.mono-project.com/archive/${MONO_VER}/macos-10-x86/MonoFramework-MDK-${MONO_VER}.macos10.xamarin.x86.pkg" "http://download.mono-project.com/archive/${MONO_VER}/macos-10-x86/MonoFramework-MDK-${MONO_VER}.macos10.xamarin.x86.dmg" || true
@ -15,4 +15,3 @@ before_install:
script: script:
- xbuild && xbuild /p:Configuration=Release - xbuild && xbuild /p:Configuration=Release

2
Source/OpenTK/OpenTK.csproj
View file

@ -698,7 +698,7 @@
<Compile Include="Platform\X11\X11Mouse.cs" /> <Compile Include="Platform\X11\X11Mouse.cs" />
<Compile Include="Input\ButtonState.cs" /> <Compile Include="Input\ButtonState.cs" />
<EmbeddedResource Include="OpenTK.dll.config"> <EmbeddedResource Include="OpenTK.dll.config">
<CopyToOutputDirectory>Always</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</EmbeddedResource> </EmbeddedResource>
<Compile Include="Platform\MacOS\HIDInput.cs" /> <Compile Include="Platform\MacOS\HIDInput.cs" />
<Compile Include="IntPtrEqualityComparer.cs" /> <Compile Include="IntPtrEqualityComparer.cs" />