Changeset 1341

Show
Ignore:
Timestamp:
11/10/07 14:11:49 (1 year ago)
Author:
glslang
Message:

+ installer updates

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • trunk/installer/openlibraries_runtime.nsi

    r1319 r1341  
    109109FunctionEnd 
    110110 
    111 Section "Windows CRT DLLs" ms_crt_dlls 
    112  
    113   SectionIn 1 
    114   SetOutPath $INSTDIR 
    115  
    116   SetOverwrite on 
    117   SetShellVarContext all 
    118  
    119   SetDetailsPrint textonly 
    120   DetailPrint "Installing Windows VC redistributables..." 
    121   SetDetailsPrint listonly 
    122  
    123   SetOutPath $INSTDIR 
    124   File "C:\Program Files\Microsoft Visual Studio 8\SDK\v2.0\BootStrapper\Packages\vcredist_x86\vcredist_x86.exe" 
    125   File "C:\Program Files\Microsoft Visual Studio 8\SDK\v2.0\BootStrapper\Packages\vcredist_x86\product.xml" 
    126   ExecWait '"$INSTDIR\vcredist_x86.exe" /q:a /c:"msiexec /i vcredist.msi /qn"'  
    127  
    128   SetDetailsPrint both 
    129  
    130 SectionEnd 
    131  
    132111;Section "MSXML4 SP2" msxml2 
    133112 
     
    154133 
    155134;SectionEnd 
    156  
    157 Section "OpenAL" openal 
    158  
    159   SectionIn 1 
    160   SetOutPath $INSTDIR 
    161  
    162   SetOverwrite on 
    163   SetShellVarContext all 
    164  
    165   SetDetailsPrint textonly 
    166   DetailPrint "Installing OpenAL..." 
    167   SetDetailsPrint listonly 
    168  
    169   SetOutPath $INSTDIR 
    170   File "C:\Program Files\OpenAL 1.1 SDK\redist\oalinst.exe" 
    171   ExecWait '"$INSTDIR\oalinst.exe" /S /D' 
    172  
    173   SetDetailsPrint both 
    174  
    175 SectionEnd 
    176135  
    177136Section "OpenLibraries" SecCore 
     
    207166  File "C:\Program Files\NVIDIA Corporation\Cg\bin\cg.dll" 
    208167  File "C:\Program Files\NVIDIA Corporation\Cg\bin\cgGL.dll" 
    209   File "C:\Windows\system32\msvcp71.dll" 
    210   File "C:\Windows\system32\msvcr71.dll" 
    211168  File "C:\Windows\system32\glew32.dll" 
    212   File "C:\Windows\system32\glut32.dll" 
    213169  File "c:\Windows\system32\python25.dll" 
    214   File "C:\Qt\3.3.8\bin\qt-mt338.dll" 
    215170  File "c:\boost\lib\boost_python-vc80-mt-1_34_1.dll" 
    216171  File "C:\zlib\lib\zlib1.dll" 
     
    224179   
    225180  SetOutPath $INSTDIR\plugins\release 
    226   File "..\src\openimagelib\plugins\3D_lightmap\3D_lightmap_plugin.opl" 
    227   File "..\src\openimagelib\plugins\3D_lightmap\Multi-threaded Release DLL\openimagelib_3D_lightmap-vc80-r-${VERSION}.dll" 
    228181  File "..\src\openimagelib\plugins\dds\dds_plugin.opl" 
    229182  File "..\src\openimagelib\plugins\dds\Multi-threaded Release DLL\openimagelib_dds-vc80-r-${VERSION}.dll" 
     
    242195  File "..\src\openmedialib\plugins\avformat\avformat_plugin.opl" 
    243196  File "..\src\openmedialib\plugins\avformat\Multi-threaded Release DLL\openmedialib_avformat-vc80-r-${VERSION}.dll" 
    244    File "..\src\openmedialib\plugins\oil\oil_plugin.opl" 
     197  File "..\src\openmedialib\plugins\oil\oil_plugin.opl" 
    245198  File "..\src\openmedialib\plugins\oil\Multi-threaded Release DLL\openmedialib_oil-vc80-r-${VERSION}.dll" 
    246199  File "..\src\openmedialib\plugins\openal\openal_plugin.opl" 
    247200  File "..\src\openmedialib\plugins\openal\Multi-threaded Release DLL\openmedialib_openal-vc80-r-${VERSION}.dll" 
    248   File "..\src\openmedialib\plugins\gensys\gensys_plugin.opl" 
    249   File "..\src\openmedialib\plugins\gensys\Multi-threaded Release DLL\openmedialib_gensys-vc80-r-${VERSION}.dll" 
     201;  File "..\src\openmedialib\plugins\gensys\gensys_plugin.opl" 
     202;  File "..\src\openmedialib\plugins\gensys\Multi-threaded Release DLL\openmedialib_gensys-vc80-r-${VERSION}.dll" 
    250203  File "..\src\openmedialib\plugins\quicktime\quicktime_plugin.opl" 
    251204  File "..\src\openmedialib\plugins\quicktime\Multi-threaded Release DLL\openmedialib_quicktime-vc80-r-${VERSION}.dll" 
    252205; File "..\src\openmedialib\plugins\sdl\sdl_plugin.opl" 
    253206; File "..\src\openmedialib\plugins\sdl\Multi-threaded Release DLL\openmedialib_sdl-vc80-r-${VERSION}.dll" 
    254   File "..\src\openobjectlib\plugins\obj\obj_plugin.opl" 
    255   File "..\src\openobjectlib\plugins\obj\Multi-threaded Release DLL\openobjectlib_obj-vc80-r-${VERSION}.dll" 
    256   File "..\src\openobjectlib\plugins\X3D\x3d_plugin.opl" 
    257   File "..\src\openobjectlib\plugins\X3D\Multi-threaded Release DLL\openobjectlib_x3d-vc80-r-${VERSION}.dll" 
     207;  File "..\src\openobjectlib\plugins\obj\obj_plugin.opl" 
     208;  File "..\src\openobjectlib\plugins\obj\Multi-threaded Release DLL\openobjectlib_obj-vc80-r-${VERSION}.dll" 
     209;  File "..\src\openobjectlib\plugins\X3D\x3d_plugin.opl" 
     210;  File "..\src\openobjectlib\plugins\X3D\Multi-threaded Release DLL\openobjectlib_x3d-vc80-r-${VERSION}.dll" 
    258211;  File "..\src\openobjectlib\plugins\Collada\collada_plugin.opl" 
    259212;  File "..\src\openobjectlib\plugins\Collada\Multi-threaded Release DLL\openobjectlib_collada-vc80-r-${VERSION}.dll" 
    260   File "..\src\openeffectslib\plugins\tonemap\tonemap_plugin.opl" 
    261   File "..\src\openeffectslib\plugins\tonemap\Multi-threaded Release DLL\openeffectslib_tonemap-vc80-r-${VERSION}.dll" 
     213;  File "..\src\openeffectslib\plugins\tonemap\tonemap_plugin.opl" 
     214;  File "..\src\openeffectslib\plugins\tonemap\Multi-threaded Release DLL\openeffectslib_tonemap-vc80-r-${VERSION}.dll" 
    262215  File "..\src\openassetlib\plugins\sqlite\sqlite3_metadata_plugin.opl" 
    263216  File "..\src\openassetlib\plugins\sqlite\Multi-threaded Release DLL\openassetlib_sqlite-vc80-r-${VERSION}.dll" 
    264217     
    265218  SetOutPath $INSTDIR\shaders 
    266   File "..\effects\shaders\sepia.cg" 
    267   File "..\effects\shaders\sepia.frag" 
    268   File "..\effects\shaders\fixed_function.vert" 
     219 ; File "..\effects\shaders\sepia.cg" 
     220 ; File "..\effects\shaders\sepia.frag" 
     221 ; File "..\effects\shaders\fixed_function.vert" 
    269222  File "..\effects\shaders\passthrough.vert" 
    270223  File "..\effects\shaders\passthrough.cg" 
     
    335288  RMDir /r $INSTDIR\lib 
    336289  RMDir /r $INSTDIR\plugins 
    337   RMDir /r $INSTDIR\kernels 
    338290  RMDir /r $INSTDIR\shaders 
    339291  RMDir /r $INSTDIR