From 7a481e51ec8e4dd3e00952582fdafc62e1f7d307 Mon Sep 17 00:00:00 2001 From: rderooy Date: Wed, 9 Sep 2020 11:12:30 +0200 Subject: [PATCH] Move shaders to contrib/shaders And update references. I hope this does not break the windows build. --- .../icons}/dosbox-x.bmp | Bin {shaders => contrib/shaders}/2xSaI.fx | 0 {shaders => contrib/shaders}/2xSaI_sRGB.fx | 0 {shaders => contrib/shaders}/2xSaL.fx | 0 {shaders => contrib/shaders}/2xSaL2xAA.fx | 0 {shaders => contrib/shaders}/2xSaLAA.fx | 0 {shaders => contrib/shaders}/2xSaL_Ls.fx | 0 {shaders => contrib/shaders}/4xSaL.fx | 0 {shaders => contrib/shaders}/4xSoft.fx | 0 {shaders => contrib/shaders}/4xSoft_PS3.0.fx | 0 {shaders => contrib/shaders}/5xBR-v3.5b.fx | 0 {shaders => contrib/shaders}/5xBR-v3.8a.fx | 0 {shaders => contrib/shaders}/5xBR-v3.8b.fx | 0 {shaders => contrib/shaders}/5xBR-v3.8c.fx | 0 {shaders => contrib/shaders}/AdvancedAA.fx | 0 .../shaders}/CRT-geom-blend.fx | 0 .../shaders}/CRT-geom-curved.fx | 0 .../shaders}/CRT-simple.D3D.br.fx | 0 .../shaders}/CRT-simple.D3D.fx | 0 {shaders => contrib/shaders}/CRT.D3D.br.fx | 0 {shaders => contrib/shaders}/CRT.D3D.fx | 0 {shaders => contrib/shaders}/Cartoon.fx | 0 {shaders => contrib/shaders}/ColorSketch.fx | 0 {shaders => contrib/shaders}/DotnBloom.D3D.fx | 0 {shaders => contrib/shaders}/EGAfilter.fx | 0 {shaders => contrib/shaders}/GS2x.fx | 0 {shaders => contrib/shaders}/GS2xFilter.fx | 0 {shaders => contrib/shaders}/GS2xSuper.fx | 0 {shaders => contrib/shaders}/GS2xTwo.fx | 0 {shaders => contrib/shaders}/GS4x.fx | 0 .../shaders}/GS4xColorScale.fx | 0 {shaders => contrib/shaders}/GS4xFilter.fx | 0 {shaders => contrib/shaders}/GS4xHqFilter.fx | 0 {shaders => contrib/shaders}/GS4xScale.fx | 0 {shaders => contrib/shaders}/GS4xSoft.fx | 0 {shaders => contrib/shaders}/Gs2xLS.fx | 0 .../shaders}/Gs2xSmartFilter.fx | 0 {shaders => contrib/shaders}/HQ2x.fx | 0 {shaders => contrib/shaders}/Lanczos.fx | 0 {shaders => contrib/shaders}/Lanczos12.fx | 0 {shaders => contrib/shaders}/Lanczos16.fx | 0 {shaders => contrib/shaders}/MCAmber.fx | 0 {shaders => contrib/shaders}/MCGreen.fx | 0 {shaders => contrib/shaders}/MCHerc.fx | 0 {shaders => contrib/shaders}/MCOrange.fx | 0 {shaders => contrib/shaders}/Matrix.fx | 0 {shaders => contrib/shaders}/Scale2xPlus.fx | 0 {shaders => contrib/shaders}/Scale4x.fx | 0 {shaders => contrib/shaders}/SimpleAA.fx | 0 {shaders => contrib/shaders}/Sketch.fx | 0 {shaders => contrib/shaders}/Super2xSaI.fx | 0 {shaders => contrib/shaders}/SuperEagle.fx | 0 {shaders => contrib/shaders}/Tv.fx | 0 {shaders => contrib/shaders}/bilinear.fx | 0 {shaders => contrib/shaders}/gpl.txt | 0 {shaders => contrib/shaders}/none.fx | 0 {shaders => contrib/shaders}/point.fx | 0 {shaders => contrib/shaders}/scale2x.fx | 0 {shaders => contrib/shaders}/scale2x_ps14.fx | 0 {shaders => contrib/shaders}/scaling.inc | 0 {shaders => contrib/shaders}/shader.code | 0 vs2015/dosbox-x.vcxproj | 32 +++++++++--------- windows-installer/dosbox-x.ico | Bin 22486 -> 0 bytes 63 files changed, 16 insertions(+), 16 deletions(-) rename {windows-installer => contrib/icons}/dosbox-x.bmp (100%) rename {shaders => contrib/shaders}/2xSaI.fx (100%) rename {shaders => contrib/shaders}/2xSaI_sRGB.fx (100%) rename {shaders => contrib/shaders}/2xSaL.fx (100%) rename {shaders => contrib/shaders}/2xSaL2xAA.fx (100%) rename {shaders => contrib/shaders}/2xSaLAA.fx (100%) rename {shaders => contrib/shaders}/2xSaL_Ls.fx (100%) rename {shaders => contrib/shaders}/4xSaL.fx (100%) rename {shaders => contrib/shaders}/4xSoft.fx (100%) rename {shaders => contrib/shaders}/4xSoft_PS3.0.fx (100%) rename {shaders => contrib/shaders}/5xBR-v3.5b.fx (100%) rename {shaders => contrib/shaders}/5xBR-v3.8a.fx (100%) rename {shaders => contrib/shaders}/5xBR-v3.8b.fx (100%) rename {shaders => contrib/shaders}/5xBR-v3.8c.fx (100%) rename {shaders => contrib/shaders}/AdvancedAA.fx (100%) rename {shaders => contrib/shaders}/CRT-geom-blend.fx (100%) rename {shaders => contrib/shaders}/CRT-geom-curved.fx (100%) rename {shaders => contrib/shaders}/CRT-simple.D3D.br.fx (100%) rename {shaders => contrib/shaders}/CRT-simple.D3D.fx (100%) rename {shaders => contrib/shaders}/CRT.D3D.br.fx (100%) rename {shaders => contrib/shaders}/CRT.D3D.fx (100%) rename {shaders => contrib/shaders}/Cartoon.fx (100%) rename {shaders => contrib/shaders}/ColorSketch.fx (100%) rename {shaders => contrib/shaders}/DotnBloom.D3D.fx (100%) rename {shaders => contrib/shaders}/EGAfilter.fx (100%) rename {shaders => contrib/shaders}/GS2x.fx (100%) rename {shaders => contrib/shaders}/GS2xFilter.fx (100%) rename {shaders => contrib/shaders}/GS2xSuper.fx (100%) rename {shaders => contrib/shaders}/GS2xTwo.fx (100%) rename {shaders => contrib/shaders}/GS4x.fx (100%) rename {shaders => contrib/shaders}/GS4xColorScale.fx (100%) rename {shaders => contrib/shaders}/GS4xFilter.fx (100%) rename {shaders => contrib/shaders}/GS4xHqFilter.fx (100%) rename {shaders => contrib/shaders}/GS4xScale.fx (100%) rename {shaders => contrib/shaders}/GS4xSoft.fx (100%) rename {shaders => contrib/shaders}/Gs2xLS.fx (100%) rename {shaders => contrib/shaders}/Gs2xSmartFilter.fx (100%) rename {shaders => contrib/shaders}/HQ2x.fx (100%) rename {shaders => contrib/shaders}/Lanczos.fx (100%) rename {shaders => contrib/shaders}/Lanczos12.fx (100%) rename {shaders => contrib/shaders}/Lanczos16.fx (100%) rename {shaders => contrib/shaders}/MCAmber.fx (100%) rename {shaders => contrib/shaders}/MCGreen.fx (100%) rename {shaders => contrib/shaders}/MCHerc.fx (100%) rename {shaders => contrib/shaders}/MCOrange.fx (100%) rename {shaders => contrib/shaders}/Matrix.fx (100%) rename {shaders => contrib/shaders}/Scale2xPlus.fx (100%) rename {shaders => contrib/shaders}/Scale4x.fx (100%) rename {shaders => contrib/shaders}/SimpleAA.fx (100%) rename {shaders => contrib/shaders}/Sketch.fx (100%) rename {shaders => contrib/shaders}/Super2xSaI.fx (100%) rename {shaders => contrib/shaders}/SuperEagle.fx (100%) rename {shaders => contrib/shaders}/Tv.fx (100%) rename {shaders => contrib/shaders}/bilinear.fx (100%) rename {shaders => contrib/shaders}/gpl.txt (100%) rename {shaders => contrib/shaders}/none.fx (100%) rename {shaders => contrib/shaders}/point.fx (100%) rename {shaders => contrib/shaders}/scale2x.fx (100%) rename {shaders => contrib/shaders}/scale2x_ps14.fx (100%) rename {shaders => contrib/shaders}/scaling.inc (100%) rename {shaders => contrib/shaders}/shader.code (100%) delete mode 100644 windows-installer/dosbox-x.ico diff --git a/windows-installer/dosbox-x.bmp b/contrib/icons/dosbox-x.bmp similarity index 100% rename from windows-installer/dosbox-x.bmp rename to contrib/icons/dosbox-x.bmp diff --git a/shaders/2xSaI.fx b/contrib/shaders/2xSaI.fx similarity index 100% rename from shaders/2xSaI.fx rename to contrib/shaders/2xSaI.fx diff --git a/shaders/2xSaI_sRGB.fx b/contrib/shaders/2xSaI_sRGB.fx similarity index 100% rename from shaders/2xSaI_sRGB.fx rename to contrib/shaders/2xSaI_sRGB.fx diff --git a/shaders/2xSaL.fx b/contrib/shaders/2xSaL.fx similarity index 100% rename from shaders/2xSaL.fx rename to contrib/shaders/2xSaL.fx diff --git a/shaders/2xSaL2xAA.fx b/contrib/shaders/2xSaL2xAA.fx similarity index 100% rename from shaders/2xSaL2xAA.fx rename to contrib/shaders/2xSaL2xAA.fx diff --git a/shaders/2xSaLAA.fx b/contrib/shaders/2xSaLAA.fx similarity index 100% rename from shaders/2xSaLAA.fx rename to contrib/shaders/2xSaLAA.fx diff --git a/shaders/2xSaL_Ls.fx b/contrib/shaders/2xSaL_Ls.fx similarity index 100% rename from shaders/2xSaL_Ls.fx rename to contrib/shaders/2xSaL_Ls.fx diff --git a/shaders/4xSaL.fx b/contrib/shaders/4xSaL.fx similarity index 100% rename from shaders/4xSaL.fx rename to contrib/shaders/4xSaL.fx diff --git a/shaders/4xSoft.fx b/contrib/shaders/4xSoft.fx similarity index 100% rename from shaders/4xSoft.fx rename to contrib/shaders/4xSoft.fx diff --git a/shaders/4xSoft_PS3.0.fx b/contrib/shaders/4xSoft_PS3.0.fx similarity index 100% rename from shaders/4xSoft_PS3.0.fx rename to contrib/shaders/4xSoft_PS3.0.fx diff --git a/shaders/5xBR-v3.5b.fx b/contrib/shaders/5xBR-v3.5b.fx similarity index 100% rename from shaders/5xBR-v3.5b.fx rename to contrib/shaders/5xBR-v3.5b.fx diff --git a/shaders/5xBR-v3.8a.fx b/contrib/shaders/5xBR-v3.8a.fx similarity index 100% rename from shaders/5xBR-v3.8a.fx rename to contrib/shaders/5xBR-v3.8a.fx diff --git a/shaders/5xBR-v3.8b.fx b/contrib/shaders/5xBR-v3.8b.fx similarity index 100% rename from shaders/5xBR-v3.8b.fx rename to contrib/shaders/5xBR-v3.8b.fx diff --git a/shaders/5xBR-v3.8c.fx b/contrib/shaders/5xBR-v3.8c.fx similarity index 100% rename from shaders/5xBR-v3.8c.fx rename to contrib/shaders/5xBR-v3.8c.fx diff --git a/shaders/AdvancedAA.fx b/contrib/shaders/AdvancedAA.fx similarity index 100% rename from shaders/AdvancedAA.fx rename to contrib/shaders/AdvancedAA.fx diff --git a/shaders/CRT-geom-blend.fx b/contrib/shaders/CRT-geom-blend.fx similarity index 100% rename from shaders/CRT-geom-blend.fx rename to contrib/shaders/CRT-geom-blend.fx diff --git a/shaders/CRT-geom-curved.fx b/contrib/shaders/CRT-geom-curved.fx similarity index 100% rename from shaders/CRT-geom-curved.fx rename to contrib/shaders/CRT-geom-curved.fx diff --git a/shaders/CRT-simple.D3D.br.fx b/contrib/shaders/CRT-simple.D3D.br.fx similarity index 100% rename from shaders/CRT-simple.D3D.br.fx rename to contrib/shaders/CRT-simple.D3D.br.fx diff --git a/shaders/CRT-simple.D3D.fx b/contrib/shaders/CRT-simple.D3D.fx similarity index 100% rename from shaders/CRT-simple.D3D.fx rename to contrib/shaders/CRT-simple.D3D.fx diff --git a/shaders/CRT.D3D.br.fx b/contrib/shaders/CRT.D3D.br.fx similarity index 100% rename from shaders/CRT.D3D.br.fx rename to contrib/shaders/CRT.D3D.br.fx diff --git a/shaders/CRT.D3D.fx b/contrib/shaders/CRT.D3D.fx similarity index 100% rename from shaders/CRT.D3D.fx rename to contrib/shaders/CRT.D3D.fx diff --git a/shaders/Cartoon.fx b/contrib/shaders/Cartoon.fx similarity index 100% rename from shaders/Cartoon.fx rename to contrib/shaders/Cartoon.fx diff --git a/shaders/ColorSketch.fx b/contrib/shaders/ColorSketch.fx similarity index 100% rename from shaders/ColorSketch.fx rename to contrib/shaders/ColorSketch.fx diff --git a/shaders/DotnBloom.D3D.fx b/contrib/shaders/DotnBloom.D3D.fx similarity index 100% rename from shaders/DotnBloom.D3D.fx rename to contrib/shaders/DotnBloom.D3D.fx diff --git a/shaders/EGAfilter.fx b/contrib/shaders/EGAfilter.fx similarity index 100% rename from shaders/EGAfilter.fx rename to contrib/shaders/EGAfilter.fx diff --git a/shaders/GS2x.fx b/contrib/shaders/GS2x.fx similarity index 100% rename from shaders/GS2x.fx rename to contrib/shaders/GS2x.fx diff --git a/shaders/GS2xFilter.fx b/contrib/shaders/GS2xFilter.fx similarity index 100% rename from shaders/GS2xFilter.fx rename to contrib/shaders/GS2xFilter.fx diff --git a/shaders/GS2xSuper.fx b/contrib/shaders/GS2xSuper.fx similarity index 100% rename from shaders/GS2xSuper.fx rename to contrib/shaders/GS2xSuper.fx diff --git a/shaders/GS2xTwo.fx b/contrib/shaders/GS2xTwo.fx similarity index 100% rename from shaders/GS2xTwo.fx rename to contrib/shaders/GS2xTwo.fx diff --git a/shaders/GS4x.fx b/contrib/shaders/GS4x.fx similarity index 100% rename from shaders/GS4x.fx rename to contrib/shaders/GS4x.fx diff --git a/shaders/GS4xColorScale.fx b/contrib/shaders/GS4xColorScale.fx similarity index 100% rename from shaders/GS4xColorScale.fx rename to contrib/shaders/GS4xColorScale.fx diff --git a/shaders/GS4xFilter.fx b/contrib/shaders/GS4xFilter.fx similarity index 100% rename from shaders/GS4xFilter.fx rename to contrib/shaders/GS4xFilter.fx diff --git a/shaders/GS4xHqFilter.fx b/contrib/shaders/GS4xHqFilter.fx similarity index 100% rename from shaders/GS4xHqFilter.fx rename to contrib/shaders/GS4xHqFilter.fx diff --git a/shaders/GS4xScale.fx b/contrib/shaders/GS4xScale.fx similarity index 100% rename from shaders/GS4xScale.fx rename to contrib/shaders/GS4xScale.fx diff --git a/shaders/GS4xSoft.fx b/contrib/shaders/GS4xSoft.fx similarity index 100% rename from shaders/GS4xSoft.fx rename to contrib/shaders/GS4xSoft.fx diff --git a/shaders/Gs2xLS.fx b/contrib/shaders/Gs2xLS.fx similarity index 100% rename from shaders/Gs2xLS.fx rename to contrib/shaders/Gs2xLS.fx diff --git a/shaders/Gs2xSmartFilter.fx b/contrib/shaders/Gs2xSmartFilter.fx similarity index 100% rename from shaders/Gs2xSmartFilter.fx rename to contrib/shaders/Gs2xSmartFilter.fx diff --git a/shaders/HQ2x.fx b/contrib/shaders/HQ2x.fx similarity index 100% rename from shaders/HQ2x.fx rename to contrib/shaders/HQ2x.fx diff --git a/shaders/Lanczos.fx b/contrib/shaders/Lanczos.fx similarity index 100% rename from shaders/Lanczos.fx rename to contrib/shaders/Lanczos.fx diff --git a/shaders/Lanczos12.fx b/contrib/shaders/Lanczos12.fx similarity index 100% rename from shaders/Lanczos12.fx rename to contrib/shaders/Lanczos12.fx diff --git a/shaders/Lanczos16.fx b/contrib/shaders/Lanczos16.fx similarity index 100% rename from shaders/Lanczos16.fx rename to contrib/shaders/Lanczos16.fx diff --git a/shaders/MCAmber.fx b/contrib/shaders/MCAmber.fx similarity index 100% rename from shaders/MCAmber.fx rename to contrib/shaders/MCAmber.fx diff --git a/shaders/MCGreen.fx b/contrib/shaders/MCGreen.fx similarity index 100% rename from shaders/MCGreen.fx rename to contrib/shaders/MCGreen.fx diff --git a/shaders/MCHerc.fx b/contrib/shaders/MCHerc.fx similarity index 100% rename from shaders/MCHerc.fx rename to contrib/shaders/MCHerc.fx diff --git a/shaders/MCOrange.fx b/contrib/shaders/MCOrange.fx similarity index 100% rename from shaders/MCOrange.fx rename to contrib/shaders/MCOrange.fx diff --git a/shaders/Matrix.fx b/contrib/shaders/Matrix.fx similarity index 100% rename from shaders/Matrix.fx rename to contrib/shaders/Matrix.fx diff --git a/shaders/Scale2xPlus.fx b/contrib/shaders/Scale2xPlus.fx similarity index 100% rename from shaders/Scale2xPlus.fx rename to contrib/shaders/Scale2xPlus.fx diff --git a/shaders/Scale4x.fx b/contrib/shaders/Scale4x.fx similarity index 100% rename from shaders/Scale4x.fx rename to contrib/shaders/Scale4x.fx diff --git a/shaders/SimpleAA.fx b/contrib/shaders/SimpleAA.fx similarity index 100% rename from shaders/SimpleAA.fx rename to contrib/shaders/SimpleAA.fx diff --git a/shaders/Sketch.fx b/contrib/shaders/Sketch.fx similarity index 100% rename from shaders/Sketch.fx rename to contrib/shaders/Sketch.fx diff --git a/shaders/Super2xSaI.fx b/contrib/shaders/Super2xSaI.fx similarity index 100% rename from shaders/Super2xSaI.fx rename to contrib/shaders/Super2xSaI.fx diff --git a/shaders/SuperEagle.fx b/contrib/shaders/SuperEagle.fx similarity index 100% rename from shaders/SuperEagle.fx rename to contrib/shaders/SuperEagle.fx diff --git a/shaders/Tv.fx b/contrib/shaders/Tv.fx similarity index 100% rename from shaders/Tv.fx rename to contrib/shaders/Tv.fx diff --git a/shaders/bilinear.fx b/contrib/shaders/bilinear.fx similarity index 100% rename from shaders/bilinear.fx rename to contrib/shaders/bilinear.fx diff --git a/shaders/gpl.txt b/contrib/shaders/gpl.txt similarity index 100% rename from shaders/gpl.txt rename to contrib/shaders/gpl.txt diff --git a/shaders/none.fx b/contrib/shaders/none.fx similarity index 100% rename from shaders/none.fx rename to contrib/shaders/none.fx diff --git a/shaders/point.fx b/contrib/shaders/point.fx similarity index 100% rename from shaders/point.fx rename to contrib/shaders/point.fx diff --git a/shaders/scale2x.fx b/contrib/shaders/scale2x.fx similarity index 100% rename from shaders/scale2x.fx rename to contrib/shaders/scale2x.fx diff --git a/shaders/scale2x_ps14.fx b/contrib/shaders/scale2x_ps14.fx similarity index 100% rename from shaders/scale2x_ps14.fx rename to contrib/shaders/scale2x_ps14.fx diff --git a/shaders/scaling.inc b/contrib/shaders/scaling.inc similarity index 100% rename from shaders/scaling.inc rename to contrib/shaders/scaling.inc diff --git a/shaders/shader.code b/contrib/shaders/shader.code similarity index 100% rename from shaders/shader.code rename to contrib/shaders/shader.code diff --git a/vs2015/dosbox-x.vcxproj b/vs2015/dosbox-x.vcxproj index f2a0ecb70..25b97697f 100644 --- a/vs2015/dosbox-x.vcxproj +++ b/vs2015/dosbox-x.vcxproj @@ -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\" +copy "$(SolutionDir)\..\contrib\shaders\*.*" "$(OutputPath)\shaders\" @@ -385,7 +385,7 @@ copy "$(SolutionDir)\..\shaders\*.*" "$(OutputPath)\shaders\" 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\" +copy "$(SolutionDir)\..\contrib\shaders\*.*" "$(OutputPath)\shaders\" @@ -415,7 +415,7 @@ copy "$(SolutionDir)\..\shaders\*.*" "$(OutputPath)\shaders\" 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\" +copy "$(SolutionDir)\..\contrib\shaders\*.*" "$(OutputPath)\shaders\" @@ -446,7 +446,7 @@ copy "$(SolutionDir)\..\shaders\*.*" "$(OutputPath)\shaders\" 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\" +copy "$(SolutionDir)\..\contrib\shaders\*.*" "$(OutputPath)\shaders\" @@ -477,7 +477,7 @@ copy "$(SolutionDir)\..\shaders\*.*" "$(OutputPath)\shaders\" 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\" +copy "$(SolutionDir)\..\contrib\shaders\*.*" "$(OutputPath)\shaders\" @@ -510,7 +510,7 @@ copy "$(SolutionDir)\..\shaders\*.*" "$(OutputPath)\shaders\" 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\" +copy "$(SolutionDir)\..\contrib\shaders\*.*" "$(OutputPath)\shaders\" @@ -541,7 +541,7 @@ copy "$(SolutionDir)\..\shaders\*.*" "$(OutputPath)\shaders\" 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\" +copy "$(SolutionDir)\..\contrib\shaders\*.*" "$(OutputPath)\shaders\" @@ -572,7 +572,7 @@ copy "$(SolutionDir)\..\shaders\*.*" "$(OutputPath)\shaders\" 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\" +copy "$(SolutionDir)\..\contrib\shaders\*.*" "$(OutputPath)\shaders\" @@ -609,7 +609,7 @@ copy "$(SolutionDir)\..\shaders\*.*" "$(OutputPath)\shaders\" 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\" +copy "$(SolutionDir)\..\contrib\shaders\*.*" "$(OutputPath)\shaders\" @@ -644,7 +644,7 @@ copy "$(SolutionDir)\..\shaders\*.*" "$(OutputPath)\shaders\" 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\" +copy "$(SolutionDir)\..\contrib\shaders\*.*" "$(OutputPath)\shaders\" @@ -675,7 +675,7 @@ copy "$(SolutionDir)\..\shaders\*.*" "$(OutputPath)\shaders\" 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\" +copy "$(SolutionDir)\..\contrib\shaders\*.*" "$(OutputPath)\shaders\" @@ -707,7 +707,7 @@ copy "$(SolutionDir)\..\shaders\*.*" "$(OutputPath)\shaders\" 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\" +copy "$(SolutionDir)\..\contrib\shaders\*.*" "$(OutputPath)\shaders\" @@ -739,7 +739,7 @@ copy "$(SolutionDir)\..\shaders\*.*" "$(OutputPath)\shaders\" 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\" +copy "$(SolutionDir)\..\contrib\shaders\*.*" "$(OutputPath)\shaders\" @@ -773,7 +773,7 @@ copy "$(SolutionDir)\..\shaders\*.*" "$(OutputPath)\shaders\" 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\" +copy "$(SolutionDir)\..\contrib\shaders\*.*" "$(OutputPath)\shaders\" @@ -805,7 +805,7 @@ copy "$(SolutionDir)\..\shaders\*.*" "$(OutputPath)\shaders\" 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\" +copy "$(SolutionDir)\..\contrib\shaders\*.*" "$(OutputPath)\shaders\" @@ -837,7 +837,7 @@ copy "$(SolutionDir)\..\shaders\*.*" "$(OutputPath)\shaders\" 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\" +copy "$(SolutionDir)\..\contrib\shaders\*.*" "$(OutputPath)\shaders\" diff --git a/windows-installer/dosbox-x.ico b/windows-installer/dosbox-x.ico deleted file mode 100644 index c056de56d2e6be0ba360f44343b90eeaadccb312..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 22486 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