Changeset 1341

Timestamp:

11/10/07 14:11:49 (1 year ago)

Author:

glslang

Message:

+ installer updates

Files:

• trunk/installer/openlibraries_runtime.nsi (modified) (6 diffs)

trunk/installer/openlibraries_runtime.nsi

@@ -109 +109 @@
 FunctionEnd
 
-Section "Windows CRT DLLs" ms_crt_dlls
-
-  SectionIn 1
-  SetOutPath $INSTDIR
-
-  SetOverwrite on
-  SetShellVarContext all
-
-  SetDetailsPrint textonly
-  DetailPrint "Installing Windows VC redistributables..."
-  SetDetailsPrint listonly
-
-  SetOutPath $INSTDIR
-  File "C:\Program Files\Microsoft Visual Studio 8\SDK\v2.0\BootStrapper\Packages\vcredist_x86\vcredist_x86.exe"
-  File "C:\Program Files\Microsoft Visual Studio 8\SDK\v2.0\BootStrapper\Packages\vcredist_x86\product.xml"
-  ExecWait '"$INSTDIR\vcredist_x86.exe" /q:a /c:"msiexec /i vcredist.msi /qn"' 
-
-  SetDetailsPrint both
-
-SectionEnd
-
 ;Section "MSXML4 SP2" msxml2
 
@@ -154 +133 @@
 
 ;SectionEnd
-
-Section "OpenAL" openal
-
-  SectionIn 1
-  SetOutPath $INSTDIR
-
-  SetOverwrite on
-  SetShellVarContext all
-
-  SetDetailsPrint textonly
-  DetailPrint "Installing OpenAL..."
-  SetDetailsPrint listonly
-
-  SetOutPath $INSTDIR
-  File "C:\Program Files\OpenAL 1.1 SDK\redist\oalinst.exe"
-  ExecWait '"$INSTDIR\oalinst.exe" /S /D'
-
-  SetDetailsPrint both
-
-SectionEnd
  
 Section "OpenLibraries" SecCore
@@ -207 +166 @@
   File "C:\Program Files\NVIDIA Corporation\Cg\bin\cg.dll"
   File "C:\Program Files\NVIDIA Corporation\Cg\bin\cgGL.dll"
-  File "C:\Windows\system32\msvcp71.dll"
-  File "C:\Windows\system32\msvcr71.dll"
   File "C:\Windows\system32\glew32.dll"
-  File "C:\Windows\system32\glut32.dll"
   File "c:\Windows\system32\python25.dll"
-  File "C:\Qt\3.3.8\bin\qt-mt338.dll"
   File "c:\boost\lib\boost_python-vc80-mt-1_34_1.dll"
   File "C:\zlib\lib\zlib1.dll"
@@ -224 +179 @@
   
   SetOutPath $INSTDIR\plugins\release
-  File "..\src\openimagelib\plugins\3D_lightmap\3D_lightmap_plugin.opl"
-  File "..\src\openimagelib\plugins\3D_lightmap\Multi-threaded Release DLL\openimagelib_3D_lightmap-vc80-r-${VERSION}.dll"
   File "..\src\openimagelib\plugins\dds\dds_plugin.opl"
   File "..\src\openimagelib\plugins\dds\Multi-threaded Release DLL\openimagelib_dds-vc80-r-${VERSION}.dll"
@@ -242 +195 @@
   File "..\src\openmedialib\plugins\avformat\avformat_plugin.opl"
   File "..\src\openmedialib\plugins\avformat\Multi-threaded Release DLL\openmedialib_avformat-vc80-r-${VERSION}.dll"
-   File "..\src\openmedialib\plugins\oil\oil_plugin.opl"
+  File "..\src\openmedialib\plugins\oil\oil_plugin.opl"
   File "..\src\openmedialib\plugins\oil\Multi-threaded Release DLL\openmedialib_oil-vc80-r-${VERSION}.dll"
   File "..\src\openmedialib\plugins\openal\openal_plugin.opl"
   File "..\src\openmedialib\plugins\openal\Multi-threaded Release DLL\openmedialib_openal-vc80-r-${VERSION}.dll"
-  File "..\src\openmedialib\plugins\gensys\gensys_plugin.opl"
-  File "..\src\openmedialib\plugins\gensys\Multi-threaded Release DLL\openmedialib_gensys-vc80-r-${VERSION}.dll"
+;  File "..\src\openmedialib\plugins\gensys\gensys_plugin.opl"
+;  File "..\src\openmedialib\plugins\gensys\Multi-threaded Release DLL\openmedialib_gensys-vc80-r-${VERSION}.dll"
   File "..\src\openmedialib\plugins\quicktime\quicktime_plugin.opl"
   File "..\src\openmedialib\plugins\quicktime\Multi-threaded Release DLL\openmedialib_quicktime-vc80-r-${VERSION}.dll"
 ; File "..\src\openmedialib\plugins\sdl\sdl_plugin.opl"
 ; File "..\src\openmedialib\plugins\sdl\Multi-threaded Release DLL\openmedialib_sdl-vc80-r-${VERSION}.dll"
-  File "..\src\openobjectlib\plugins\obj\obj_plugin.opl"
-  File "..\src\openobjectlib\plugins\obj\Multi-threaded Release DLL\openobjectlib_obj-vc80-r-${VERSION}.dll"
-  File "..\src\openobjectlib\plugins\X3D\x3d_plugin.opl"
-  File "..\src\openobjectlib\plugins\X3D\Multi-threaded Release DLL\openobjectlib_x3d-vc80-r-${VERSION}.dll"
+;  File "..\src\openobjectlib\plugins\obj\obj_plugin.opl"
+;  File "..\src\openobjectlib\plugins\obj\Multi-threaded Release DLL\openobjectlib_obj-vc80-r-${VERSION}.dll"
+;  File "..\src\openobjectlib\plugins\X3D\x3d_plugin.opl"
+;  File "..\src\openobjectlib\plugins\X3D\Multi-threaded Release DLL\openobjectlib_x3d-vc80-r-${VERSION}.dll"
 ;  File "..\src\openobjectlib\plugins\Collada\collada_plugin.opl"
 ;  File "..\src\openobjectlib\plugins\Collada\Multi-threaded Release DLL\openobjectlib_collada-vc80-r-${VERSION}.dll"
-  File "..\src\openeffectslib\plugins\tonemap\tonemap_plugin.opl"
-  File "..\src\openeffectslib\plugins\tonemap\Multi-threaded Release DLL\openeffectslib_tonemap-vc80-r-${VERSION}.dll"
+;  File "..\src\openeffectslib\plugins\tonemap\tonemap_plugin.opl"
+;  File "..\src\openeffectslib\plugins\tonemap\Multi-threaded Release DLL\openeffectslib_tonemap-vc80-r-${VERSION}.dll"
   File "..\src\openassetlib\plugins\sqlite\sqlite3_metadata_plugin.opl"
   File "..\src\openassetlib\plugins\sqlite\Multi-threaded Release DLL\openassetlib_sqlite-vc80-r-${VERSION}.dll"
     
   SetOutPath $INSTDIR\shaders
-  File "..\effects\shaders\sepia.cg"
-  File "..\effects\shaders\sepia.frag"
-  File "..\effects\shaders\fixed_function.vert"
+ ; File "..\effects\shaders\sepia.cg"
+ ; File "..\effects\shaders\sepia.frag"
+ ; File "..\effects\shaders\fixed_function.vert"
   File "..\effects\shaders\passthrough.vert"
   File "..\effects\shaders\passthrough.cg"
@@ -335 +288 @@
   RMDir /r $INSTDIR\lib
   RMDir /r $INSTDIR\plugins
-  RMDir /r $INSTDIR\kernels
   RMDir /r $INSTDIR\shaders
   RMDir /r $INSTDIR