Changeset 902

Timestamp:

09/24/07 05:14:07 (1 year ago)

Author:

nonhebel

Message:

Added missing dependencies
+ packaging private copy of olibs

Location:

trunk/installer

Files:

• jahplayer.nsi (modified) (10 diffs)
• jahplayer_bundle.nsi (modified) (8 diffs)

trunk/installer/jahplayer.nsi

@@ -1 +1 @@
 ;--------------------------------
-;NSIS Jahplayer Installation Script
+;NSIS jahPlayer bundle Installation Script
 ;--------------------------------
 
 !ifndef VERSION
-  !define VERSION 0.2.2
+  !define VERSION 20070828
 !endif
 
-!ifndef OLIB_VERSION
-  !define OLIB_VERSION 0.4.1
+!ifndef OLIBS_PATH
+  !define OLIBS_PATH "$%OLIBS_DEVEL_ROOT%"
 !endif
 
@@ -17 +17 @@
   OutFile "${OUTFILE}"
 !else
-  OutFile jahplayer-${VERSION}-installer.exe
+  OutFile jahplayer-${VERSION}.exe
 !endif
 
@@ -52 +52 @@
 ;Pages
 !define MUI_WELCOMEPAGE_TITLE "Welcome to the jahPlayer (v.${VERSION}) Setup Wizard"
-!define MUI_WELCOMEPAGE_TEXT "This wizard will guide you through the installation of the jahPlayer.\r\n\r\n$_CLICK"
+!define MUI_WELCOMEPAGE_TEXT "This wizard will guide you through the installation of jahPlayer.\r\n\r\n$_CLICK"
 
 !insertmacro MUI_PAGE_WELCOME
@@ -101 +101 @@
 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"'
+
+  SetDetailsPrint both
+
+SectionEnd
+
+Section "MSXML4 SP2" msxml2
+
+  SectionIn 1
+  SetOutPath $INSTDIR
+
+  SetOverwrite on
+  SetShellVarContext all
+
+  SetDetailsPrint textonly
+  DetailPrint "Installing MSXML4 SP2..."
+  SetDetailsPrint listonly
+
+  SetOutPath $INSTDIR
+  File "${OLIBS_PATH}\installer\msxml4.msi"
+
+  ExecWait 'MsiExec.exe /qn /x{2AEBE10C-D819-4EBF-BC60-03BF2327D340}'   ; uninstall MSXML4 if it's there
+  ExecWait 'MsiExec.exe /qn /x{35343FF7-939B-401A-87B3-FF90A5123D88}'   ; uninstall MSXML4 SP1 if it's there
+  ExecWait 'MsiExec.exe /qn /i "$INSTDIR\msxml4.msi"'
+  
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenLibraries" "msxml2" ""
+
+  SetDetailsPrint both
+
+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" olibs
+
+  SetDetailsPrint textonly
+  DetailPrint "Installing OpenLibraries..."
+  SetDetailsPrint listonly
+
+  SectionIn 1 RO
+  SetOutPath $INSTDIR
+
+  SetOverwrite on
+
+  SetOutPath $INSTDIR\openlibraries\bin
+  File "${OLIBS_PATH}\src\openpluginlib\pl\Multi-threaded Release DLL\openpluginlib_pl-vc80-r-0_4_1.dll"
+  File "${OLIBS_PATH}\src\openimagelib\il\Multi-threaded Release DLL\openimagelib_il-vc80-r-0_4_1.dll"
+  File "${OLIBS_PATH}\src\openmedialib\ml\Multi-threaded Release DLL\openmedialib_ml-vc80-r-0_4_1.dll"
+  File "${OLIBS_PATH}\src\openobjectlib\sg\Multi-threaded Release DLL\openobjectlib_sg-vc80-r-0_4_1.dll"
+  File "${OLIBS_PATH}\src\openassetlib\al\Multi-threaded Release DLL\openassetlib_al-vc80-r-0_4_1.dll"
+
+  ; dependencies
+  File "C:\Program Files\FFmpeg\lib\avcodec-51.dll"
+  File "C:\Program Files\FFmpeg\lib\avformat-51.dll"
+  File "C:\Program Files\FFmpeg\lib\avutil-49.dll"
+  File "C:\openexr-1.4.0-vs2005\bin\Half_dll.dll"
+  File "C:\openexr-1.4.0-vs2005\bin\IlmImf_dll.dll"
+  File "C:\openexr-1.4.0-vs2005\bin\Iex_dll.dll"
+  File "C:\openexr-1.4.0-vs2005\bin\Imath_dll.dll"
+  File "C:\openexr-1.4.0-vs2005\bin\zlib1.dll"
+  File "C:\openexr-1.4.0-vs2005\bin\IlmThread_dll.dll"
+  File "C:\SDL-1.2.11\lib\SDL.dll"
+  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\python24.dll"
+  File "C:\Qt\3.3.6\bin\qt-mt336.dll"
+  File "c:\boost\lib\boost_python-vc80-mt-1_33_1.dll"
+
+  ; Python
+  SetOutPath $INSTDIR\openlibraries\python
+  File "${OLIBS_PATH}\src\openpluginlib\py\Multi-threaded Release DLL\openpluginlib.pyd"
+  File "${OLIBS_PATH}\src\openimagelib\py\Multi-threaded Release DLL\openimagelib.pyd"
+  File "${OLIBS_PATH}\src\openmedialib\py\Multi-threaded Release DLL\openmedialib.pyd"
+  File "${OLIBS_PATH}\src\openassetlib\py\Multi-threaded Release DLL\openassetlib.pyd"
+  
+  SetOutPath $INSTDIR\openlibraries\plugins\release
+  File "${OLIBS_PATH}\src\openimagelib\plugins\3D_lightmap\3D_lightmap_plugin.opl"
+  File "${OLIBS_PATH}\src\openimagelib\plugins\3D_lightmap\Multi-threaded Release DLL\openimagelib_3D_lightmap-vc80-r-0_4_1.dll"
+  File "${OLIBS_PATH}\src\openimagelib\plugins\dds\dds_plugin.opl"
+  File "${OLIBS_PATH}\src\openimagelib\plugins\dds\Multi-threaded Release DLL\openimagelib_dds-vc80-r-0_4_1.dll"
+  File "${OLIBS_PATH}\src\openimagelib\plugins\dpx\dpx_plugin.opl"
+  File "${OLIBS_PATH}\src\openimagelib\plugins\dpx\Multi-threaded Release DLL\openimagelib_dpx-vc80-r-0_4_1.dll"
+  File "${OLIBS_PATH}\src\openimagelib\plugins\exr\exr_plugin.opl"
+  File "${OLIBS_PATH}\src\openimagelib\plugins\exr\Multi-threaded Release DLL\openimagelib_exr-vc80-r-0_4_1.dll"
+  File "${OLIBS_PATH}\src\openimagelib\plugins\gdi+\gdi_plugin.opl"
+  File "${OLIBS_PATH}\src\openimagelib\plugins\gdi+\Multi-threaded Release DLL\openimagelib_gdi-vc80-r-0_4_1.dll"
+  File "${OLIBS_PATH}\src\openimagelib\plugins\hdr\hdr_plugin.opl"
+  File "${OLIBS_PATH}\src\openimagelib\plugins\hdr\Multi-threaded Release DLL\openimagelib_hdr-vc80-r-0_4_1.dll"
+  File "${OLIBS_PATH}\src\openimagelib\plugins\sgi\sgi_plugin.opl"
+  File "${OLIBS_PATH}\src\openimagelib\plugins\sgi\Multi-threaded Release DLL\openimagelib_sgi-vc80-r-0_4_1.dll"
+  File "${OLIBS_PATH}\src\openimagelib\plugins\tga\tga_plugin.opl"
+  File "${OLIBS_PATH}\src\openimagelib\plugins\tga\Multi-threaded Release DLL\openimagelib_tga-vc80-r-0_4_1.dll"
+  File "${OLIBS_PATH}\src\openimagelib\plugins\qim\qim_plugin.opl"
+  File "${OLIBS_PATH}\src\openimagelib\plugins\qim\Multi-threaded Release DLL\openimagelib_qim-vc80-r-0_4_1.dll"
+  File "${OLIBS_PATH}\src\openmedialib\plugins\avformat\avformat_plugin.opl"
+  File "${OLIBS_PATH}\src\openmedialib\plugins\avformat\Multi-threaded Release DLL\openmedialib_avformat-vc80-r-0_4_1.dll"
+  File "${OLIBS_PATH}\src\openmedialib\plugins\glew\glew_plugin.opl"
+  File "${OLIBS_PATH}\src\openmedialib\plugins\glew\Multi-threaded Release DLL\openmedialib_glew-vc80-r-0_4_1.dll"
+  File "${OLIBS_PATH}\src\openmedialib\plugins\oil\oil_plugin.opl"
+  File "${OLIBS_PATH}\src\openmedialib\plugins\oil\Multi-threaded Release DLL\openmedialib_oil-vc80-r-0_4_1.dll"
+  File "${OLIBS_PATH}\src\openmedialib\plugins\openal\openal_plugin.opl"
+  File "${OLIBS_PATH}\src\openmedialib\plugins\openal\Multi-threaded Release DLL\openmedialib_openal-vc80-r-0_4_1.dll"
+  File "${OLIBS_PATH}\src\openmedialib\plugins\template\template_plugin.opl"
+  File "${OLIBS_PATH}\src\openmedialib\plugins\template\Multi-threaded Release DLL\openmedialib_template-vc80-r-0_4_1.dll"
+  File "${OLIBS_PATH}\src\openmedialib\plugins\gensys\gensys_plugin.opl"
+  File "${OLIBS_PATH}\src\openmedialib\plugins\gensys\Multi-threaded Release DLL\openmedialib_gensys-vc80-r-0_4_1.dll"
+  File "${OLIBS_PATH}\src\openmedialib\plugins\quicktime\quicktime_plugin.opl"
+  File "${OLIBS_PATH}\src\openmedialib\plugins\quicktime\Multi-threaded Release DLL\openmedialib_quicktime-vc80-r-0_4_1.dll"
+  File "${OLIBS_PATH}\src\openmedialib\plugins\sdl\sdl_plugin.opl"
+  File "${OLIBS_PATH}\src\openmedialib\plugins\sdl\Multi-threaded Release DLL\openmedialib_sdl-vc80-r-0_4_1.dll"
+  File "${OLIBS_PATH}\src\openobjectlib\plugins\3ds\3ds_plugin.opl"
+  File "${OLIBS_PATH}\src\openobjectlib\plugins\3ds\Multi-threaded Release DLL\openobjectlib_3ds-vc80-r-0_4_1.dll"
+  File "${OLIBS_PATH}\src\openobjectlib\plugins\obj\obj_plugin.opl"
+  File "${OLIBS_PATH}\src\openobjectlib\plugins\obj\Multi-threaded Release DLL\openobjectlib_obj-vc80-r-0_4_1.dll"
+  File "${OLIBS_PATH}\src\openobjectlib\plugins\tsto\tsto_plugin.opl"
+  File "${OLIBS_PATH}\src\openobjectlib\plugins\tsto\Multi-threaded Release DLL\openobjectlib_tsto-vc80-r-0_4_1.dll"
+  File "${OLIBS_PATH}\src\openobjectlib\plugins\X3D\x3d_plugin.opl"
+  File "${OLIBS_PATH}\src\openobjectlib\plugins\X3D\Multi-threaded Release DLL\openobjectlib_x3d-vc80-r-0_4_1.dll"
+  File "${OLIBS_PATH}\src\openobjectlib\plugins\Collada\collada_plugin.opl"
+  File "${OLIBS_PATH}\src\openobjectlib\plugins\Collada\Multi-threaded Release DLL\openobjectlib_collada-vc80-r-0_4_1.dll"
+  File "${OLIBS_PATH}\src\openeffectslib\plugins\tonemap\tonemap_plugin.opl"
+  File "${OLIBS_PATH}\src\openeffectslib\plugins\tonemap\Multi-threaded Release DLL\openeffectslib_tonemap-vc80-r-0_4_1.dll"
+  File "${OLIBS_PATH}\src\openassetlib\plugins\filesystem_storage_plugin\filesystem_storage_plugin.opl"
+  File "${OLIBS_PATH}\src\openassetlib\plugins\filesystem_storage_plugin\Multi-threaded Release DLL\openassetlib_filesystem-vc80-r-0_4_1.dll"
+  File "${OLIBS_PATH}\src\openassetlib\plugins\sqlite3_metadata_plugin\sqlite3_metadata_plugin.opl"
+  File "${OLIBS_PATH}\src\openassetlib\plugins\sqlite3_metadata_plugin\Multi-threaded Release DLL\openassetlib_sqlite3-vc80-r-0_4_1.dll"
+  
+  SetOutPath $INSTDIR\openlibraries\kernels
+  File "${OLIBS_PATH}\effects\kernels\sepia.gpu_kernel"
+  
+  SetOutPath $INSTDIR\openlibraries\shaders
+  File "${OLIBS_PATH}\effects\shaders\sepia.cg"
+  File "${OLIBS_PATH}\effects\shaders\sepia.frag"
+  File "${OLIBS_PATH}\effects\shaders\fixed_function.vert"
+  File "${OLIBS_PATH}\effects\shaders\passthrough.vert"
+  File "${OLIBS_PATH}\effects\shaders\passthrough.cg"
+  File "${OLIBS_PATH}\effects\shaders\rgb_to_yuv444.frag"
+  File "${OLIBS_PATH}\effects\shaders\yuv444_to_rgb.frag"
+  File "${OLIBS_PATH}\effects\shaders\yuv444_to_rgb.cg"
+  File "${OLIBS_PATH}\effects\shaders\yuv444_to_rgb_deinterlace.cg"
+  File "${OLIBS_PATH}\effects\shaders\yuv444_to_rgb_deinterlace.frag"
+  File "${OLIBS_PATH}\effects\shaders\histogram.cg"
+  File "${OLIBS_PATH}\effects\shaders\histogram.frag"
+  File "${OLIBS_PATH}\effects\shaders\channel_selector.cg"
+  File "${OLIBS_PATH}\effects\shaders\channel_selector.frag"
+ 
+  SetDetailsPrint both
+
+SectionEnd
+
 Section "jahPlayer" SecCore
 
@@ -110 +297 @@
   
   SetDetailsPrint textonly
-  DetailPrint "Installing jahPlayer..."
+  DetailPrint "Installing jahPlayer & jPlayer..."
   SetDetailsPrint listonly
 
   SetOutPath $INSTDIR\jahPlayer
   File /r "..\jahPlayer\dist\*"
-  
+  File "run_jahplayer.cmd"
+
   SetOutPath $INSTDIR\jahTools
   SetOutPath $INSTDIR\jahTools\encoder
@@ -123 +311 @@
 
   SetOutPath $INSTDIR\jahPlayer
-  CreateDirectory "$SMPROGRAMS\jahshaka"
-  CreateShortCut "$SMPROGRAMS\jahshaka\jahPlayer.lnk" "$INSTDIR\jahPlayer\jahPlayer.exe"
-  CreateShortCut "$DESKTOP\jahPlayer.lnk" "$INSTDIR\jahPlayer\jahplayer.exe"
+  CreateShortCut "$SMPROGRAMS\jahPlayer.lnk" "$INSTDIR\jahPlayer\run_jahPlayer.cmd" '' "$INSTDIR\jahPlayer\jahPlayer.exe" 0 SW_SHOWMINIMIZED
+  CreateShortCut "$DESKTOP\jahPlayer.lnk" "$INSTDIR\jahPlayer\run_jahPlayer.cmd" '' "$INSTDIR\jahPlayer\jahPlayer.exe" 0 SW_SHOWMINIMIZED
 
   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\jahPlayer" "DisplayName" "jahPlayer"
-  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\jahPlayer" "UninstallString" "$INSTDIR\uninst-jahplayer.exe"
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\jahPlayer" "UninstallString" "$INSTDIR\uninst-jahPlayer.exe"
 
   Push "JAHTOOLSPATH"
@@ -136 +323 @@
 SectionEnd
 
-Section "OpenLibraries" olib
-
-  SectionIn 1
-  SetOutPath $INSTDIR
-
-  SetOverwrite on
-  SetShellVarContext all
-
-  SetDetailsPrint textonly
-  DetailPrint "Installing OpenLibraries..."
-  SetDetailsPrint listonly
-
-  SetOutPath $INSTDIR
-  File openlibraries-${OLIB_VERSION}-runtime.exe
-  ExecWait '"$INSTDIR\openlibraries-${OLIB_VERSION}-runtime.exe" /S /D'
-  
-  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\jahPlayer" "olibs" "true"
-
-  SetDetailsPrint both
-
-SectionEnd
-
 Section -post
 
-        WriteUninstaller $INSTDIR\uninst-jahplayer.exe
+        WriteUninstaller $INSTDIR\uninst-jahPlayer.exe
 
 SectionEnd
@@ -168 +333 @@
 
 !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
+  !insertmacro MUI_DESCRIPTION_TEXT ${ms_crt_dlls} "Windows CRT DLLs"
+  !insertmacro MUI_DESCRIPTION_TEXT ${msxml2} "MSXML2 SP2"
+  !insertmacro MUI_DESCRIPTION_TEXT ${openal} "OpenAL"
+  !insertmacro MUI_DESCRIPTION_TEXT ${olibs} "OpenLibraries runtime files"
   !insertmacro MUI_DESCRIPTION_TEXT ${SecCore} "jahPlayer runtime files"
-  !insertmacro MUI_DESCRIPTION_TEXT ${olib} "OpenLibraries runtime files"
 !insertmacro MUI_FUNCTION_DESCRIPTION_END
 
@@ -182 +350 @@
   
   SetShellVarContext all
-
+        
   ;-- Remove registry keys
+  DeleteRegKey HKLM "Software\jahPlayer"
   DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\jahPlayer"
 
@@ -190 +359 @@
   Call un.DeleteEnvStr
 
-  ;-- Remove desktop and start->Programs->Jahplayer shortcuts
+  ;-- Remove desktop and start->Programs->jahPlayer shortcuts
   Delete $DESKTOP\jahPlayer.lnk
   RMDir /r $SMPROGRAMS\jahshaka
-  Delete $SMPROGRAMS\jahPlayer.lnk
 
   ;-- Remove install directory

trunk/installer/jahplayer_bundle.nsi

@@ -4 +4 @@
 
 !ifndef VERSION
-  !define VERSION 0.2.2
+  !define VERSION 20070822
 !endif
 
-
-!ifndef OLIB_VERSION
-  !define OLIB_VERSION 0.4.1
+!ifndef OLIBS_PATH
+  !define OLIBS_PATH "$%OLIBS_DEVEL_ROOT%"
 !endif
 
@@ -102 +101 @@
 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"'
+
+  SetDetailsPrint both
+
+SectionEnd
+
+Section "MSXML4 SP2" msxml2
+
+  SectionIn 1
+  SetOutPath $INSTDIR
+
+  SetOverwrite on
+  SetShellVarContext all
+
+  SetDetailsPrint textonly
+  DetailPrint "Installing MSXML4 SP2..."
+  SetDetailsPrint listonly
+
+  SetOutPath $INSTDIR
+  File "${OLIBS_PATH}\installer\msxml4.msi"
+
+  ExecWait 'MsiExec.exe /qn /x{2AEBE10C-D819-4EBF-BC60-03BF2327D340}'   ; uninstall MSXML4 if it's there
+  ExecWait 'MsiExec.exe /qn /x{35343FF7-939B-401A-87B3-FF90A5123D88}'   ; uninstall MSXML4 SP1 if it's there
+  ExecWait 'MsiExec.exe /qn /i "$INSTDIR\msxml4.msi"'
+  
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenLibraries" "msxml2" ""
+
+  SetDetailsPrint both
+
+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" olibs
+
+  SetDetailsPrint textonly
+  DetailPrint "Installing OpenLibraries..."
+  SetDetailsPrint listonly
+
+  SectionIn 1 RO
+  SetOutPath $INSTDIR
+
+  SetOverwrite on
+
+  SetOutPath $INSTDIR\openlibraries\bin
+  File "${OLIBS_PATH}\src\openpluginlib\pl\Multi-threaded Release DLL\openpluginlib_pl-vc80-r-0_4_1.dll"
+  File "${OLIBS_PATH}\src\openimagelib\il\Multi-threaded Release DLL\openimagelib_il-vc80-r-0_4_1.dll"
+  File "${OLIBS_PATH}\src\openmedialib\ml\Multi-threaded Release DLL\openmedialib_ml-vc80-r-0_4_1.dll"
+  File "${OLIBS_PATH}\src\openobjectlib\sg\Multi-threaded Release DLL\openobjectlib_sg-vc80-r-0_4_1.dll"
+  File "${OLIBS_PATH}\src\openassetlib\al\Multi-threaded Release DLL\openassetlib_al-vc80-r-0_4_1.dll"
+
+  ; dependencies
+  File "C:\Program Files\FFmpeg\lib\avcodec-51.dll"
+  File "C:\Program Files\FFmpeg\lib\avformat-51.dll"
+  File "C:\Program Files\FFmpeg\lib\avutil-49.dll"
+  File "C:\openexr-1.4.0-vs2005\bin\Half_dll.dll"
+  File "C:\openexr-1.4.0-vs2005\bin\IlmImf_dll.dll"
+  File "C:\openexr-1.4.0-vs2005\bin\Iex_dll.dll"
+  File "C:\openexr-1.4.0-vs2005\bin\Imath_dll.dll"
+  File "C:\openexr-1.4.0-vs2005\bin\zlib1.dll"
+  File "C:\openexr-1.4.0-vs2005\bin\IlmThread_dll.dll"
+  File "C:\SDL-1.2.11\lib\SDL.dll"
+  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\python24.dll"
+  File "C:\Qt\3.3.6\bin\qt-mt336.dll"
+  File "c:\boost\lib\boost_python-vc80-mt-1_33_1.dll"
+
+  ; Python
+  SetOutPath $INSTDIR\openlibraries\python
+  File "${OLIBS_PATH}\src\openpluginlib\py\Multi-threaded Release DLL\openpluginlib.pyd"
+  File "${OLIBS_PATH}\src\openimagelib\py\Multi-threaded Release DLL\openimagelib.pyd"
+  File "${OLIBS_PATH}\src\openmedialib\py\Multi-threaded Release DLL\openmedialib.pyd"
+  File "${OLIBS_PATH}\src\openassetlib\py\Multi-threaded Release DLL\openassetlib.pyd"
+  
+  SetOutPath $INSTDIR\openlibraries\plugins\release
+  File "${OLIBS_PATH}\src\openimagelib\plugins\3D_lightmap\3D_lightmap_plugin.opl"
+  File "${OLIBS_PATH}\src\openimagelib\plugins\3D_lightmap\Multi-threaded Release DLL\openimagelib_3D_lightmap-vc80-r-0_4_1.dll"
+  File "${OLIBS_PATH}\src\openimagelib\plugins\dds\dds_plugin.opl"
+  File "${OLIBS_PATH}\src\openimagelib\plugins\dds\Multi-threaded Release DLL\openimagelib_dds-vc80-r-0_4_1.dll"
+  File "${OLIBS_PATH}\src\openimagelib\plugins\dpx\dpx_plugin.opl"
+  File "${OLIBS_PATH}\src\openimagelib\plugins\dpx\Multi-threaded Release DLL\openimagelib_dpx-vc80-r-0_4_1.dll"
+  File "${OLIBS_PATH}\src\openimagelib\plugins\exr\exr_plugin.opl"
+  File "${OLIBS_PATH}\src\openimagelib\plugins\exr\Multi-threaded Release DLL\openimagelib_exr-vc80-r-0_4_1.dll"
+  File "${OLIBS_PATH}\src\openimagelib\plugins\gdi+\gdi_plugin.opl"
+  File "${OLIBS_PATH}\src\openimagelib\plugins\gdi+\Multi-threaded Release DLL\openimagelib_gdi-vc80-r-0_4_1.dll"
+  File "${OLIBS_PATH}\src\openimagelib\plugins\hdr\hdr_plugin.opl"
+  File "${OLIBS_PATH}\src\openimagelib\plugins\hdr\Multi-threaded Release DLL\openimagelib_hdr-vc80-r-0_4_1.dll"
+  File "${OLIBS_PATH}\src\openimagelib\plugins\sgi\sgi_plugin.opl"
+  File "${OLIBS_PATH}\src\openimagelib\plugins\sgi\Multi-threaded Release DLL\openimagelib_sgi-vc80-r-0_4_1.dll"
+  File "${OLIBS_PATH}\src\openimagelib\plugins\tga\tga_plugin.opl"
+  File "${OLIBS_PATH}\src\openimagelib\plugins\tga\Multi-threaded Release DLL\openimagelib_tga-vc80-r-0_4_1.dll"
+  File "${OLIBS_PATH}\src\openimagelib\plugins\qim\qim_plugin.opl"
+  File "${OLIBS_PATH}\src\openimagelib\plugins\qim\Multi-threaded Release DLL\openimagelib_qim-vc80-r-0_4_1.dll"
+  File "${OLIBS_PATH}\src\openmedialib\plugins\avformat\avformat_plugin.opl"
+  File "${OLIBS_PATH}\src\openmedialib\plugins\avformat\Multi-threaded Release DLL\openmedialib_avformat-vc80-r-0_4_1.dll"
+  File "${OLIBS_PATH}\src\openmedialib\plugins\glew\glew_plugin.opl"
+  File "${OLIBS_PATH}\src\openmedialib\plugins\glew\Multi-threaded Release DLL\openmedialib_glew-vc80-r-0_4_1.dll"
+  File "${OLIBS_PATH}\src\openmedialib\plugins\oil\oil_plugin.opl"
+  File "${OLIBS_PATH}\src\openmedialib\plugins\oil\Multi-threaded Release DLL\openmedialib_oil-vc80-r-0_4_1.dll"
+  File "${OLIBS_PATH}\src\openmedialib\plugins\openal\openal_plugin.opl"
+  File "${OLIBS_PATH}\src\openmedialib\plugins\openal\Multi-threaded Release DLL\openmedialib_openal-vc80-r-0_4_1.dll"
+  File "${OLIBS_PATH}\src\openmedialib\plugins\template\template_plugin.opl"
+  File "${OLIBS_PATH}\src\openmedialib\plugins\template\Multi-threaded Release DLL\openmedialib_template-vc80-r-0_4_1.dll"
+  File "${OLIBS_PATH}\src\openmedialib\plugins\gensys\gensys_plugin.opl"
+  File "${OLIBS_PATH}\src\openmedialib\plugins\gensys\Multi-threaded Release DLL\openmedialib_gensys-vc80-r-0_4_1.dll"
+  File "${OLIBS_PATH}\src\openmedialib\plugins\quicktime\quicktime_plugin.opl"
+  File "${OLIBS_PATH}\src\openmedialib\plugins\quicktime\Multi-threaded Release DLL\openmedialib_quicktime-vc80-r-0_4_1.dll"
+  File "${OLIBS_PATH}\src\openmedialib\plugins\sdl\sdl_plugin.opl"
+  File "${OLIBS_PATH}\src\openmedialib\plugins\sdl\Multi-threaded Release DLL\openmedialib_sdl-vc80-r-0_4_1.dll"
+  File "${OLIBS_PATH}\src\openobjectlib\plugins\3ds\3ds_plugin.opl"
+  File "${OLIBS_PATH}\src\openobjectlib\plugins\3ds\Multi-threaded Release DLL\openobjectlib_3ds-vc80-r-0_4_1.dll"
+  File "${OLIBS_PATH}\src\openobjectlib\plugins\obj\obj_plugin.opl"
+  File "${OLIBS_PATH}\src\openobjectlib\plugins\obj\Multi-threaded Release DLL\openobjectlib_obj-vc80-r-0_4_1.dll"
+  File "${OLIBS_PATH}\src\openobjectlib\plugins\tsto\tsto_plugin.opl"
+  File "${OLIBS_PATH}\src\openobjectlib\plugins\tsto\Multi-threaded Release DLL\openobjectlib_tsto-vc80-r-0_4_1.dll"
+  File "${OLIBS_PATH}\src\openobjectlib\plugins\X3D\x3d_plugin.opl"
+  File "${OLIBS_PATH}\src\openobjectlib\plugins\X3D\Multi-threaded Release DLL\openobjectlib_x3d-vc80-r-0_4_1.dll"
+  File "${OLIBS_PATH}\src\openobjectlib\plugins\Collada\collada_plugin.opl"
+  File "${OLIBS_PATH}\src\openobjectlib\plugins\Collada\Multi-threaded Release DLL\openobjectlib_collada-vc80-r-0_4_1.dll"
+  File "${OLIBS_PATH}\src\openeffectslib\plugins\tonemap\tonemap_plugin.opl"
+  File "${OLIBS_PATH}\src\openeffectslib\plugins\tonemap\Multi-threaded Release DLL\openeffectslib_tonemap-vc80-r-0_4_1.dll"
+  File "${OLIBS_PATH}\src\openassetlib\plugins\filesystem_storage_plugin\filesystem_storage_plugin.opl"
+  File "${OLIBS_PATH}\src\openassetlib\plugins\filesystem_storage_plugin\Multi-threaded Release DLL\openassetlib_filesystem-vc80-r-0_4_1.dll"
+  File "${OLIBS_PATH}\src\openassetlib\plugins\sqlite3_metadata_plugin\sqlite3_metadata_plugin.opl"
+  File "${OLIBS_PATH}\src\openassetlib\plugins\sqlite3_metadata_plugin\Multi-threaded Release DLL\openassetlib_sqlite3-vc80-r-0_4_1.dll"
+  
+  SetOutPath $INSTDIR\openlibraries\kernels
+  File "${OLIBS_PATH}\effects\kernels\sepia.gpu_kernel"
+  
+  SetOutPath $INSTDIR\openlibraries\shaders
+  File "${OLIBS_PATH}\effects\shaders\sepia.cg"
+  File "${OLIBS_PATH}\effects\shaders\sepia.frag"
+  File "${OLIBS_PATH}\effects\shaders\fixed_function.vert"
+  File "${OLIBS_PATH}\effects\shaders\passthrough.vert"
+  File "${OLIBS_PATH}\effects\shaders\passthrough.cg"
+  File "${OLIBS_PATH}\effects\shaders\rgb_to_yuv444.frag"
+  File "${OLIBS_PATH}\effects\shaders\yuv444_to_rgb.frag"
+  File "${OLIBS_PATH}\effects\shaders\yuv444_to_rgb.cg"
+  File "${OLIBS_PATH}\effects\shaders\yuv444_to_rgb_deinterlace.cg"
+  File "${OLIBS_PATH}\effects\shaders\yuv444_to_rgb_deinterlace.frag"
+  File "${OLIBS_PATH}\effects\shaders\histogram.cg"
+  File "${OLIBS_PATH}\effects\shaders\histogram.frag"
+  File "${OLIBS_PATH}\effects\shaders\channel_selector.cg"
+  File "${OLIBS_PATH}\effects\shaders\channel_selector.frag"
+ 
+  SetDetailsPrint both
+
+SectionEnd
+
 Section "jahPlayer" SecCore
 
@@ -111 +297 @@
   
   SetDetailsPrint textonly
-  DetailPrint "Installing jahPlayer..."
+  DetailPrint "Installing jahPlayer & jPlayer..."
   SetDetailsPrint listonly
 
   SetOutPath $INSTDIR\jahPlayer
   File /r "..\jahPlayer\dist\*"
+  File "run_jahplayer.cmd"
 
   SetOutPath $INSTDIR\jahTools
@@ -124 +311 @@
   SetOutPath $INSTDIR\jahTools\jPlayer
   File /r "..\jahTools\jPlayer\dist\*"
+  File "run_jplayer.cmd"
 
   SetDetailsPrint both
@@ -129 +317 @@
   SetOutPath $INSTDIR\jahPlayer
   CreateDirectory "$SMPROGRAMS\jahshaka"
-  CreateShortCut "$SMPROGRAMS\jahshaka\jahPlayer.lnk" "$INSTDIR\jahPlayer\jahPlayer.exe"
-  CreateShortCut "$DESKTOP\jahPlayer.lnk" "$INSTDIR\jahPlayer\jahPlayer.exe"
+  CreateShortCut "$SMPROGRAMS\jahshaka\jahPlayer.lnk" "$INSTDIR\jahPlayer\run_jahPlayer.cmd" '' "$INSTDIR\jahPlayer\jahPlayer.exe" 0 SW_SHOWMINIMIZED
+  CreateShortCut "$DESKTOP\jahPlayer.lnk" "$INSTDIR\jahPlayer\run_jahPlayer.cmd" '' "$INSTDIR\jahPlayer\jahPlayer.exe" 0 SW_SHOWMINIMIZED
 
   SetOutPath $INSTDIR\jahTools\jPlayer
   CreateDirectory "$SMPROGRAMS\jahshaka\jahTools"
-  CreateShortCut "$SMPROGRAMS\jahshaka\jahTools\jPlayer.lnk" "$INSTDIR\jahTools\jPlayer\jPlayer.exe"
-  CreateShortCut "$DESKTOP\jPlayer.lnk" "$INSTDIR\jahTools\jPlayer\jPlayer.exe"
+  CreateShortCut "$SMPROGRAMS\jahshaka\jahTools\jPlayer.lnk" "$INSTDIR\jahTools\jPlayer\run_jPlayer.cmd" '' "$INSTDIR\jahTools\jPlayer\jPlayer.exe" 0 SW_SHOWMINIMIZED
+  CreateShortCut "$DESKTOP\jPlayer.lnk" "$INSTDIR\jahTools\jPlayer\run_jPlayer.cmd" '' "$INSTDIR\jahTools\jPlayer\jPlayer.exe" 0 SW_SHOWMINIMIZED
 
   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\jahPlayer" "DisplayName" "jahPlayer"
@@ -149 +337 @@
 SectionEnd
 
-Section "OpenLibraries" olib
-
-  SectionIn 1
-  SetOutPath $INSTDIR
-
-  SetOverwrite on
-  SetShellVarContext all
-
-  SetDetailsPrint textonly
-  DetailPrint "Installing OpenLibraries..."
-  SetDetailsPrint listonly
-
-  SetOutPath $INSTDIR
-  File openlibraries-${OLIB_VERSION}-runtime.exe
-  ExecWait '"$INSTDIR\openlibraries-${OLIB_VERSION}-runtime.exe" /S /D'
-  
-  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\jahPlayer" "olibs" "true"
-
-  SetDetailsPrint both
-
-SectionEnd
-
 Section -post
 
@@ -181 +347 @@
 
 !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
+  !insertmacro MUI_DESCRIPTION_TEXT ${ms_crt_dlls} "Windows CRT DLLs"
+  !insertmacro MUI_DESCRIPTION_TEXT ${msxml2} "MSXML2 SP2"
+  !insertmacro MUI_DESCRIPTION_TEXT ${openal} "OpenAL"
+  !insertmacro MUI_DESCRIPTION_TEXT ${olibs} "OpenLibraries runtime files"
   !insertmacro MUI_DESCRIPTION_TEXT ${SecCore} "jahPlayer runtime files"
-  !insertmacro MUI_DESCRIPTION_TEXT ${olib} "OpenLibraries runtime files"
 !insertmacro MUI_FUNCTION_DESCRIPTION_END
 
@@ -195 +364 @@
   
   SetShellVarContext all
-  
-  ;ReadRegStr $R0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\jahPlayer" "olibs"
-  ;StrCmp $R0 "" skip_olib_uninstall
-  ;  ;-- Remove OpenLibraries
-  ;  ReadEnvStr $0 PYTHONPATH
-  ;  ExecWait '"$0\..\uninst-openlibraries.exe" /S /D'
         
-  ;skip_olib_uninstall:
-
   ;-- Remove registry keys
+  DeleteRegKey HKLM "Software\jahPlayer"
   DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\jahPlayer"