diff --git a/.github/workflows/hxdos.yml b/.github/workflows/hxdos.yml index b3a13963b..f9a5b8951 100644 --- a/.github/workflows/hxdos.yml +++ b/.github/workflows/hxdos.yml @@ -73,6 +73,7 @@ jobs: - name: Download Windows build uses: robinraju/release-downloader@v1.4 with: + repository: "joncampbell123/dosbox-x" latest: true filename: "dosbox-x-vsbuild-win32-*.zip" - name: Run in Windows build diff --git a/.github/workflows/vsbuild32.yml b/.github/workflows/vsbuild32.yml index 78f5694d4..984b4b2e1 100644 --- a/.github/workflows/vsbuild32.yml +++ b/.github/workflows/vsbuild32.yml @@ -141,6 +141,7 @@ jobs: mkdir -p $top/package/bin/ARM/Release/drivez mkdir -p $top/package/bin/ARM/Release/scripts mkdir -p $top/package/bin/ARM/Release/shaders + mkdir -p $top/package/bin/ARM/Release/glshaders mkdir -p $top/package/bin/ARM/Release/languages sed -e 's/^\(output[ ]*=[ ]*\)default$/\1ttf/;s/^\(windowposition[ ]*=\)[ ]*-/\1 /;s/^\(file access tries[ ]*=[ ]*\)0$/\13/;s/^\(printoutput[ ]*=[ ]*\)png$/\1printer/;s/\(drive data rate limit[ ]*=[ ]*\)-1$/\10/' $top/dosbox-x.reference.conf>$top/package/bin/ARM/Release/dosbox-x.conf cp $top/bin/ARM/Release/dosbox-x.exe $top/package/bin/ARM/Release/dosbox-x.exe @@ -155,6 +156,7 @@ jobs: cp $top/contrib/windows/installer/drivez_readme.txt $top/package/bin/ARM/Release/drivez/readme.txt cp $top/contrib/windows/installer/windows_explorer_context_menu*.bat $top/package/bin/ARM/Release/scripts/ cp $top/contrib/windows/shaders/* $top/package/bin/ARM/Release/shaders/ + cp $top/contrib/glshaders/* $top/package/bin/ARM/Release/glshaders/ cp $top/contrib/translations/*/*.lng $top/package/bin/ARM/Release/languages/ - name: Build Visual Studio ARM32 SDL2 shell: pwsh @@ -168,6 +170,7 @@ jobs: mkdir -p $top/package/bin/ARM/"Release SDL2"/drivez mkdir -p $top/package/bin/ARM/"Release SDL2"/scripts mkdir -p $top/package/bin/ARM/"Release SDL2"/shaders + mkdir -p $top/package/bin/ARM/"Release SDL2"/glshaders mkdir -p $top/package/bin/ARM/"Release SDL2"/languages sed -e 's/^\(output[ ]*=[ ]*\)default$/\1ttf/;s/^\(windowposition[ ]*=\)[ ]*-/\1 /;s/^\(file access tries[ ]*=[ ]*\)0$/\13/;s/^\(printoutput[ ]*=[ ]*\)png$/\1printer/;s/\(drive data rate limit[ ]*=[ ]*\)-1$/\10/' $top/dosbox-x.reference.conf>$top/package/bin/ARM/"Release SDL2"/dosbox-x.conf cp $top/bin/ARM/"Release SDL2"/dosbox-x.exe $top/package/bin/ARM/"Release SDL2"/dosbox-x.exe @@ -182,6 +185,7 @@ jobs: cp $top/contrib/windows/installer/drivez_readme.txt $top/package/bin/ARM/"Release SDL2"/drivez/readme.txt cp $top/contrib/windows/installer/windows_explorer_context_menu*.bat $top/package/bin/ARM/"Release SDL2"/scripts/ cp $top/contrib/windows/shaders/* $top/package/bin/ARM/"Release SDL2"/shaders/ + cp $top/contrib/glshaders/* $top/package/bin/ARM/"Release SDL2"/glshaders/ cp $top/contrib/translations/*/*.lng $top/package/bin/ARM/"Release SDL2"/languages/ cp $top/COPYING $top/package/COPYING cd $top/package/ diff --git a/.github/workflows/vsbuild64.yml b/.github/workflows/vsbuild64.yml index f7bfb536a..9d535b8ef 100644 --- a/.github/workflows/vsbuild64.yml +++ b/.github/workflows/vsbuild64.yml @@ -141,6 +141,7 @@ jobs: mkdir -p $top/package/bin/ARM64/Release/drivez mkdir -p $top/package/bin/ARM64/Release/scripts mkdir -p $top/package/bin/ARM64/Release/shaders + mkdir -p $top/package/bin/ARM64/Release/glshaders mkdir -p $top/package/bin/ARM64/Release/languages sed -e 's/^\(output[ ]*=[ ]*\)default$/\1ttf/;s/^\(windowposition[ ]*=\)[ ]*-/\1 /;s/^\(file access tries[ ]*=[ ]*\)0$/\13/;s/^\(printoutput[ ]*=[ ]*\)png$/\1printer/;s/\(drive data rate limit[ ]*=[ ]*\)-1$/\10/' $top/dosbox-x.reference.conf>$top/package/bin/ARM64/Release/dosbox-x.conf cp $top/bin/ARM64/Release/dosbox-x.exe $top/package/bin/ARM64/Release/dosbox-x.exe @@ -155,6 +156,7 @@ jobs: cp $top/contrib/windows/installer/drivez_readme.txt $top/package/bin/ARM64/Release/drivez/readme.txt cp $top/contrib/windows/installer/windows_explorer_context_menu*.bat $top/package/bin/ARM64/Release/scripts/ cp $top/contrib/windows/shaders/* $top/package/bin/ARM64/Release/shaders/ + cp $top/contrib/glshaders/* $top/package/bin/ARM64/Release/glshaders/ cp $top/contrib/translations/*/*.lng $top/package/bin/ARM64/Release/languages/ - name: Build Visual Studio ARM64 SDL2 shell: pwsh @@ -168,6 +170,7 @@ jobs: mkdir -p $top/package/bin/ARM64/"Release SDL2"/drivez mkdir -p $top/package/bin/ARM64/"Release SDL2"/scripts mkdir -p $top/package/bin/ARM64/"Release SDL2"/shaders + mkdir -p $top/package/bin/ARM64/"Release SDL2"/glshaders mkdir -p $top/package/bin/ARM64/"Release SDL2"/languages sed -e 's/^\(output[ ]*=[ ]*\)default$/\1ttf/;s/^\(windowposition[ ]*=\)[ ]*-/\1 /;s/^\(file access tries[ ]*=[ ]*\)0$/\13/;s/^\(printoutput[ ]*=[ ]*\)png$/\1printer/;s/\(drive data rate limit[ ]*=[ ]*\)-1$/\10/' $top/dosbox-x.reference.conf>$top/package/bin/ARM64/"Release SDL2"/dosbox-x.conf cp $top/bin/ARM64/"Release SDL2"/dosbox-x.exe $top/package/bin/ARM64/"Release SDL2"/dosbox-x.exe @@ -182,6 +185,7 @@ jobs: cp $top/contrib/windows/installer/drivez_readme.txt $top/package/bin/ARM64/"Release SDL2"/drivez/readme.txt cp $top/contrib/windows/installer/windows_explorer_context_menu*.bat $top/package/bin/ARM64/"Release SDL2"/scripts/ cp $top/contrib/windows/shaders/* $top/package/bin/ARM64/"Release SDL2"/shaders/ + cp $top/contrib/glshaders/* $top/package/bin/ARM64/"Release SDL2"/glshaders/ cp $top/contrib/translations/*/*.lng $top/package/bin/ARM64/"Release SDL2"/languages/ cp $top/COPYING $top/package/COPYING cd $top/package/ diff --git a/make-windows-release.pl b/make-windows-release.pl index 23bb808c7..4129d679a 100644 --- a/make-windows-release.pl +++ b/make-windows-release.pl @@ -37,7 +37,7 @@ print "$zipname\n"; my @platforms = ('ARM', 'ARM64', 'Win32', 'x64'); my @builds = ('Release', 'Release SDL2'); -my @files = ('dosbox-x.reference.conf', 'dosbox-x.reference.full.conf', 'readme.txt', 'dosbox-x.exe', 'FREECG98.bmp', 'wqy_11pt.bdf', 'wqy_12pt.bdf', 'Nouveau_IBM.ttf', 'SarasaGothicFixed.ttf', 'changelog.txt', 'drivez', 'scripts', 'shaders', 'languages'); +my @files = ('dosbox-x.reference.conf', 'dosbox-x.reference.full.conf', 'readme.txt', 'dosbox-x.exe', 'FREECG98.bmp', 'wqy_11pt.bdf', 'wqy_12pt.bdf', 'Nouveau_IBM.ttf', 'SarasaGothicFixed.ttf', 'changelog.txt', 'drivez', 'scripts', 'shaders', 'glshaders', 'languages'); foreach $platform (@platforms) { $plat = $platform; @@ -55,7 +55,6 @@ foreach $platform (@platforms) { foreach $build (@builds) { push(@filelist, "bin/$platform/$build/inpout32.dll") if $plat eq 'win32'; push(@filelist, "bin/$platform/$build/inpoutx64.dll") if $plat eq 'win64'; - push(@filelist, "bin/$platform/$build/glshaders") if ($plat eq 'win32') or ($plat eq 'win64'); foreach $file (@files) { $addfile = "bin/$platform/$build/$file"; die "Missing file $addfile" unless -e $addfile; diff --git a/src/misc/messages.cpp b/src/misc/messages.cpp index 93c274bbe..3a650812f 100644 --- a/src/misc/messages.cpp +++ b/src/misc/messages.cpp @@ -492,7 +492,12 @@ void MSG_Init() { if (pathprop != NULL) { std::string path = pathprop->realpath; ResolvePath(path); - LoadMessageFile(path.c_str()); + if (testLoadLangFile(path.c_str())) + LoadMessageFile(path.c_str()); + else { + std::string lang = section->Get_string("language"); + if (lang.size()) LoadMessageFile(lang.c_str()); + } } } std::string showdbcsstr = static_cast(control->GetSection("dosv"))->Get_string("showdbcsnodosv"); diff --git a/vs/config.h b/vs/config.h index 6516cfc6f..a2b1c834a 100644 --- a/vs/config.h +++ b/vs/config.h @@ -149,9 +149,7 @@ /* #undef C_SDL2 */ /* Define to 1 to use opengl display output support */ -#if !defined(_M_ARM64) && !defined (_M_ARM) -# define C_OPENGL 1 -#endif +#define C_OPENGL 1 /* Set to 1 to enable XBRZ support */ #define C_XBRZ 1 diff --git a/vs/dosbox-x.vcxproj b/vs/dosbox-x.vcxproj index 855e0fcfb..bcda2dcc3 100644 --- a/vs/dosbox-x.vcxproj +++ b/vs/dosbox-x.vcxproj @@ -504,7 +504,7 @@ for /d %%i in ($(SolutionDir)\..\contrib\translations\*) do copy %%i\*.lng "$(Ou true - winmm.lib;imm32.lib;dsound.lib;dxguid.lib;SetupAPI.lib;version.lib;Iphlpapi.lib;Ws2_32.lib;comdlg32.lib;shell32.lib;gdi32.lib;ole32.lib;oleaut32.lib;Advapi32.lib;$(SolutionDir)..\obj\libpdcurses\$(Platform)\$(Configuration)\libpdcurses.lib;$(SolutionDir)..\obj\zlib\$(Platform)\$(Configuration)\zlib.lib;$(SolutionDir)..\obj\libpng\$(Platform)\$(Configuration)\libpng.lib;$(SolutionDir)..\obj\freetype\$(Platform)\$(Configuration)\freetype.lib;$(SolutionDir)..\obj\SDL\$(Platform)\$(Configuration)\SDL.lib;$(SolutionDir)..\obj\SDLmain\$(Platform)\$(Configuration)\SDLmain.lib;$(SolutionDir)..\obj\SDL_net\$(Platform)\$(Configuration)\SDL_net.lib;%(AdditionalDependencies) + winmm.lib;imm32.lib;dsound.lib;dxguid.lib;SetupAPI.lib;version.lib;Iphlpapi.lib;Ws2_32.lib;opengl32.lib;comdlg32.lib;shell32.lib;gdi32.lib;ole32.lib;oleaut32.lib;Advapi32.lib;$(SolutionDir)..\obj\libpdcurses\$(Platform)\$(Configuration)\libpdcurses.lib;$(SolutionDir)..\obj\zlib\$(Platform)\$(Configuration)\zlib.lib;$(SolutionDir)..\obj\libpng\$(Platform)\$(Configuration)\libpng.lib;$(SolutionDir)..\obj\freetype\$(Platform)\$(Configuration)\freetype.lib;$(SolutionDir)..\obj\SDL\$(Platform)\$(Configuration)\SDL.lib;$(SolutionDir)..\obj\SDLmain\$(Platform)\$(Configuration)\SDLmain.lib;$(SolutionDir)..\obj\SDL_net\$(Platform)\$(Configuration)\SDL_net.lib;%(AdditionalDependencies) Windows @@ -522,6 +522,8 @@ if not exist "$(OutputPath)\scripts\" mkdir "$(OutputPath)\scripts" copy "$(SolutionDir)\..\contrib\windows\installer\windows_explorer_context_menu*.bat" "$(OutputPath)\scripts\" if not exist "$(OutputPath)\shaders\" mkdir "$(OutputPath)\shaders" copy "$(SolutionDir)\..\contrib\windows\shaders\*.*" "$(OutputPath)\shaders\" +if not exist "$(OutputPath)\glshaders\" mkdir "$(OutputPath)\glshaders" +copy "$(SolutionDir)\..\contrib\glshaders\*.*" "$(OutputPath)\glshaders\" if not exist "$(OutputPath)\languages\" mkdir "$(OutputPath)\languages" for /d %%i in ($(SolutionDir)\..\contrib\translations\*) do copy %%i\*.lng "$(OutputPath)\languages\" @@ -546,7 +548,7 @@ for /d %%i in ($(SolutionDir)\..\contrib\translations\*) do copy %%i\*.lng "$(Ou true - winmm.lib;imm32.lib;dsound.lib;dxguid.lib;SetupAPI.lib;version.lib;Iphlpapi.lib;Ws2_32.lib;comdlg32.lib;shell32.lib;gdi32.lib;ole32.lib;oleaut32.lib;Advapi32.lib;$(SolutionDir)..\obj\libpdcurses\$(Platform)\$(Configuration)\libpdcurses.lib;$(SolutionDir)..\obj\zlib\$(Platform)\$(Configuration)\zlib.lib;$(SolutionDir)..\obj\libpng\$(Platform)\$(Configuration)\libpng.lib;$(SolutionDir)..\obj\freetype\$(Platform)\$(Configuration)\freetype.lib;$(SolutionDir)..\obj\SDL\$(Platform)\$(Configuration)\SDL.lib;$(SolutionDir)..\obj\SDLmain\$(Platform)\$(Configuration)\SDLmain.lib;$(SolutionDir)..\obj\SDL_net\$(Platform)\$(Configuration)\SDL_net.lib;%(AdditionalDependencies) + winmm.lib;imm32.lib;dsound.lib;dxguid.lib;SetupAPI.lib;version.lib;Iphlpapi.lib;Ws2_32.lib;opengl32.lib;comdlg32.lib;shell32.lib;gdi32.lib;ole32.lib;oleaut32.lib;Advapi32.lib;$(SolutionDir)..\obj\libpdcurses\$(Platform)\$(Configuration)\libpdcurses.lib;$(SolutionDir)..\obj\zlib\$(Platform)\$(Configuration)\zlib.lib;$(SolutionDir)..\obj\libpng\$(Platform)\$(Configuration)\libpng.lib;$(SolutionDir)..\obj\freetype\$(Platform)\$(Configuration)\freetype.lib;$(SolutionDir)..\obj\SDL\$(Platform)\$(Configuration)\SDL.lib;$(SolutionDir)..\obj\SDLmain\$(Platform)\$(Configuration)\SDLmain.lib;$(SolutionDir)..\obj\SDL_net\$(Platform)\$(Configuration)\SDL_net.lib;%(AdditionalDependencies) Windows @@ -564,6 +566,8 @@ if not exist "$(OutputPath)\scripts\" mkdir "$(OutputPath)\scripts" copy "$(SolutionDir)\..\contrib\windows\installer\windows_explorer_context_menu*.bat" "$(OutputPath)\scripts\" if not exist "$(OutputPath)\shaders\" mkdir "$(OutputPath)\shaders" copy "$(SolutionDir)\..\contrib\windows\shaders\*.*" "$(OutputPath)\shaders\" +if not exist "$(OutputPath)\glshaders\" mkdir "$(OutputPath)\glshaders" +copy "$(SolutionDir)\..\contrib\glshaders\*.*" "$(OutputPath)\glshaders\" if not exist "$(OutputPath)\languages\" mkdir "$(OutputPath)\languages" for /d %%i in ($(SolutionDir)\..\contrib\translations\*) do copy %%i\*.lng "$(OutputPath)\languages\" @@ -635,7 +639,7 @@ for /d %%i in ($(SolutionDir)\..\contrib\translations\*) do copy %%i\*.lng "$(Ou true - winmm.lib;imm32.lib;dsound.lib;dxguid.lib;SetupAPI.lib;version.lib;Iphlpapi.lib;Ws2_32.lib;comdlg32.lib;shell32.lib;gdi32.lib;ole32.lib;oleaut32.lib;Advapi32.lib;$(SolutionDir)..\obj\libpdcurses\$(Platform)\$(Configuration)\libpdcurses.lib;$(SolutionDir)..\obj\zlib\$(Platform)\$(Configuration)\zlib.lib;$(SolutionDir)..\obj\libpng\$(Platform)\$(Configuration)\libpng.lib;$(SolutionDir)..\obj\freetype\$(Platform)\$(Configuration)\freetype.lib;$(SolutionDir)..\obj\SDL2\$(Platform)\$(Configuration)\sdl2.lib;$(SolutionDir)..\obj\SDL2main\$(Platform)\$(Configuration)\sdl2main.lib;$(SolutionDir)..\obj\SDL_net\$(Platform)\$(Configuration)\SDL_net.lib;%(AdditionalDependencies) + winmm.lib;imm32.lib;dsound.lib;dxguid.lib;SetupAPI.lib;version.lib;Iphlpapi.lib;Ws2_32.lib;opengl32.lib;comdlg32.lib;shell32.lib;gdi32.lib;ole32.lib;oleaut32.lib;Advapi32.lib;$(SolutionDir)..\obj\libpdcurses\$(Platform)\$(Configuration)\libpdcurses.lib;$(SolutionDir)..\obj\zlib\$(Platform)\$(Configuration)\zlib.lib;$(SolutionDir)..\obj\libpng\$(Platform)\$(Configuration)\libpng.lib;$(SolutionDir)..\obj\freetype\$(Platform)\$(Configuration)\freetype.lib;$(SolutionDir)..\obj\SDL2\$(Platform)\$(Configuration)\sdl2.lib;$(SolutionDir)..\obj\SDL2main\$(Platform)\$(Configuration)\sdl2main.lib;$(SolutionDir)..\obj\SDL_net\$(Platform)\$(Configuration)\SDL_net.lib;%(AdditionalDependencies) Windows @@ -653,6 +657,8 @@ if not exist "$(OutputPath)\scripts\" mkdir "$(OutputPath)\scripts" copy "$(SolutionDir)\..\contrib\windows\installer\windows_explorer_context_menu*.bat" "$(OutputPath)\scripts\" if not exist "$(OutputPath)\shaders\" mkdir "$(OutputPath)\shaders" copy "$(SolutionDir)\..\contrib\windows\shaders\*.*" "$(OutputPath)\shaders\" +if not exist "$(OutputPath)\glshaders\" mkdir "$(OutputPath)\glshaders" +copy "$(SolutionDir)\..\contrib\glshaders\*.*" "$(OutputPath)\glshaders\" if not exist "$(OutputPath)\languages\" mkdir "$(OutputPath)\languages" for /d %%i in ($(SolutionDir)\..\contrib\translations\*) do copy %%i\*.lng "$(OutputPath)\languages\" @@ -677,7 +683,7 @@ for /d %%i in ($(SolutionDir)\..\contrib\translations\*) do copy %%i\*.lng "$(Ou true - winmm.lib;imm32.lib;dsound.lib;dxguid.lib;SetupAPI.lib;version.lib;Iphlpapi.lib;Ws2_32.lib;comdlg32.lib;shell32.lib;gdi32.lib;ole32.lib;oleaut32.lib;Advapi32.lib;$(SolutionDir)..\obj\libpdcurses\$(Platform)\$(Configuration)\libpdcurses.lib;$(SolutionDir)..\obj\zlib\$(Platform)\$(Configuration)\zlib.lib;$(SolutionDir)..\obj\libpng\$(Platform)\$(Configuration)\libpng.lib;$(SolutionDir)..\obj\freetype\$(Platform)\$(Configuration)\freetype.lib;$(SolutionDir)..\obj\SDL2\$(Platform)\$(Configuration)\sdl2.lib;$(SolutionDir)..\obj\SDL2main\$(Platform)\$(Configuration)\sdl2main.lib;$(SolutionDir)..\obj\SDL_net\$(Platform)\$(Configuration)\SDL_net.lib;%(AdditionalDependencies) + winmm.lib;imm32.lib;dsound.lib;dxguid.lib;SetupAPI.lib;version.lib;Iphlpapi.lib;Ws2_32.lib;opengl32.lib;comdlg32.lib;shell32.lib;gdi32.lib;ole32.lib;oleaut32.lib;Advapi32.lib;$(SolutionDir)..\obj\libpdcurses\$(Platform)\$(Configuration)\libpdcurses.lib;$(SolutionDir)..\obj\zlib\$(Platform)\$(Configuration)\zlib.lib;$(SolutionDir)..\obj\libpng\$(Platform)\$(Configuration)\libpng.lib;$(SolutionDir)..\obj\freetype\$(Platform)\$(Configuration)\freetype.lib;$(SolutionDir)..\obj\SDL2\$(Platform)\$(Configuration)\sdl2.lib;$(SolutionDir)..\obj\SDL2main\$(Platform)\$(Configuration)\sdl2main.lib;$(SolutionDir)..\obj\SDL_net\$(Platform)\$(Configuration)\SDL_net.lib;%(AdditionalDependencies) Windows @@ -695,6 +701,8 @@ if not exist "$(OutputPath)\scripts\" mkdir "$(OutputPath)\scripts" copy "$(SolutionDir)\..\contrib\windows\installer\windows_explorer_context_menu*.bat" "$(OutputPath)\scripts\" if not exist "$(OutputPath)\shaders\" mkdir "$(OutputPath)\shaders" copy "$(SolutionDir)\..\contrib\windows\shaders\*.*" "$(OutputPath)\shaders\" +if not exist "$(OutputPath)\glshaders\" mkdir "$(OutputPath)\glshaders" +copy "$(SolutionDir)\..\contrib\glshaders\*.*" "$(OutputPath)\glshaders\" if not exist "$(OutputPath)\languages\" mkdir "$(OutputPath)\languages" for /d %%i in ($(SolutionDir)\..\contrib\translations\*) do copy %%i\*.lng "$(OutputPath)\languages\" @@ -865,7 +873,7 @@ for /d %%i in ($(SolutionDir)\..\contrib\translations\*) do copy %%i\*.lng "$(Ou true - winmm.lib;imm32.lib;dsound.lib;dxguid.lib;SetupAPI.lib;version.lib;Iphlpapi.lib;Ws2_32.lib;comdlg32.lib;shell32.lib;gdi32.lib;ole32.lib;oleaut32.lib;Advapi32.lib;$(SolutionDir)..\obj\libpdcurses\$(Platform)\$(Configuration)\libpdcurses.lib;$(SolutionDir)..\obj\zlib\$(Platform)\$(Configuration)\zlib.lib;$(SolutionDir)..\obj\libpng\$(Platform)\$(Configuration)\libpng.lib;$(SolutionDir)..\obj\freetype\$(Platform)\$(Configuration)\freetype.lib;$(SolutionDir)..\obj\SDL\$(Platform)\$(Configuration)\SDL.lib;$(SolutionDir)..\obj\SDLmain\$(Platform)\$(Configuration)\SDLmain.lib;$(SolutionDir)..\obj\SDL_net\$(Platform)\$(Configuration)\SDL_net.lib;%(AdditionalDependencies) + winmm.lib;imm32.lib;dsound.lib;dxguid.lib;SetupAPI.lib;version.lib;Iphlpapi.lib;Ws2_32.lib;opengl32.lib;comdlg32.lib;shell32.lib;gdi32.lib;ole32.lib;oleaut32.lib;Advapi32.lib;$(SolutionDir)..\obj\libpdcurses\$(Platform)\$(Configuration)\libpdcurses.lib;$(SolutionDir)..\obj\zlib\$(Platform)\$(Configuration)\zlib.lib;$(SolutionDir)..\obj\libpng\$(Platform)\$(Configuration)\libpng.lib;$(SolutionDir)..\obj\freetype\$(Platform)\$(Configuration)\freetype.lib;$(SolutionDir)..\obj\SDL\$(Platform)\$(Configuration)\SDL.lib;$(SolutionDir)..\obj\SDLmain\$(Platform)\$(Configuration)\SDLmain.lib;$(SolutionDir)..\obj\SDL_net\$(Platform)\$(Configuration)\SDL_net.lib;%(AdditionalDependencies) Windows @@ -883,6 +891,8 @@ if not exist "$(OutputPath)\scripts\" mkdir "$(OutputPath)\scripts" copy "$(SolutionDir)\..\contrib\windows\installer\windows_explorer_context_menu*.bat" "$(OutputPath)\scripts\" if not exist "$(OutputPath)\shaders\" mkdir "$(OutputPath)\shaders" copy "$(SolutionDir)\..\contrib\windows\shaders\*.*" "$(OutputPath)\shaders\" +if not exist "$(OutputPath)\glshaders\" mkdir "$(OutputPath)\glshaders" +copy "$(SolutionDir)\..\contrib\glshaders\*.*" "$(OutputPath)\glshaders\" if not exist "$(OutputPath)\languages\" mkdir "$(OutputPath)\languages" for /d %%i in ($(SolutionDir)\..\contrib\translations\*) do copy %%i\*.lng "$(OutputPath)\languages\" @@ -908,7 +918,7 @@ for /d %%i in ($(SolutionDir)\..\contrib\translations\*) do copy %%i\*.lng "$(Ou true - winmm.lib;imm32.lib;dsound.lib;dxguid.lib;SetupAPI.lib;version.lib;Iphlpapi.lib;Ws2_32.lib;comdlg32.lib;shell32.lib;gdi32.lib;ole32.lib;oleaut32.lib;Advapi32.lib;$(SolutionDir)..\obj\libpdcurses\$(Platform)\$(Configuration)\libpdcurses.lib;$(SolutionDir)..\obj\zlib\$(Platform)\$(Configuration)\zlib.lib;$(SolutionDir)..\obj\libpng\$(Platform)\$(Configuration)\libpng.lib;$(SolutionDir)..\obj\freetype\$(Platform)\$(Configuration)\freetype.lib;$(SolutionDir)..\obj\SDL\$(Platform)\$(Configuration)\SDL.lib;$(SolutionDir)..\obj\SDLmain\$(Platform)\$(Configuration)\SDLmain.lib;$(SolutionDir)..\obj\SDL_net\$(Platform)\$(Configuration)\SDL_net.lib;%(AdditionalDependencies) + winmm.lib;imm32.lib;dsound.lib;dxguid.lib;SetupAPI.lib;version.lib;Iphlpapi.lib;Ws2_32.lib;opengl32.lib;comdlg32.lib;shell32.lib;gdi32.lib;ole32.lib;oleaut32.lib;Advapi32.lib;$(SolutionDir)..\obj\libpdcurses\$(Platform)\$(Configuration)\libpdcurses.lib;$(SolutionDir)..\obj\zlib\$(Platform)\$(Configuration)\zlib.lib;$(SolutionDir)..\obj\libpng\$(Platform)\$(Configuration)\libpng.lib;$(SolutionDir)..\obj\freetype\$(Platform)\$(Configuration)\freetype.lib;$(SolutionDir)..\obj\SDL\$(Platform)\$(Configuration)\SDL.lib;$(SolutionDir)..\obj\SDLmain\$(Platform)\$(Configuration)\SDLmain.lib;$(SolutionDir)..\obj\SDL_net\$(Platform)\$(Configuration)\SDL_net.lib;%(AdditionalDependencies) Windows @@ -926,6 +936,8 @@ if not exist "$(OutputPath)\scripts\" mkdir "$(OutputPath)\scripts" copy "$(SolutionDir)\..\contrib\windows\installer\windows_explorer_context_menu*.bat" "$(OutputPath)\scripts\" if not exist "$(OutputPath)\shaders\" mkdir "$(OutputPath)\shaders" copy "$(SolutionDir)\..\contrib\windows\shaders\*.*" "$(OutputPath)\shaders\" +if not exist "$(OutputPath)\glshaders\" mkdir "$(OutputPath)\glshaders" +copy "$(SolutionDir)\..\contrib\glshaders\*.*" "$(OutputPath)\glshaders\" if not exist "$(OutputPath)\languages\" mkdir "$(OutputPath)\languages" for /d %%i in ($(SolutionDir)\..\contrib\translations\*) do copy %%i\*.lng "$(OutputPath)\languages\" @@ -999,7 +1011,7 @@ for /d %%i in ($(SolutionDir)\..\contrib\translations\*) do copy %%i\*.lng "$(Ou true - winmm.lib;imm32.lib;dsound.lib;dxguid.lib;SetupAPI.lib;version.lib;Iphlpapi.lib;Ws2_32.lib;comdlg32.lib;shell32.lib;gdi32.lib;ole32.lib;oleaut32.lib;Advapi32.lib;$(SolutionDir)..\obj\libpdcurses\$(Platform)\$(Configuration)\libpdcurses.lib;$(SolutionDir)..\obj\zlib\$(Platform)\$(Configuration)\zlib.lib;$(SolutionDir)..\obj\libpng\$(Platform)\$(Configuration)\libpng.lib;$(SolutionDir)..\obj\freetype\$(Platform)\$(Configuration)\freetype.lib;$(SolutionDir)..\obj\SDL2\$(Platform)\$(Configuration)\sdl2.lib;$(SolutionDir)..\obj\SDL2main\$(Platform)\$(Configuration)\sdl2main.lib;$(SolutionDir)..\obj\SDL_net\$(Platform)\$(Configuration)\SDL_net.lib;%(AdditionalDependencies) + winmm.lib;imm32.lib;dsound.lib;dxguid.lib;SetupAPI.lib;version.lib;Iphlpapi.lib;Ws2_32.lib;opengl32.lib;comdlg32.lib;shell32.lib;gdi32.lib;ole32.lib;oleaut32.lib;Advapi32.lib;$(SolutionDir)..\obj\libpdcurses\$(Platform)\$(Configuration)\libpdcurses.lib;$(SolutionDir)..\obj\zlib\$(Platform)\$(Configuration)\zlib.lib;$(SolutionDir)..\obj\libpng\$(Platform)\$(Configuration)\libpng.lib;$(SolutionDir)..\obj\freetype\$(Platform)\$(Configuration)\freetype.lib;$(SolutionDir)..\obj\SDL2\$(Platform)\$(Configuration)\sdl2.lib;$(SolutionDir)..\obj\SDL2main\$(Platform)\$(Configuration)\sdl2main.lib;$(SolutionDir)..\obj\SDL_net\$(Platform)\$(Configuration)\SDL_net.lib;%(AdditionalDependencies) Windows @@ -1017,6 +1029,8 @@ if not exist "$(OutputPath)\scripts\" mkdir "$(OutputPath)\scripts" copy "$(SolutionDir)\..\contrib\windows\installer\windows_explorer_context_menu*.bat" "$(OutputPath)\scripts\" if not exist "$(OutputPath)\shaders\" mkdir "$(OutputPath)\shaders" copy "$(SolutionDir)\..\contrib\windows\shaders\*.*" "$(OutputPath)\shaders\" +if not exist "$(OutputPath)\glshaders\" mkdir "$(OutputPath)\glshaders" +copy "$(SolutionDir)\..\contrib\glshaders\*.*" "$(OutputPath)\glshaders\" if not exist "$(OutputPath)\languages\" mkdir "$(OutputPath)\languages" for /d %%i in ($(SolutionDir)\..\contrib\translations\*) do copy %%i\*.lng "$(OutputPath)\languages\" @@ -1042,7 +1056,7 @@ for /d %%i in ($(SolutionDir)\..\contrib\translations\*) do copy %%i\*.lng "$(Ou true - winmm.lib;imm32.lib;dsound.lib;dxguid.lib;SetupAPI.lib;version.lib;Iphlpapi.lib;Ws2_32.lib;comdlg32.lib;shell32.lib;gdi32.lib;ole32.lib;oleaut32.lib;Advapi32.lib;$(SolutionDir)..\obj\libpdcurses\$(Platform)\$(Configuration)\libpdcurses.lib;$(SolutionDir)..\obj\zlib\$(Platform)\$(Configuration)\zlib.lib;$(SolutionDir)..\obj\libpng\$(Platform)\$(Configuration)\libpng.lib;$(SolutionDir)..\obj\freetype\$(Platform)\$(Configuration)\freetype.lib;$(SolutionDir)..\obj\SDL2\$(Platform)\$(Configuration)\sdl2.lib;$(SolutionDir)..\obj\SDL2main\$(Platform)\$(Configuration)\sdl2main.lib;$(SolutionDir)..\obj\SDL_net\$(Platform)\$(Configuration)\SDL_net.lib;%(AdditionalDependencies) + winmm.lib;imm32.lib;dsound.lib;dxguid.lib;SetupAPI.lib;version.lib;Iphlpapi.lib;Ws2_32.lib;opengl32.lib;comdlg32.lib;shell32.lib;gdi32.lib;ole32.lib;oleaut32.lib;Advapi32.lib;$(SolutionDir)..\obj\libpdcurses\$(Platform)\$(Configuration)\libpdcurses.lib;$(SolutionDir)..\obj\zlib\$(Platform)\$(Configuration)\zlib.lib;$(SolutionDir)..\obj\libpng\$(Platform)\$(Configuration)\libpng.lib;$(SolutionDir)..\obj\freetype\$(Platform)\$(Configuration)\freetype.lib;$(SolutionDir)..\obj\SDL2\$(Platform)\$(Configuration)\sdl2.lib;$(SolutionDir)..\obj\SDL2main\$(Platform)\$(Configuration)\sdl2main.lib;$(SolutionDir)..\obj\SDL_net\$(Platform)\$(Configuration)\SDL_net.lib;%(AdditionalDependencies) Windows @@ -1060,6 +1074,8 @@ if not exist "$(OutputPath)\scripts\" mkdir "$(OutputPath)\scripts" copy "$(SolutionDir)\..\contrib\windows\installer\windows_explorer_context_menu*.bat" "$(OutputPath)\scripts\" if not exist "$(OutputPath)\shaders\" mkdir "$(OutputPath)\shaders" copy "$(SolutionDir)\..\contrib\windows\shaders\*.*" "$(OutputPath)\shaders\" +if not exist "$(OutputPath)\glshaders\" mkdir "$(OutputPath)\glshaders" +copy "$(SolutionDir)\..\contrib\glshaders\*.*" "$(OutputPath)\glshaders\" if not exist "$(OutputPath)\languages\" mkdir "$(OutputPath)\languages" for /d %%i in ($(SolutionDir)\..\contrib\translations\*) do copy %%i\*.lng "$(OutputPath)\languages\" diff --git a/vs/sdl/include/SDL_stdinc.h b/vs/sdl/include/SDL_stdinc.h index d45ac97e3..ffa8d8ec8 100644 --- a/vs/sdl/include/SDL_stdinc.h +++ b/vs/sdl/include/SDL_stdinc.h @@ -28,7 +28,9 @@ #define _SDL_stdinc_h #include "SDL_config.h" - +#if defined(__LINUX__) && !defined(SDL_VIDEO_DRIVER_X11) +#undef ENABLE_IM_EVENT +#endif #ifdef HAVE_SYS_TYPES_H #include