epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Switch windows to SDL2. Fixes #4945.

Browse Source
This commit is contained in:
Paul Chote
2014-05-01 22:05:10 +12:00
parent 1a432e9e9e
commit 39daddfc4c
3 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
packaging/windows/OpenRA.nsi
View File

@@ -66,10 +66,10 @@ Section "Game" GAME
SetOutPath "$INSTDIR" SetOutPath "$INSTDIR"
File "${SRCDIR}\OpenRA.Game.exe" File "${SRCDIR}\OpenRA.Game.exe"
File "${SRCDIR}\OpenRA.Utility.exe" File "${SRCDIR}\OpenRA.Utility.exe"
File "${SRCDIR}\OpenRA.Renderer.Null.dll"
File "${SRCDIR}\OpenRA.Renderer.SdlCommon.dll" File "${SRCDIR}\OpenRA.Renderer.SdlCommon.dll"
File "${SRCDIR}\OpenRA.Renderer.Gl.dll" File "${SRCDIR}\OpenRA.Renderer.Gl.dll"
File "${SRCDIR}\OpenRA.Renderer.Cg.dll" File "${SRCDIR}\OpenRA.Renderer.Sdl2.dll"
File "${SRCDIR}\OpenRA.Renderer.Null.dll"
File "${SRCDIR}\OpenRA.Irc.dll" File "${SRCDIR}\OpenRA.Irc.dll"
File "${SRCDIR}\ICSharpCode.SharpZipLib.dll" File "${SRCDIR}\ICSharpCode.SharpZipLib.dll"
File "${SRCDIR}\FuzzyLogicLibrary.dll" File "${SRCDIR}\FuzzyLogicLibrary.dll"
@@ -84,6 +84,7 @@ Section "Game" GAME
File "${SRCDIR}\OpenRA.ico" File "${SRCDIR}\OpenRA.ico"
File "${SRCDIR}\Tao.*.dll" File "${SRCDIR}\Tao.*.dll"
File "${SRCDIR}\SharpFont.dll" File "${SRCDIR}\SharpFont.dll"
File "${SRCDIR}\SDL2-CS.dll"
File "${SRCDIR}\global mix database.dat" File "${SRCDIR}\global mix database.dat"
File "${SRCDIR}\MaxMind.Db.dll" File "${SRCDIR}\MaxMind.Db.dll"
File "${SRCDIR}\MaxMind.GeoIP2.dll" File "${SRCDIR}\MaxMind.GeoIP2.dll"
@@ -94,7 +95,7 @@ Section "Game" GAME
File "${SRCDIR}\NLua.dll" File "${SRCDIR}\NLua.dll"
File "${SRCDIR}\eluant.dll" File "${SRCDIR}\eluant.dll"
File "${DEPSDIR}\OpenAL32.dll" File "${DEPSDIR}\OpenAL32.dll"
File "${DEPSDIR}\SDL.dll" File "${DEPSDIR}\SDL2.dll"
File "${DEPSDIR}\freetype6.dll" File "${DEPSDIR}\freetype6.dll"
File "${DEPSDIR}\zlib1.dll" File "${DEPSDIR}\zlib1.dll"
File "${DEPSDIR}\lua51.dll" File "${DEPSDIR}\lua51.dll"
@@ -109,8 +110,6 @@ Section "Game" GAME
"$OUTDIR\README.html" "" "" "" "" "$OUTDIR\README.html" "" "" "" ""
!insertmacro MUI_STARTMENU_WRITE_END !insertmacro MUI_STARTMENU_WRITE_END
SetOutPath "$INSTDIR\cg"
File "${SRCDIR}\cg\*.fx"
SetOutPath "$INSTDIR\glsl" SetOutPath "$INSTDIR\glsl"
File "${SRCDIR}\glsl\*.frag" File "${SRCDIR}\glsl\*.frag"
File "${SRCDIR}\glsl\*.vert" File "${SRCDIR}\glsl\*.vert"
@@ -184,17 +183,16 @@ SectionEnd
Function ${UN}Clean Function ${UN}Clean
RMDir /r $INSTDIR\mods RMDir /r $INSTDIR\mods
RMDir /r $INSTDIR\maps RMDir /r $INSTDIR\maps
RMDir /r $INSTDIR\cg
RMDir /r $INSTDIR\glsl RMDir /r $INSTDIR\glsl
RMDir /r $INSTDIR\lua RMDir /r $INSTDIR\lua
Delete $INSTDIR\OpenRA.Launcher.exe Delete $INSTDIR\OpenRA.Launcher.exe
Delete $INSTDIR\OpenRA.Game.exe Delete $INSTDIR\OpenRA.Game.exe
Delete $INSTDIR\OpenRA.Utility.exe Delete $INSTDIR\OpenRA.Utility.exe
Delete $INSTDIR\OpenRA.Editor.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.Null.dll
Delete $INSTDIR\OpenRA.Renderer.SdlCommon.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\OpenRA.Irc.dll
Delete $INSTDIR\ICSharpCode.SharpZipLib.dll Delete $INSTDIR\ICSharpCode.SharpZipLib.dll
Delete $INSTDIR\FuzzyLogicLibrary.dll Delete $INSTDIR\FuzzyLogicLibrary.dll
@@ -217,8 +215,9 @@ Function ${UN}Clean
Delete $INSTDIR\GeoLite2-Country.mmdb Delete $INSTDIR\GeoLite2-Country.mmdb
Delete $INSTDIR\KopiLua.dll Delete $INSTDIR\KopiLua.dll
Delete $INSTDIR\NLua.dll Delete $INSTDIR\NLua.dll
Delete $INSTDIR\SDL2-CS.dll
Delete $INSTDIR\OpenAL32.dll Delete $INSTDIR\OpenAL32.dll
Delete $INSTDIR\SDL.dll Delete $INSTDIR\SDL2.dll
Delete $INSTDIR\lua51.dll Delete $INSTDIR\lua51.dll
Delete $INSTDIR\eluant.dll Delete $INSTDIR\eluant.dll
Delete $INSTDIR\freetype6.dll Delete $INSTDIR\freetype6.dll

BIN
thirdparty/windows/SDL.dll vendored
View File

Binary file not shown.

BIN
thirdparty/windows/SDL2.dll vendored Executable file
View File

Binary file not shown.