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

Merge pull request #5449 from Mailaender/nsis-lua-outpath-breakage

Browse Source 
Fixed the OpenRA.Game.exe start menu link
This commit is contained in:
Paul Chote
2014-05-28 11:45:27 +12:00
parent 409e3a5ffc 1926588349
commit ae7ab8f9e0
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packaging/windows/OpenRA.nsi
View File

@@ -63,6 +63,7 @@ Section "Game" GAME
File /r "${SRCDIR}\mods\d2k" File /r "${SRCDIR}\mods\d2k"
File /r "${SRCDIR}\mods\ra" File /r "${SRCDIR}\mods\ra"
File /r "${SRCDIR}\mods\modchooser" File /r "${SRCDIR}\mods\modchooser"
SetOutPath "$INSTDIR" SetOutPath "$INSTDIR"
File "${SRCDIR}\OpenRA.Game.exe" File "${SRCDIR}\OpenRA.Game.exe"
File "${SRCDIR}\OpenRA.Utility.exe" File "${SRCDIR}\OpenRA.Utility.exe"
@@ -97,8 +98,6 @@ Section "Game" GAME
File "${DEPSDIR}\freetype6.dll" File "${DEPSDIR}\freetype6.dll"
File "${DEPSDIR}\zlib1.dll" File "${DEPSDIR}\zlib1.dll"
File "${DEPSDIR}\lua51.dll" File "${DEPSDIR}\lua51.dll"
SetOutPath "$INSTDIR\lua"
File "${SRCDIR}\lua\*.lua"
!insertmacro MUI_STARTMENU_WRITE_BEGIN Application !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
CreateDirectory "$SMPROGRAMS\$StartMenuFolder" CreateDirectory "$SMPROGRAMS\$StartMenuFolder"
@@ -108,6 +107,9 @@ Section "Game" GAME
"$OUTDIR\README.html" "" "" "" "" "$OUTDIR\README.html" "" "" "" ""
!insertmacro MUI_STARTMENU_WRITE_END !insertmacro MUI_STARTMENU_WRITE_END
SetOutPath "$INSTDIR\lua"
File "${SRCDIR}\lua\*.lua"
SetOutPath "$INSTDIR\glsl" SetOutPath "$INSTDIR\glsl"
File "${SRCDIR}\glsl\*.frag" File "${SRCDIR}\glsl\*.frag"
File "${SRCDIR}\glsl\*.vert" File "${SRCDIR}\glsl\*.vert"