Reverted win installer to give 'current user' option only for Application Data.
authorSimon Clitherow <aphex@nildram.co.uk>
Thu, 29 May 2008 21:12:11 +0000 (21:12 +0000)
committerSimon Clitherow <aphex@nildram.co.uk>
Thu, 29 May 2008 21:12:11 +0000 (21:12 +0000)
Added shfolder.lib linking for win9x SHGetFolderPath() support.

config/win32-vc-config.py
release/windows/installer/00.sconsblender.nsi

index 32b6597b5d55eda149f52615642cd376808585cf..02e5dbb7f8fa5438630388b93bdeac3c55ef9c81 100644 (file)
@@ -157,7 +157,7 @@ REL_CCFLAGS = ['-O2', '-DNDEBUG']
 C_WARN = []
 CC_WARN = []
 
-LLIBS = 'ws2_32 vfw32 winmm kernel32 user32 gdi32 comdlg32 advapi32 shell32 ole32 oleaut32 uuid'
+LLIBS = 'ws2_32 vfw32 winmm kernel32 user32 gdi32 comdlg32 advapi32 shfolder shell32 ole32 oleaut32 uuid'
 
 PLATFORM_LINKFLAGS = '''
                         /SUBSYSTEM:CONSOLE 
index c4e504a5bff3c32ba0b831067c3f60d8a8399c2d..338075c1b18e64bd6fa7e1b333d07b11edc99b69 100644 (file)
@@ -32,7 +32,7 @@ Name "Blender VERSION"
     
 !insertmacro MUI_PAGE_DIRECTORY
 Page custom DataLocation DataLocationOnLeave
-Page custom AppDataChoice AppDataChoiceOnLeave
+;Page custom AppDataChoice AppDataChoiceOnLeave
 Page custom PreMigrateUserSettings MigrateUserSettings
 !insertmacro MUI_PAGE_INSTFILES
 !insertmacro MUI_PAGE_FINISH
@@ -271,7 +271,9 @@ Function DataLocationOnLeave
        StrCpy $SETUSERCONTEXT "false"
        ${NSD_GetState} $HWND_APPDATA $R0
        ${If} $R0 == "1"
-         StrCpy $SETUSERCONTEXT "true"
+         ; FIXME: disabled 'all users' until fully multi-user compatible
+         ;StrCpy $SETUSERCONTEXT "true"
+         Call SetWinXPPathCurrentUser
        ${Else}
          ${NSD_GetState} $HWND_INSTDIR $R0
          ${If} $R0 == "1"