joncampbell123/dosbox-x
1
0
Fork 0
mirror of https://github.com/joncampbell123/dosbox-x.git synced 2025-10-13 17:48:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Move shaders to contrib/shaders

Browse Source 
And update references. I hope this does not break the windows build.
This commit is contained in:
rderooy
2020-09-09 11:12:30 +02:00
parent f88dd7d2d0
commit 7a481e51ec
63 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
windows-installer/dosbox-x.bmp → contrib/icons/dosbox-x.bmp
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.6 KiB

After

Width:  |  Height:  |  Size: 9.6 KiB

0
shaders/2xSaI.fx → contrib/shaders/2xSaI.fx
View File

0
shaders/2xSaI_sRGB.fx → contrib/shaders/2xSaI_sRGB.fx
View File

0
shaders/2xSaL.fx → contrib/shaders/2xSaL.fx
View File

0
shaders/2xSaL2xAA.fx → contrib/shaders/2xSaL2xAA.fx
View File

0
shaders/2xSaLAA.fx → contrib/shaders/2xSaLAA.fx
View File

0
shaders/2xSaL_Ls.fx → contrib/shaders/2xSaL_Ls.fx
View File

0
shaders/4xSaL.fx → contrib/shaders/4xSaL.fx
View File

0
shaders/4xSoft.fx → contrib/shaders/4xSoft.fx
View File

0
shaders/4xSoft_PS3.0.fx → contrib/shaders/4xSoft_PS3.0.fx
View File

0
shaders/5xBR-v3.5b.fx → contrib/shaders/5xBR-v3.5b.fx
View File

0
shaders/5xBR-v3.8a.fx → contrib/shaders/5xBR-v3.8a.fx
View File

0
shaders/5xBR-v3.8b.fx → contrib/shaders/5xBR-v3.8b.fx
View File

0
shaders/5xBR-v3.8c.fx → contrib/shaders/5xBR-v3.8c.fx
View File

0
shaders/AdvancedAA.fx → contrib/shaders/AdvancedAA.fx
View File

0
shaders/CRT-geom-blend.fx → contrib/shaders/CRT-geom-blend.fx
View File

0
shaders/CRT-geom-curved.fx → contrib/shaders/CRT-geom-curved.fx
View File

0
shaders/CRT-simple.D3D.br.fx → contrib/shaders/CRT-simple.D3D.br.fx
View File

0
shaders/CRT-simple.D3D.fx → contrib/shaders/CRT-simple.D3D.fx
View File

0
shaders/CRT.D3D.br.fx → contrib/shaders/CRT.D3D.br.fx
View File

0
shaders/CRT.D3D.fx → contrib/shaders/CRT.D3D.fx
View File

0
shaders/Cartoon.fx → contrib/shaders/Cartoon.fx
View File

0
shaders/ColorSketch.fx → contrib/shaders/ColorSketch.fx
View File

0
shaders/DotnBloom.D3D.fx → contrib/shaders/DotnBloom.D3D.fx
View File

0
shaders/EGAfilter.fx → contrib/shaders/EGAfilter.fx
View File

0
shaders/GS2x.fx → contrib/shaders/GS2x.fx
View File

0
shaders/GS2xFilter.fx → contrib/shaders/GS2xFilter.fx
View File

0
shaders/GS2xSuper.fx → contrib/shaders/GS2xSuper.fx
View File

0
shaders/GS2xTwo.fx → contrib/shaders/GS2xTwo.fx
View File

0
shaders/GS4x.fx → contrib/shaders/GS4x.fx
View File

0
shaders/GS4xColorScale.fx → contrib/shaders/GS4xColorScale.fx
View File

0
shaders/GS4xFilter.fx → contrib/shaders/GS4xFilter.fx
View File

0
shaders/GS4xHqFilter.fx → contrib/shaders/GS4xHqFilter.fx
View File

0
shaders/GS4xScale.fx → contrib/shaders/GS4xScale.fx
View File

0
shaders/GS4xSoft.fx → contrib/shaders/GS4xSoft.fx
View File

0
shaders/Gs2xLS.fx → contrib/shaders/Gs2xLS.fx
View File

0
shaders/Gs2xSmartFilter.fx → contrib/shaders/Gs2xSmartFilter.fx
View File

0
shaders/HQ2x.fx → contrib/shaders/HQ2x.fx
View File

0
shaders/Lanczos.fx → contrib/shaders/Lanczos.fx
View File

0
shaders/Lanczos12.fx → contrib/shaders/Lanczos12.fx
View File

0
shaders/Lanczos16.fx → contrib/shaders/Lanczos16.fx
View File

0
shaders/MCAmber.fx → contrib/shaders/MCAmber.fx
View File

0
shaders/MCGreen.fx → contrib/shaders/MCGreen.fx
View File

0
shaders/MCHerc.fx → contrib/shaders/MCHerc.fx
View File

0
shaders/MCOrange.fx → contrib/shaders/MCOrange.fx
View File

0
shaders/Matrix.fx → contrib/shaders/Matrix.fx
View File

0
shaders/Scale2xPlus.fx → contrib/shaders/Scale2xPlus.fx
View File

0
shaders/Scale4x.fx → contrib/shaders/Scale4x.fx
View File

0
shaders/SimpleAA.fx → contrib/shaders/SimpleAA.fx
View File

0
shaders/Sketch.fx → contrib/shaders/Sketch.fx
View File

0
shaders/Super2xSaI.fx → contrib/shaders/Super2xSaI.fx
View File

0
shaders/SuperEagle.fx → contrib/shaders/SuperEagle.fx
View File

0
shaders/Tv.fx → contrib/shaders/Tv.fx
View File

0
shaders/bilinear.fx → contrib/shaders/bilinear.fx
View File

0
shaders/gpl.txt → contrib/shaders/gpl.txt
View File

0
shaders/none.fx → contrib/shaders/none.fx
View File

0
shaders/point.fx → contrib/shaders/point.fx
View File

0
shaders/scale2x.fx → contrib/shaders/scale2x.fx
View File

0
shaders/scale2x_ps14.fx → contrib/shaders/scale2x_ps14.fx
View File

0
shaders/scaling.inc → contrib/shaders/scaling.inc
View File

0
shaders/shader.code → contrib/shaders/shader.code
View File

32
vs2015/dosbox-x.vcxproj
View File

@@ -351,7 +351,7 @@
copy "$(SolutionDir)\..\dosbox-x.reference.conf" "$(OutputPath)\dosbox-x.reference.conf"
copy "$(SolutionDir)\..\CHANGELOG" "$(OutputPath)\changelog.txt"
mkdir "$(OutputPath)\shaders"
copy "$(SolutionDir)\..\shaders\*.*" "$(OutputPath)\shaders\"</Command>
copy "$(SolutionDir)\..\contrib\shaders\*.*" "$(OutputPath)\shaders\"</Command>
</PostBuildEvent>
<PostBuildEvent>
<Message>
@@ -385,7 +385,7 @@ copy "$(SolutionDir)\..\shaders\*.*" "$(OutputPath)\shaders\"</Command>
copy "$(SolutionDir)\..\dosbox-x.reference.conf" "$(OutputPath)\dosbox-x.reference.conf"
copy "$(SolutionDir)\..\CHANGELOG" "$(OutputPath)\changelog.txt"
mkdir "$(OutputPath)\shaders"
copy "$(SolutionDir)\..\shaders\*.*" "$(OutputPath)\shaders\"</Command>
copy "$(SolutionDir)\..\contrib\shaders\*.*" "$(OutputPath)\shaders\"</Command>
</PostBuildEvent>
<PostBuildEvent>
<Message>
@@ -415,7 +415,7 @@ copy "$(SolutionDir)\..\shaders\*.*" "$(OutputPath)\shaders\"</Command>
copy "$(SolutionDir)\..\dosbox-x.reference.conf" "$(OutputPath)\dosbox-x.reference.conf"
copy "$(SolutionDir)\..\CHANGELOG" "$(OutputPath)\changelog.txt"
mkdir "$(OutputPath)\shaders"
copy "$(SolutionDir)\..\shaders\*.*" "$(OutputPath)\shaders\"</Command>
copy "$(SolutionDir)\..\contrib\shaders\*.*" "$(OutputPath)\shaders\"</Command>
<Message>
</Message>
</PostBuildEvent>
@@ -446,7 +446,7 @@ copy "$(SolutionDir)\..\shaders\*.*" "$(OutputPath)\shaders\"</Command>
copy "$(SolutionDir)\..\dosbox-x.reference.conf" "$(OutputPath)\dosbox-x.reference.conf"
copy "$(SolutionDir)\..\CHANGELOG" "$(OutputPath)\changelog.txt"
mkdir "$(OutputPath)\shaders"
copy "$(SolutionDir)\..\shaders\*.*" "$(OutputPath)\shaders\"</Command>
copy "$(SolutionDir)\..\contrib\shaders\*.*" "$(OutputPath)\shaders\"</Command>
<Message>
</Message>
</PostBuildEvent>
@@ -477,7 +477,7 @@ copy "$(SolutionDir)\..\shaders\*.*" "$(OutputPath)\shaders\"</Command>
copy "$(SolutionDir)\..\dosbox-x.reference.conf" "$(OutputPath)\dosbox-x.reference.conf"
copy "$(SolutionDir)\..\CHANGELOG" "$(OutputPath)\changelog.txt"
mkdir "$(OutputPath)\shaders"
copy "$(SolutionDir)\..\shaders\*.*" "$(OutputPath)\shaders\"</Command>
copy "$(SolutionDir)\..\contrib\shaders\*.*" "$(OutputPath)\shaders\"</Command>
<Message>
</Message>
</PostBuildEvent>
@@ -510,7 +510,7 @@ copy "$(SolutionDir)\..\shaders\*.*" "$(OutputPath)\shaders\"</Command>
copy "$(SolutionDir)\..\dosbox-x.reference.conf" "$(OutputPath)\dosbox-x.reference.conf"
copy "$(SolutionDir)\..\CHANGELOG" "$(OutputPath)\changelog.txt"
mkdir "$(OutputPath)\shaders"
copy "$(SolutionDir)\..\shaders\*.*" "$(OutputPath)\shaders\"</Command>
copy "$(SolutionDir)\..\contrib\shaders\*.*" "$(OutputPath)\shaders\"</Command>
<Message>
</Message>
</PostBuildEvent>
@@ -541,7 +541,7 @@ copy "$(SolutionDir)\..\shaders\*.*" "$(OutputPath)\shaders\"</Command>
copy "$(SolutionDir)\..\dosbox-x.reference.conf" "$(OutputPath)\dosbox-x.reference.conf"
copy "$(SolutionDir)\..\CHANGELOG" "$(OutputPath)\changelog.txt"
mkdir "$(OutputPath)\shaders"
copy "$(SolutionDir)\..\shaders\*.*" "$(OutputPath)\shaders\"</Command>
copy "$(SolutionDir)\..\contrib\shaders\*.*" "$(OutputPath)\shaders\"</Command>
<Message>
</Message>
</PostBuildEvent>
@@ -572,7 +572,7 @@ copy "$(SolutionDir)\..\shaders\*.*" "$(OutputPath)\shaders\"</Command>
copy "$(SolutionDir)\..\dosbox-x.reference.conf" "$(OutputPath)\dosbox-x.reference.conf"
copy "$(SolutionDir)\..\CHANGELOG" "$(OutputPath)\changelog.txt"
mkdir "$(OutputPath)\shaders"
copy "$(SolutionDir)\..\shaders\*.*" "$(OutputPath)\shaders\"</Command>
copy "$(SolutionDir)\..\contrib\shaders\*.*" "$(OutputPath)\shaders\"</Command>
<Message>
</Message>
</PostBuildEvent>
@@ -609,7 +609,7 @@ copy "$(SolutionDir)\..\shaders\*.*" "$(OutputPath)\shaders\"</Command>
copy "$(SolutionDir)\..\dosbox-x.reference.conf" "$(OutputPath)\dosbox-x.reference.conf"
copy "$(SolutionDir)\..\CHANGELOG" "$(OutputPath)\changelog.txt"
mkdir "$(OutputPath)\shaders"
copy "$(SolutionDir)\..\shaders\*.*" "$(OutputPath)\shaders\"</Command>
copy "$(SolutionDir)\..\contrib\shaders\*.*" "$(OutputPath)\shaders\"</Command>
</PostBuildEvent>
<PostBuildEvent>
<Message>
@@ -644,7 +644,7 @@ copy "$(SolutionDir)\..\shaders\*.*" "$(OutputPath)\shaders\"</Command>
copy "$(SolutionDir)\..\dosbox-x.reference.conf" "$(OutputPath)\dosbox-x.reference.conf"
copy "$(SolutionDir)\..\CHANGELOG" "$(OutputPath)\changelog.txt"
mkdir "$(OutputPath)\shaders"
copy "$(SolutionDir)\..\shaders\*.*" "$(OutputPath)\shaders\"</Command>
copy "$(SolutionDir)\..\contrib\shaders\*.*" "$(OutputPath)\shaders\"</Command>
</PostBuildEvent>
<PostBuildEvent>
<Message>
@@ -675,7 +675,7 @@ copy "$(SolutionDir)\..\shaders\*.*" "$(OutputPath)\shaders\"</Command>
copy "$(SolutionDir)\..\dosbox-x.reference.conf" "$(OutputPath)\dosbox-x.reference.conf"
copy "$(SolutionDir)\..\CHANGELOG" "$(OutputPath)\changelog.txt"
mkdir "$(OutputPath)\shaders"
copy "$(SolutionDir)\..\shaders\*.*" "$(OutputPath)\shaders\"</Command>
copy "$(SolutionDir)\..\contrib\shaders\*.*" "$(OutputPath)\shaders\"</Command>
<Message>
</Message>
</PostBuildEvent>
@@ -707,7 +707,7 @@ copy "$(SolutionDir)\..\shaders\*.*" "$(OutputPath)\shaders\"</Command>
copy "$(SolutionDir)\..\dosbox-x.reference.conf" "$(OutputPath)\dosbox-x.reference.conf"
copy "$(SolutionDir)\..\CHANGELOG" "$(OutputPath)\changelog.txt"
mkdir "$(OutputPath)\shaders"
copy "$(SolutionDir)\..\shaders\*.*" "$(OutputPath)\shaders\"</Command>
copy "$(SolutionDir)\..\contrib\shaders\*.*" "$(OutputPath)\shaders\"</Command>
<Message>
</Message>
</PostBuildEvent>
@@ -739,7 +739,7 @@ copy "$(SolutionDir)\..\shaders\*.*" "$(OutputPath)\shaders\"</Command>
copy "$(SolutionDir)\..\dosbox-x.reference.conf" "$(OutputPath)\dosbox-x.reference.conf"
copy "$(SolutionDir)\..\CHANGELOG" "$(OutputPath)\changelog.txt"
mkdir "$(OutputPath)\shaders"
copy "$(SolutionDir)\..\shaders\*.*" "$(OutputPath)\shaders\"</Command>
copy "$(SolutionDir)\..\contrib\shaders\*.*" "$(OutputPath)\shaders\"</Command>
<Message>
</Message>
</PostBuildEvent>
@@ -773,7 +773,7 @@ copy "$(SolutionDir)\..\shaders\*.*" "$(OutputPath)\shaders\"</Command>
copy "$(SolutionDir)\..\dosbox-x.reference.conf" "$(OutputPath)\dosbox-x.reference.conf"
copy "$(SolutionDir)\..\CHANGELOG" "$(OutputPath)\changelog.txt"
mkdir "$(OutputPath)\shaders"
copy "$(SolutionDir)\..\shaders\*.*" "$(OutputPath)\shaders\"</Command>
copy "$(SolutionDir)\..\contrib\shaders\*.*" "$(OutputPath)\shaders\"</Command>
<Message>
</Message>
</PostBuildEvent>
@@ -805,7 +805,7 @@ copy "$(SolutionDir)\..\shaders\*.*" "$(OutputPath)\shaders\"</Command>
copy "$(SolutionDir)\..\dosbox-x.reference.conf" "$(OutputPath)\dosbox-x.reference.conf"
copy "$(SolutionDir)\..\CHANGELOG" "$(OutputPath)\changelog.txt"
mkdir "$(OutputPath)\shaders"
copy "$(SolutionDir)\..\shaders\*.*" "$(OutputPath)\shaders\"</Command>
copy "$(SolutionDir)\..\contrib\shaders\*.*" "$(OutputPath)\shaders\"</Command>
<Message>
</Message>
</PostBuildEvent>
@@ -837,7 +837,7 @@ copy "$(SolutionDir)\..\shaders\*.*" "$(OutputPath)\shaders\"</Command>
copy "$(SolutionDir)\..\dosbox-x.reference.conf" "$(OutputPath)\dosbox-x.reference.conf"
copy "$(SolutionDir)\..\CHANGELOG" "$(OutputPath)\changelog.txt"
mkdir "$(OutputPath)\shaders"
copy "$(SolutionDir)\..\shaders\*.*" "$(OutputPath)\shaders\"</Command>
copy "$(SolutionDir)\..\contrib\shaders\*.*" "$(OutputPath)\shaders\"</Command>
<Message>
</Message>
</PostBuildEvent>

BIN
windows-installer/dosbox-x.ico
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 22 KiB