Revision: 15051
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15051
Author: aphex
Date: 2008-05-29 23:12:11 +0200 (Thu, 29 May 2008)
Log Message:
-----------
Reverted win installer to give 'current user' option only for Application Data.
Added shfolder.lib linking for win9x SHGetFolderPath() support.
Modified Paths:
--------------
trunk/blender/config/win32-vc-config.py
trunk/blender/release/windows/installer/00.sconsblender.nsi
Modified: trunk/blender/config/win32-vc-config.py
===================================================================
--- trunk/blender/config/win32-vc-config.py 2008-05-29 19:10:09 UTC (rev
15050)
+++ trunk/blender/config/win32-vc-config.py 2008-05-29 21:12:11 UTC (rev
15051)
@@ -157,7 +157,7 @@
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
Modified: trunk/blender/release/windows/installer/00.sconsblender.nsi
===================================================================
--- trunk/blender/release/windows/installer/00.sconsblender.nsi 2008-05-29
19:10:09 UTC (rev 15050)
+++ trunk/blender/release/windows/installer/00.sconsblender.nsi 2008-05-29
21:12:11 UTC (rev 15051)
@@ -32,7 +32,7 @@
!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 @@
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"
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
