- added x64 based binaries
This commit is contained in:
SoftCoder
parent
17678387c3
commit
3edbff630d
|
|
@ -6,6 +6,10 @@
|
|||
!define APVER_OLD 3.11.1
|
||||
!define APVER 3.12-dev
|
||||
|
||||
!ifdef NSIS_WIN32_MAKENSIS
|
||||
!define NSISCONF_3 ";" ; NSIS 2 tries to parse some preprocessor instructions inside "!if 0" blocks!
|
||||
!endif ;~ NSIS_WIN32_MAKENSIS
|
||||
|
||||
Name "${APNAME} ${APVER}"
|
||||
SetCompressor /FINAL /SOLID lzma
|
||||
SetCompressorDictSize 64
|
||||
|
|
@ -126,6 +130,11 @@ Function MUIGUIInit
|
|||
StrCpy $R2 "?"
|
||||
IfFileExists $EXEDIR\megaglest_exe foundInst doneInit
|
||||
|
||||
IfFileExists $INSTDIR\megaglestx64.exe 0 +2
|
||||
StrCpy $R0 "$INSTDIR"
|
||||
StrCpy $R2 "?"
|
||||
IfFileExists $INSTDIR\megaglestx64.exe foundInst
|
||||
|
||||
foundInst:
|
||||
|
||||
#MessageBox MB_OK|MB_ICONEXCLAMATION "Looking for mods in [$R0\\mydata\\]"
|
||||
|
|
@ -195,7 +204,11 @@ noViewReadme:
|
|||
click Yes to launch the game now$\nor 'No' to exit." IDNO noLaunch
|
||||
|
||||
SetOutPath $INSTDIR
|
||||
Exec 'megaglest.exe'
|
||||
${If} ${FileExists} "$INSTDIR\megaglest.exe"
|
||||
Exec 'megaglest.exe'
|
||||
${ElseIf} ${FileExists} "$INSTDIR\megaglestx64.exe"
|
||||
Exec 'megaglestx64.exe'
|
||||
${EndIf}
|
||||
|
||||
noLaunch:
|
||||
|
||||
|
|
@ -213,27 +226,37 @@ Section "${APNAME} (required)"
|
|||
; Set output path to the installation directory.
|
||||
SetOutPath $INSTDIR
|
||||
; Put file there
|
||||
File "..\megaglest.exe"
|
||||
File "..\megaglest_editor.exe"
|
||||
File "..\megaglest_g3dviewer.exe"
|
||||
File /NONFATAL "..\megaglest.exe"
|
||||
File /NONFATAL "..\megaglest_editor.exe"
|
||||
File /NONFATAL "..\megaglest_g3dviewer.exe"
|
||||
|
||||
File /NONFATAL "..\megaglestx64.exe"
|
||||
File /NONFATAL "..\megaglest_editorx64.exe"
|
||||
File /NONFATAL "..\megaglest_g3dviewerx64.exe"
|
||||
|
||||
File "..\7z.exe"
|
||||
File "..\7z.dll"
|
||||
File "..\..\shared\megaglest.ico"
|
||||
File "..\glest.ini"
|
||||
File "..\..\shared\glestkeys.ini"
|
||||
File "..\..\shared\servers.ini"
|
||||
File "..\openal32.dll"
|
||||
File /NONFATAL "..\openal32.dll"
|
||||
File /NONFATAL "..\openal64.dll"
|
||||
|
||||
File "..\NetworkThrottleFix.reg"
|
||||
|
||||
File "..\libvlccore.dll"
|
||||
File "..\libvlc.dll"
|
||||
File /r /x .git /x .svn /x mydata "..\plugins"
|
||||
File /r /x .git /x .svn /x mydata "..\lua"
|
||||
File /NONFATAL "..\libvlccore.dll"
|
||||
File /NONFATAL "..\libvlc.dll"
|
||||
File /NONFATAL /r /x .git /x .svn /x mydata "..\plugins"
|
||||
File /NONFATAL /r /x .git /x .svn /x mydata "..\lua"
|
||||
|
||||
SetOutPath "$INSTDIR\blender\"
|
||||
File "..\xml2g.exe"
|
||||
File "..\g2xml.exe"
|
||||
File /NONFATAL "..\xml2g.exe"
|
||||
File /NONFATAL "..\g2xml.exe"
|
||||
|
||||
File /NONFATAL "..\xml2gx64.exe"
|
||||
File /NONFATAL "..\g2xmlx64.exe"
|
||||
|
||||
File /r /x .git /x .svn /x mydata /x g2xml /x xml2g "..\..\..\source\tools\glexemel\*.*"
|
||||
SetOutPath $INSTDIR
|
||||
|
||||
|
|
@ -272,8 +295,9 @@ Section "${APNAME} (required)"
|
|||
CreateDirectory $INSTDIR\tutorials
|
||||
CreateDirectory $INSTDIR\blender
|
||||
|
||||
AccessControl::GrantOnFile "$INSTDIR" "(BU)" "FullAccess"
|
||||
|
||||
!ifndef NSISCONF_3
|
||||
AccessControl::GrantOnFile "$INSTDIR" "(BU)" "FullAccess"
|
||||
!endif
|
||||
SectionEnd
|
||||
|
||||
; Optional section (can be disabled by the user)
|
||||
|
|
@ -282,10 +306,16 @@ Section "Start Menu Shortcuts"
|
|||
CreateDirectory "$SMPROGRAMS\${APNAME}"
|
||||
CreateDirectory "$APPDATA\megaglest"
|
||||
CreateShortCut "$SMPROGRAMS\${APNAME}\Uninstall.lnk" "$INSTDIR\uninstall.exe" "" "$INSTDIR\uninstall.exe" 0
|
||||
CreateShortCut "$SMPROGRAMS\${APNAME}\${APNAME}.lnk" "$INSTDIR\megaglest.exe" "" "$INSTDIR\megaglest.exe" 0 "" "" "${APNAME}"
|
||||
|
||||
CreateShortCut "$SMPROGRAMS\${APNAME}\${APNAME} Map Editor.lnk" "$INSTDIR\megaglest_editor.exe" "" "$INSTDIR\megaglest_editor.exe" 0 "" "" "${APNAME} MegaGlest Map Editor"
|
||||
CreateShortCut "$SMPROGRAMS\${APNAME}\${APNAME} G3D Viewer.lnk" "$INSTDIR\megaglest_g3dviewer.exe" "" "$INSTDIR\megaglest_g3dviewer.exe" 0 "" "" "${APNAME} MegaGlest G3D Viewer"
|
||||
${If} ${FileExists} "$INSTDIR\megaglest.exe"
|
||||
CreateShortCut "$SMPROGRAMS\${APNAME}\${APNAME}.lnk" "$INSTDIR\megaglest.exe" "" "$INSTDIR\megaglest.exe" 0 "" "" "${APNAME}"
|
||||
CreateShortCut "$SMPROGRAMS\${APNAME}\${APNAME} Map Editor.lnk" "$INSTDIR\megaglest_editor.exe" "" "$INSTDIR\megaglest_editor.exe" 0 "" "" "${APNAME} MegaGlest Map Editor"
|
||||
CreateShortCut "$SMPROGRAMS\${APNAME}\${APNAME} G3D Viewer.lnk" "$INSTDIR\megaglest_g3dviewer.exe" "" "$INSTDIR\megaglest_g3dviewer.exe" 0 "" "" "${APNAME} MegaGlest G3D Viewer"
|
||||
${ElseIf} ${FileExists} "$INSTDIR\megaglestx64.exe"
|
||||
CreateShortCut "$SMPROGRAMS\${APNAME}\${APNAME}.lnk" "$INSTDIR\megaglestx64.exe" "" "$INSTDIR\megaglestx64.exe" 0 "" "" "${APNAME}"
|
||||
CreateShortCut "$SMPROGRAMS\${APNAME}\${APNAME} Map Editor.lnk" "$INSTDIR\megaglest_editorx64.exe" "" "$INSTDIR\megaglest_editorx64.exe" 0 "" "" "${APNAME} MegaGlest Map Editor"
|
||||
CreateShortCut "$SMPROGRAMS\${APNAME}\${APNAME} G3D Viewer.lnk" "$INSTDIR\megaglest_g3dviewerx64.exe" "" "$INSTDIR\megaglest_g3dviewerx64.exe" 0 "" "" "${APNAME} MegaGlest G3D Viewer"
|
||||
${EndIf}
|
||||
|
||||
CreateShortCut "$SMPROGRAMS\${APNAME}\${APNAME} Main.lnk" "$INSTDIR" "" "" 0 "" "" "This folder is the ${APNAME} installation folder"
|
||||
CreateShortCut "$SMPROGRAMS\${APNAME}\${APNAME} User Data.lnk" "$APPDATA\megaglest" "" "" 0 "" "" "This folder contains downloaded data (such as mods) and your personal ${APNAME} configuration"
|
||||
|
|
@ -295,9 +325,11 @@ SectionEnd
|
|||
;--------------------------------
|
||||
RequestExecutionLevel admin
|
||||
section "Tweaks"
|
||||
AccessControl::GrantOnRegKey \
|
||||
HKLM "Software" "(BU)" "FullAccess"
|
||||
WriteRegDWORD HKLM "SOFTWARE\Microsoft\Windows NT\CurrentVersion\Multimedia\SystemProfile" "NetworkThrottlingIndex" 0xffffffff
|
||||
!ifndef NSISCONF_3
|
||||
AccessControl::GrantOnRegKey \
|
||||
HKLM "Software" "(BU)" "FullAccess"
|
||||
WriteRegDWORD HKLM "SOFTWARE\Microsoft\Windows NT\CurrentVersion\Multimedia\SystemProfile" "NetworkThrottlingIndex" 0xffffffff
|
||||
!endif
|
||||
sectionEnd
|
||||
RequestExecutionLevel none
|
||||
|
||||
|
|
@ -317,11 +349,19 @@ Section "Uninstall"
|
|||
Delete "$INSTDIR\megaglest.exe"
|
||||
Delete "$INSTDIR\megaglest_editor.exe"
|
||||
Delete "$INSTDIR\megaglest_g3dviewer.exe"
|
||||
|
||||
Delete "$INSTDIR\megaglestx64.exe"
|
||||
Delete "$INSTDIR\megaglest_editorx64.exe"
|
||||
Delete "$INSTDIR\megaglest_g3dviewerx64.exe"
|
||||
|
||||
Delete "$INSTDIR\megaglest.ico"
|
||||
Delete "$INSTDIR\glest.ini"
|
||||
Delete "$INSTDIR\glestkeys.ini"
|
||||
Delete "$INSTDIR\servers.ini"
|
||||
|
||||
Delete "$INSTDIR\openal32.dll"
|
||||
Delete "$INSTDIR\openal64.dll"
|
||||
|
||||
Delete "$INSTDIR\*.log"
|
||||
|
||||
Delete "$INSTDIR\data\*.*"
|
||||
|
|
|
|||
Loading…
Reference in New Issue