TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-01 09:23:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

makepackage: Fix error in installer.nsi

Browse Source
This commit is contained in:
rdb 2020-12-22 16:09:51 +01:00
parent c759bfd6b8
commit 401d7d0f92
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
makepanda/installer.nsi
View File

@ -423,32 +423,16 @@ SectionGroup "Python modules" SecGroupPython
!insertmacro PyBindingSection 3.6-32 .cp36-win32.pyd !insertmacro PyBindingSection 3.6-32 .cp36-win32.pyd
!insertmacro PyBindingSection 3.7-32 .cp37-win32.pyd !insertmacro PyBindingSection 3.7-32 .cp37-win32.pyd
!insertmacro PyBindingSection 3.8-32 .cp38-win32.pyd !insertmacro PyBindingSection 3.8-32 .cp38-win32.pyd
${If} ${AtLeastWin8}
!insertmacro PyBindingSection 3.9-32 .cp39-win32.pyd !insertmacro PyBindingSection 3.9-32 .cp39-win32.pyd
!insertmacro PyBindingSection 3.10-32 .cp310-win32.pyd !insertmacro PyBindingSection 3.10-32 .cp310-win32.pyd
${EndIf}
!else !else
!insertmacro PyBindingSection 3.5 .cp35-win_amd64.pyd !insertmacro PyBindingSection 3.5 .cp35-win_amd64.pyd
!insertmacro PyBindingSection 3.6 .cp36-win_amd64.pyd !insertmacro PyBindingSection 3.6 .cp36-win_amd64.pyd
!insertmacro PyBindingSection 3.7 .cp37-win_amd64.pyd !insertmacro PyBindingSection 3.7 .cp37-win_amd64.pyd
!insertmacro PyBindingSection 3.8 .cp38-win_amd64.pyd !insertmacro PyBindingSection 3.8 .cp38-win_amd64.pyd
${If} ${AtLeastWin8}
!insertmacro PyBindingSection 3.9 .cp39-win_amd64.pyd !insertmacro PyBindingSection 3.9 .cp39-win_amd64.pyd
!insertmacro PyBindingSection 3.10 .cp310-win_amd64.pyd !insertmacro PyBindingSection 3.10 .cp310-win_amd64.pyd
${EndIf}
!endif !endif
; These versions of Python require Windows 8.1 or higher.
${Unless} ${AtLeastWin8}
!ifdef SecPyBindings3.9
SectionSetFlags ${SecPyBindings3.9} ${SF_RO}
SectionSetInstTypes ${SecPyBindings3.9} 0
!endif
!ifdef SecPyBindings3.10
SectionSetFlags ${SecPyBindings3.10} ${SF_RO}
SectionSetInstTypes ${SecPyBindings3.10} 0
!endif
${EndUnless}
SectionGroupEnd SectionGroupEnd
!ifdef INCLUDE_PYVER !ifdef INCLUDE_PYVER
@ -553,16 +537,32 @@ Function .onInit
!insertmacro MaybeEnablePyBindingSection 3.6-32 !insertmacro MaybeEnablePyBindingSection 3.6-32
!insertmacro MaybeEnablePyBindingSection 3.7-32 !insertmacro MaybeEnablePyBindingSection 3.7-32
!insertmacro MaybeEnablePyBindingSection 3.8-32 !insertmacro MaybeEnablePyBindingSection 3.8-32
${If} ${AtLeastWin8}
!insertmacro MaybeEnablePyBindingSection 3.9-32 !insertmacro MaybeEnablePyBindingSection 3.9-32
!insertmacro MaybeEnablePyBindingSection 3.10-32 !insertmacro MaybeEnablePyBindingSection 3.10-32
${EndIf}
!else !else
!insertmacro MaybeEnablePyBindingSection 3.5 !insertmacro MaybeEnablePyBindingSection 3.5
!insertmacro MaybeEnablePyBindingSection 3.6 !insertmacro MaybeEnablePyBindingSection 3.6
!insertmacro MaybeEnablePyBindingSection 3.7 !insertmacro MaybeEnablePyBindingSection 3.7
!insertmacro MaybeEnablePyBindingSection 3.8 !insertmacro MaybeEnablePyBindingSection 3.8
${If} ${AtLeastWin8}
!insertmacro MaybeEnablePyBindingSection 3.9 !insertmacro MaybeEnablePyBindingSection 3.9
!insertmacro MaybeEnablePyBindingSection 3.10 !insertmacro MaybeEnablePyBindingSection 3.10
${EndIf}
!endif !endif
; These versions of Python require Windows 8.1 or higher.
${Unless} ${AtLeastWin8}
!ifdef SecPyBindings3.9
SectionSetFlags ${SecPyBindings3.9} ${SF_RO}
SectionSetInstTypes ${SecPyBindings3.9} 0
!endif
!ifdef SecPyBindings3.10
SectionSetFlags ${SecPyBindings3.10} ${SF_RO}
SectionSetInstTypes ${SecPyBindings3.10} 0
!endif
${EndUnless}
FunctionEnd FunctionEnd
Function .onSelChange Function .onSelChange