diff --git a/packaging/windows/OpenRA.nsi b/packaging/windows/OpenRA.nsi index 1d63359307..3075e3ab12 100644 --- a/packaging/windows/OpenRA.nsi +++ b/packaging/windows/OpenRA.nsi @@ -66,10 +66,10 @@ Section "Game" GAME SetOutPath "$INSTDIR" File "${SRCDIR}\OpenRA.Game.exe" File "${SRCDIR}\OpenRA.Utility.exe" + File "${SRCDIR}\OpenRA.Renderer.Null.dll" File "${SRCDIR}\OpenRA.Renderer.SdlCommon.dll" File "${SRCDIR}\OpenRA.Renderer.Gl.dll" - File "${SRCDIR}\OpenRA.Renderer.Cg.dll" - File "${SRCDIR}\OpenRA.Renderer.Null.dll" + File "${SRCDIR}\OpenRA.Renderer.Sdl2.dll" File "${SRCDIR}\OpenRA.Irc.dll" File "${SRCDIR}\ICSharpCode.SharpZipLib.dll" File "${SRCDIR}\FuzzyLogicLibrary.dll" @@ -84,6 +84,7 @@ Section "Game" GAME File "${SRCDIR}\OpenRA.ico" File "${SRCDIR}\Tao.*.dll" File "${SRCDIR}\SharpFont.dll" + File "${SRCDIR}\SDL2-CS.dll" File "${SRCDIR}\global mix database.dat" File "${SRCDIR}\MaxMind.Db.dll" File "${SRCDIR}\MaxMind.GeoIP2.dll" @@ -94,7 +95,7 @@ Section "Game" GAME File "${SRCDIR}\NLua.dll" File "${SRCDIR}\eluant.dll" File "${DEPSDIR}\OpenAL32.dll" - File "${DEPSDIR}\SDL.dll" + File "${DEPSDIR}\SDL2.dll" File "${DEPSDIR}\freetype6.dll" File "${DEPSDIR}\zlib1.dll" File "${DEPSDIR}\lua51.dll" @@ -109,8 +110,6 @@ Section "Game" GAME "$OUTDIR\README.html" "" "" "" "" !insertmacro MUI_STARTMENU_WRITE_END - SetOutPath "$INSTDIR\cg" - File "${SRCDIR}\cg\*.fx" SetOutPath "$INSTDIR\glsl" File "${SRCDIR}\glsl\*.frag" File "${SRCDIR}\glsl\*.vert" @@ -184,17 +183,16 @@ SectionEnd Function ${UN}Clean RMDir /r $INSTDIR\mods RMDir /r $INSTDIR\maps - RMDir /r $INSTDIR\cg RMDir /r $INSTDIR\glsl RMDir /r $INSTDIR\lua Delete $INSTDIR\OpenRA.Launcher.exe Delete $INSTDIR\OpenRA.Game.exe Delete $INSTDIR\OpenRA.Utility.exe Delete $INSTDIR\OpenRA.Editor.exe - Delete $INSTDIR\OpenRA.Renderer.Gl.dll - Delete $INSTDIR\OpenRA.Renderer.Cg.dll Delete $INSTDIR\OpenRA.Renderer.Null.dll Delete $INSTDIR\OpenRA.Renderer.SdlCommon.dll + Delete $INSTDIR\OpenRA.Renderer.Gl.dll + Delete $INSTDIR\OpenRA.Renderer.Sdl2.dll Delete $INSTDIR\OpenRA.Irc.dll Delete $INSTDIR\ICSharpCode.SharpZipLib.dll Delete $INSTDIR\FuzzyLogicLibrary.dll @@ -217,8 +215,9 @@ Function ${UN}Clean Delete $INSTDIR\GeoLite2-Country.mmdb Delete $INSTDIR\KopiLua.dll Delete $INSTDIR\NLua.dll + Delete $INSTDIR\SDL2-CS.dll Delete $INSTDIR\OpenAL32.dll - Delete $INSTDIR\SDL.dll + Delete $INSTDIR\SDL2.dll Delete $INSTDIR\lua51.dll Delete $INSTDIR\eluant.dll Delete $INSTDIR\freetype6.dll diff --git a/thirdparty/windows/SDL.dll b/thirdparty/windows/SDL.dll deleted file mode 100644 index 628cdfcf01..0000000000 Binary files a/thirdparty/windows/SDL.dll and /dev/null differ diff --git a/thirdparty/windows/SDL2.dll b/thirdparty/windows/SDL2.dll new file mode 100755 index 0000000000..18d707f481 Binary files /dev/null and b/thirdparty/windows/SDL2.dll differ