[Jahshaka-cvs] SF.net SVN: openlibraries: [1317] trunk/installer
Status: Beta
Brought to you by:
jahshaka
From: <gl...@us...> - 2007-10-28 12:53:59
|
Revision: 1317 http://openlibraries.svn.sourceforge.net/openlibraries/?rev=1317&view=rev Author: glslang Date: 2007-10-28 05:53:57 -0700 (Sun, 28 Oct 2007) Log Message: ----------- + + merge cleanups and tidy-ups Modified Paths: -------------- trunk/installer/add_to_path.nsh trunk/installer/openlibraries_runtime.nsi trunk/installer/openlibraries_sdk.nsi trunk/installer/write_env_str.nsh Property Changed: ---------------- trunk/installer/add_to_path.nsh trunk/installer/openlibraries_lib32.spec trunk/installer/openlibraries_runtime.nsi trunk/installer/openlibraries_sdk.nsi trunk/installer/write_env_str.nsh Modified: trunk/installer/add_to_path.nsh =================================================================== --- trunk/installer/add_to_path.nsh 2007-10-28 11:24:51 UTC (rev 1316) +++ trunk/installer/add_to_path.nsh 2007-10-28 12:53:57 UTC (rev 1317) @@ -1,419 +1,419 @@ -;---------------------------------------- -; from nsis.sourceforge.net - -!ifndef _AddToPath_nsh -!define _AddToPath_nsh - -!verbose 3 -!include "WinMessages.NSH" -!verbose 4 - -!ifndef WriteEnvStr_RegKey - !ifdef ALL_USERS - !define WriteEnvStr_RegKey \ - 'HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"' - !else - !define WriteEnvStr_RegKey 'HKCU "Environment"' - !endif -!endif - -; AddToPath - Adds the given dir to the search path. -; Input - head of the stack -; Note - Win9x systems requires reboot - -Function AddToPath - Exch $0 - Push $1 - Push $2 - Push $3 - - # don't add if the path doesn't exist - IfFileExists "$0\*.*" "" AddToPath_done - ReadEnvStr $1 PATH - Push "$1;" - Push "$0;" - Call StrStr - Pop $2 - ;StrCmp $2 "" "" AddToPath_done - Push "$1;" - Push "$0\;" - Call StrStr - Pop $2 - ;StrCmp $2 "" "" AddToPath_done - GetFullPathName /SHORT $3 $0 - Push "$1;" - Push "$3;" - Call StrStr - Pop $2 - ;StrCmp $2 "" "" AddToPath_done - Push "$1;" - Push "$3\;" - Call StrStr - Pop $2 - ;StrCmp $2 "" "" AddToPath_done - - Call IsNT - Pop $1 - StrCmp $1 1 AddToPath_NT - ; Not on NT - StrCpy $1 $WINDIR 2 - FileOpen $1 "$1\autoexec.bat" a - FileSeek $1 -1 END - FileReadByte $1 $2 - IntCmp $2 26 0 +2 +2 # DOS EOF - FileSeek $1 -1 END # write over EOF - FileWrite $1 "$\r$\nSET PATH=%PATH%;$3$\r$\n" - FileClose $1 - SetRebootFlag true - Goto AddToPath_done - - AddToPath_NT: - ReadRegStr $1 ${WriteEnvStr_RegKey} "PATH" - StrCpy $2 $1 1 -1 # copy last char - StrCmp $2 ";" 0 +2 # if last char == ; - StrCpy $1 $1 -1 # remove last char - StrCmp $1 "" AddToPath_NTdoIt - StrCpy $0 "$1;$0" - AddToPath_NTdoIt: - WriteRegExpandStr ${WriteEnvStr_RegKey} "PATH" $0 - SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} 0 "STR:Environment" /TIMEOUT=5000 - - AddToPath_done: - Pop $3 - Pop $2 - Pop $1 - Pop $0 -FunctionEnd - -; RemoveFromPath - Remove a given dir from the path -; Input: head of the stack - -Function un.RemoveFromPath - Exch $0 - Push $1 - Push $2 - Push $3 - Push $4 - Push $5 - Push $6 - - IntFmt $6 "%c" 26 # DOS EOF - - Call un.IsNT - Pop $1 - StrCmp $1 1 unRemoveFromPath_NT - ; Not on NT - StrCpy $1 $WINDIR 2 - FileOpen $1 "$1\autoexec.bat" r - GetTempFileName $4 - FileOpen $2 $4 w - GetFullPathName /SHORT $0 $0 - StrCpy $0 "SET PATH=%PATH%;$0" - Goto unRemoveFromPath_dosLoop - - unRemoveFromPath_dosLoop: - FileRead $1 $3 - StrCpy $5 $3 1 -1 # read last char - StrCmp $5 $6 0 +2 # if DOS EOF - StrCpy $3 $3 -1 # remove DOS EOF so we can compare - StrCmp $3 "$0$\r$\n" unRemoveFromPath_dosLoopRemoveLine - StrCmp $3 "$0$\n" unRemoveFromPath_dosLoopRemoveLine - StrCmp $3 "$0" unRemoveFromPath_dosLoopRemoveLine - StrCmp $3 "" unRemoveFromPath_dosLoopEnd - FileWrite $2 $3 - Goto unRemoveFromPath_dosLoop - unRemoveFromPath_dosLoopRemoveLine: - SetRebootFlag true - Goto unRemoveFromPath_dosLoop - - unRemoveFromPath_dosLoopEnd: - FileClose $2 - FileClose $1 - StrCpy $1 $WINDIR 2 - Delete "$1\autoexec.bat" - CopyFiles /SILENT $4 "$1\autoexec.bat" - Delete $4 - Goto unRemoveFromPath_done - - unRemoveFromPath_NT: - ReadRegStr $1 ${WriteEnvStr_RegKey} "PATH" - StrCpy $5 $1 1 -1 # copy last char - StrCmp $5 ";" +2 # if last char != ; - StrCpy $1 "$1;" # append ; - Push $1 - Push "$0;" - Call un.StrStr ; Find `$0;` in $1 - Pop $2 ; pos of our dir - StrCmp $2 "" unRemoveFromPath_done - ; else, it is in path - # $0 - path to add - # $1 - path var - StrLen $3 "$0;" - StrLen $4 $2 - StrCpy $5 $1 -$4 # $5 is now the part before the path to remove - StrCpy $6 $2 "" $3 # $6 is now the part after the path to remove - StrCpy $3 $5$6 - - StrCpy $5 $3 1 -1 # copy last char - StrCmp $5 ";" 0 +2 # if last char == ; - StrCpy $3 $3 -1 # remove last char - - WriteRegExpandStr ${WriteEnvStr_RegKey} "PATH" $3 - SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} 0 "STR:Environment" /TIMEOUT=5000 - - unRemoveFromPath_done: - Pop $6 - Pop $5 - Pop $4 - Pop $3 - Pop $2 - Pop $1 - Pop $0 -FunctionEnd - - - -; AddToEnvVar - Adds the given value to the given environment var -; Input - head of the stack $0 environement variable $1=value to add -; Note - Win9x systems requires reboot - -Function AddToEnvVar - - Exch $1 ; $1 has environment variable value - Exch - Exch $0 ; $0 has environment variable name - - DetailPrint "Adding $1 to $0" - Push $2 - Push $3 - Push $4 - - - ReadEnvStr $2 $0 - Push "$2;" - Push "$1;" - Call StrStr - Pop $3 - ;StrCmp $3 "" "" AddToEnvVar_done - - Push "$2;" - Push "$1\;" - Call StrStr - Pop $3 - ;StrCmp $3 "" "" AddToEnvVar_done - - - Call IsNT - Pop $2 - StrCmp $2 1 AddToEnvVar_NT - ; Not on NT - StrCpy $2 $WINDIR 2 - FileOpen $2 "$2\autoexec.bat" a - FileSeek $2 -1 END - FileReadByte $2 $3 - IntCmp $3 26 0 +2 +2 # DOS EOF - FileSeek $2 -1 END # write over EOF - FileWrite $2 "$\r$\nSET $0=%$0%;$4$\r$\n" - FileClose $2 - SetRebootFlag true - Goto AddToEnvVar_done - - AddToEnvVar_NT: - ReadRegStr $2 ${WriteEnvStr_RegKey} $0 - StrCpy $3 $2 1 -1 # copy last char - StrCmp $3 ";" 0 +2 # if last char == ; - StrCpy $2 $2 -1 # remove last char - StrCmp $2 "" AddToEnvVar_NTdoIt - StrCpy $1 "$2;$1" - AddToEnvVar_NTdoIt: - WriteRegExpandStr ${WriteEnvStr_RegKey} $0 $1 - SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} 0 "STR:Environment" /TIMEOUT=5000 - - AddToEnvVar_done: - Pop $4 - Pop $3 - Pop $2 - Pop $1 - Pop $0 - -FunctionEnd - -; RemoveFromEnvVar - Remove a given value from a environment var -; Input: head of the stack - -Function un.RemoveFromEnvVar - - Exch $1 ; $1 has environment variable value - Exch - Exch $0 ; $0 has environment variable name - - DetailPrint "Removing $1 from $0" - Push $2 - Push $3 - Push $4 - Push $5 - Push $6 - Push $7 - - IntFmt $7 "%c" 26 # DOS EOF - - Call un.IsNT - Pop $2 - StrCmp $2 1 unRemoveFromEnvVar_NT - ; Not on NT - StrCpy $2 $WINDIR 2 - FileOpen $2 "$2\autoexec.bat" r - GetTempFileName $5 - FileOpen $3 $5 w - GetFullPathName /SHORT $1 $1 - StrCpy $1 "SET $0=%$0%;$1" - Goto unRemoveFromEnvVar_dosLoop - - unRemoveFromEnvVar_dosLoop: - FileRead $2 $4 - StrCpy $6 $4 1 -1 # read last char - StrCmp $6 $7 0 +2 # if DOS EOF - StrCpy $4 $4 -1 # remove DOS EOF so we can compare - StrCmp $4 "$1$\r$\n" unRemoveFromEnvVar_dosLoopRemoveLine - StrCmp $4 "$1$\n" unRemoveFromEnvVar_dosLoopRemoveLine - StrCmp $4 "$1" unRemoveFromEnvVar_dosLoopRemoveLine - StrCmp $4 "" unRemoveFromEnvVar_dosLoopEnd - FileWrite $3 $4 - Goto unRemoveFromEnvVar_dosLoop - unRemoveFromEnvVar_dosLoopRemoveLine: - SetRebootFlag true - Goto unRemoveFromEnvVar_dosLoop - - unRemoveFromEnvVar_dosLoopEnd: - FileClose $3 - FileClose $2 - StrCpy $2 $WINDIR 2 - Delete "$2\autoexec.bat" - CopyFiles /SILENT $5 "$2\autoexec.bat" - Delete $5 - Goto unRemoveFromEnvVar_done - - unRemoveFromEnvVar_NT: - ReadRegStr $2 ${WriteEnvStr_RegKey} $0 - StrCpy $6 $2 1 -1 # copy last char - StrCmp $6 ";" +2 # if last char != ; - StrCpy $2 "$2;" # append ; - Push $2 - Push "$1;" - Call un.StrStr ; Find `$1;` in $2 - Pop $3 ; pos of our dir - StrCmp $3 "" unRemoveFromEnvVar_done - ; else, it is in path - # $1 - path to add - # $2 - path var - StrLen $4 "$1;" - StrLen $5 $3 - StrCpy $6 $2 -$5 # $6 is now the part before the path to remove - StrCpy $7 $3 "" $4 # $7 is now the part after the path to remove - StrCpy $4 $6$7 - - StrCpy $6 $4 1 -1 # copy last char - StrCmp $6 ";" 0 +2 # if last char == ; - StrCpy $4 $4 -1 # remove last char - - WriteRegExpandStr ${WriteEnvStr_RegKey} $0 $4 - SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} 0 "STR:Environment" /TIMEOUT=5000 - - unRemoveFromEnvVar_done: - Pop $7 - Pop $6 - Pop $5 - Pop $4 - Pop $3 - Pop $2 - Pop $1 - Pop $0 -FunctionEnd - - - - -!ifndef IsNT_KiCHiK -!define IsNT_KiCHiK - -########################################### -# Utility Functions # -########################################### - -; IsNT -; no input -; output, top of the stack = 1 if NT or 0 if not -; -; Usage: -; Call IsNT -; Pop $R0 -; ($R0 at this point is 1 or 0) - -!macro IsNT un -Function ${un}IsNT - Push $0 - ReadRegStr $0 HKLM "SOFTWARE\Microsoft\Windows NT\CurrentVersion" CurrentVersion - StrCmp $0 "" 0 IsNT_yes - ; we are not NT. - Pop $0 - Push 0 - Return - - IsNT_yes: - ; NT!!! - Pop $0 - Push 1 -FunctionEnd -!macroend -!insertmacro IsNT "" -!insertmacro IsNT "un." - -!endif ; IsNT_KiCHiK - -; StrStr -; input, top of stack = string to search for -; top of stack-1 = string to search in -; output, top of stack (replaces with the portion of the string remaining) -; modifies no other variables. -; -; Usage: -; Push "this is a long ass string" -; Push "ass" -; Call StrStr -; Pop $R0 -; ($R0 at this point is "ass string") - -!macro StrStr un -Function ${un}StrStr -Exch $R1 ; st=haystack,old$R1, $R1=needle - Exch ; st=old$R1,haystack - Exch $R2 ; st=old$R1,old$R2, $R2=haystack - Push $R3 - Push $R4 - Push $R5 - StrLen $R3 $R1 - StrCpy $R4 0 - ; $R1=needle - ; $R2=haystack - ; $R3=len(needle) - ; $R4=cnt - ; $R5=tmp - loop: - StrCpy $R5 $R2 $R3 $R4 - StrCmp $R5 $R1 done - StrCmp $R5 "" done - IntOp $R4 $R4 + 1 - Goto loop -done: - StrCpy $R1 $R2 "" $R4 - Pop $R5 - Pop $R4 - Pop $R3 - Pop $R2 - Exch $R1 -FunctionEnd -!macroend -!insertmacro StrStr "" -!insertmacro StrStr "un." - -!endif ; _AddToPath_nsh +;---------------------------------------- +; from nsis.sourceforge.net + +!ifndef _AddToPath_nsh +!define _AddToPath_nsh + +!verbose 3 +!include "WinMessages.NSH" +!verbose 4 + +!ifndef WriteEnvStr_RegKey + !ifdef ALL_USERS + !define WriteEnvStr_RegKey \ + 'HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"' + !else + !define WriteEnvStr_RegKey 'HKCU "Environment"' + !endif +!endif + +; AddToPath - Adds the given dir to the search path. +; Input - head of the stack +; Note - Win9x systems requires reboot + +Function AddToPath + Exch $0 + Push $1 + Push $2 + Push $3 + + # don't add if the path doesn't exist + IfFileExists "$0\*.*" "" AddToPath_done + ReadEnvStr $1 PATH + Push "$1;" + Push "$0;" + Call StrStr + Pop $2 + ;StrCmp $2 "" "" AddToPath_done + Push "$1;" + Push "$0\;" + Call StrStr + Pop $2 + ;StrCmp $2 "" "" AddToPath_done + GetFullPathName /SHORT $3 $0 + Push "$1;" + Push "$3;" + Call StrStr + Pop $2 + ;StrCmp $2 "" "" AddToPath_done + Push "$1;" + Push "$3\;" + Call StrStr + Pop $2 + ;StrCmp $2 "" "" AddToPath_done + + Call IsNT + Pop $1 + StrCmp $1 1 AddToPath_NT + ; Not on NT + StrCpy $1 $WINDIR 2 + FileOpen $1 "$1\autoexec.bat" a + FileSeek $1 -1 END + FileReadByte $1 $2 + IntCmp $2 26 0 +2 +2 # DOS EOF + FileSeek $1 -1 END # write over EOF + FileWrite $1 "$\r$\nSET PATH=%PATH%;$3$\r$\n" + FileClose $1 + SetRebootFlag true + Goto AddToPath_done + + AddToPath_NT: + ReadRegStr $1 ${WriteEnvStr_RegKey} "PATH" + StrCpy $2 $1 1 -1 # copy last char + StrCmp $2 ";" 0 +2 # if last char == ; + StrCpy $1 $1 -1 # remove last char + StrCmp $1 "" AddToPath_NTdoIt + StrCpy $0 "$1;$0" + AddToPath_NTdoIt: + WriteRegExpandStr ${WriteEnvStr_RegKey} "PATH" $0 + SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} 0 "STR:Environment" /TIMEOUT=5000 + + AddToPath_done: + Pop $3 + Pop $2 + Pop $1 + Pop $0 +FunctionEnd + +; RemoveFromPath - Remove a given dir from the path +; Input: head of the stack + +Function un.RemoveFromPath + Exch $0 + Push $1 + Push $2 + Push $3 + Push $4 + Push $5 + Push $6 + + IntFmt $6 "%c" 26 # DOS EOF + + Call un.IsNT + Pop $1 + StrCmp $1 1 unRemoveFromPath_NT + ; Not on NT + StrCpy $1 $WINDIR 2 + FileOpen $1 "$1\autoexec.bat" r + GetTempFileName $4 + FileOpen $2 $4 w + GetFullPathName /SHORT $0 $0 + StrCpy $0 "SET PATH=%PATH%;$0" + Goto unRemoveFromPath_dosLoop + + unRemoveFromPath_dosLoop: + FileRead $1 $3 + StrCpy $5 $3 1 -1 # read last char + StrCmp $5 $6 0 +2 # if DOS EOF + StrCpy $3 $3 -1 # remove DOS EOF so we can compare + StrCmp $3 "$0$\r$\n" unRemoveFromPath_dosLoopRemoveLine + StrCmp $3 "$0$\n" unRemoveFromPath_dosLoopRemoveLine + StrCmp $3 "$0" unRemoveFromPath_dosLoopRemoveLine + StrCmp $3 "" unRemoveFromPath_dosLoopEnd + FileWrite $2 $3 + Goto unRemoveFromPath_dosLoop + unRemoveFromPath_dosLoopRemoveLine: + SetRebootFlag true + Goto unRemoveFromPath_dosLoop + + unRemoveFromPath_dosLoopEnd: + FileClose $2 + FileClose $1 + StrCpy $1 $WINDIR 2 + Delete "$1\autoexec.bat" + CopyFiles /SILENT $4 "$1\autoexec.bat" + Delete $4 + Goto unRemoveFromPath_done + + unRemoveFromPath_NT: + ReadRegStr $1 ${WriteEnvStr_RegKey} "PATH" + StrCpy $5 $1 1 -1 # copy last char + StrCmp $5 ";" +2 # if last char != ; + StrCpy $1 "$1;" # append ; + Push $1 + Push "$0;" + Call un.StrStr ; Find `$0;` in $1 + Pop $2 ; pos of our dir + StrCmp $2 "" unRemoveFromPath_done + ; else, it is in path + # $0 - path to add + # $1 - path var + StrLen $3 "$0;" + StrLen $4 $2 + StrCpy $5 $1 -$4 # $5 is now the part before the path to remove + StrCpy $6 $2 "" $3 # $6 is now the part after the path to remove + StrCpy $3 $5$6 + + StrCpy $5 $3 1 -1 # copy last char + StrCmp $5 ";" 0 +2 # if last char == ; + StrCpy $3 $3 -1 # remove last char + + WriteRegExpandStr ${WriteEnvStr_RegKey} "PATH" $3 + SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} 0 "STR:Environment" /TIMEOUT=5000 + + unRemoveFromPath_done: + Pop $6 + Pop $5 + Pop $4 + Pop $3 + Pop $2 + Pop $1 + Pop $0 +FunctionEnd + + + +; AddToEnvVar - Adds the given value to the given environment var +; Input - head of the stack $0 environement variable $1=value to add +; Note - Win9x systems requires reboot + +Function AddToEnvVar + + Exch $1 ; $1 has environment variable value + Exch + Exch $0 ; $0 has environment variable name + + DetailPrint "Adding $1 to $0" + Push $2 + Push $3 + Push $4 + + + ReadEnvStr $2 $0 + Push "$2;" + Push "$1;" + Call StrStr + Pop $3 + ;StrCmp $3 "" "" AddToEnvVar_done + + Push "$2;" + Push "$1\;" + Call StrStr + Pop $3 + ;StrCmp $3 "" "" AddToEnvVar_done + + + Call IsNT + Pop $2 + StrCmp $2 1 AddToEnvVar_NT + ; Not on NT + StrCpy $2 $WINDIR 2 + FileOpen $2 "$2\autoexec.bat" a + FileSeek $2 -1 END + FileReadByte $2 $3 + IntCmp $3 26 0 +2 +2 # DOS EOF + FileSeek $2 -1 END # write over EOF + FileWrite $2 "$\r$\nSET $0=%$0%;$4$\r$\n" + FileClose $2 + SetRebootFlag true + Goto AddToEnvVar_done + + AddToEnvVar_NT: + ReadRegStr $2 ${WriteEnvStr_RegKey} $0 + StrCpy $3 $2 1 -1 # copy last char + StrCmp $3 ";" 0 +2 # if last char == ; + StrCpy $2 $2 -1 # remove last char + StrCmp $2 "" AddToEnvVar_NTdoIt + StrCpy $1 "$2;$1" + AddToEnvVar_NTdoIt: + WriteRegExpandStr ${WriteEnvStr_RegKey} $0 $1 + SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} 0 "STR:Environment" /TIMEOUT=5000 + + AddToEnvVar_done: + Pop $4 + Pop $3 + Pop $2 + Pop $1 + Pop $0 + +FunctionEnd + +; RemoveFromEnvVar - Remove a given value from a environment var +; Input: head of the stack + +Function un.RemoveFromEnvVar + + Exch $1 ; $1 has environment variable value + Exch + Exch $0 ; $0 has environment variable name + + DetailPrint "Removing $1 from $0" + Push $2 + Push $3 + Push $4 + Push $5 + Push $6 + Push $7 + + IntFmt $7 "%c" 26 # DOS EOF + + Call un.IsNT + Pop $2 + StrCmp $2 1 unRemoveFromEnvVar_NT + ; Not on NT + StrCpy $2 $WINDIR 2 + FileOpen $2 "$2\autoexec.bat" r + GetTempFileName $5 + FileOpen $3 $5 w + GetFullPathName /SHORT $1 $1 + StrCpy $1 "SET $0=%$0%;$1" + Goto unRemoveFromEnvVar_dosLoop + + unRemoveFromEnvVar_dosLoop: + FileRead $2 $4 + StrCpy $6 $4 1 -1 # read last char + StrCmp $6 $7 0 +2 # if DOS EOF + StrCpy $4 $4 -1 # remove DOS EOF so we can compare + StrCmp $4 "$1$\r$\n" unRemoveFromEnvVar_dosLoopRemoveLine + StrCmp $4 "$1$\n" unRemoveFromEnvVar_dosLoopRemoveLine + StrCmp $4 "$1" unRemoveFromEnvVar_dosLoopRemoveLine + StrCmp $4 "" unRemoveFromEnvVar_dosLoopEnd + FileWrite $3 $4 + Goto unRemoveFromEnvVar_dosLoop + unRemoveFromEnvVar_dosLoopRemoveLine: + SetRebootFlag true + Goto unRemoveFromEnvVar_dosLoop + + unRemoveFromEnvVar_dosLoopEnd: + FileClose $3 + FileClose $2 + StrCpy $2 $WINDIR 2 + Delete "$2\autoexec.bat" + CopyFiles /SILENT $5 "$2\autoexec.bat" + Delete $5 + Goto unRemoveFromEnvVar_done + + unRemoveFromEnvVar_NT: + ReadRegStr $2 ${WriteEnvStr_RegKey} $0 + StrCpy $6 $2 1 -1 # copy last char + StrCmp $6 ";" +2 # if last char != ; + StrCpy $2 "$2;" # append ; + Push $2 + Push "$1;" + Call un.StrStr ; Find `$1;` in $2 + Pop $3 ; pos of our dir + StrCmp $3 "" unRemoveFromEnvVar_done + ; else, it is in path + # $1 - path to add + # $2 - path var + StrLen $4 "$1;" + StrLen $5 $3 + StrCpy $6 $2 -$5 # $6 is now the part before the path to remove + StrCpy $7 $3 "" $4 # $7 is now the part after the path to remove + StrCpy $4 $6$7 + + StrCpy $6 $4 1 -1 # copy last char + StrCmp $6 ";" 0 +2 # if last char == ; + StrCpy $4 $4 -1 # remove last char + + WriteRegExpandStr ${WriteEnvStr_RegKey} $0 $4 + SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} 0 "STR:Environment" /TIMEOUT=5000 + + unRemoveFromEnvVar_done: + Pop $7 + Pop $6 + Pop $5 + Pop $4 + Pop $3 + Pop $2 + Pop $1 + Pop $0 +FunctionEnd + + + + +!ifndef IsNT_KiCHiK +!define IsNT_KiCHiK + +########################################### +# Utility Functions # +########################################### + +; IsNT +; no input +; output, top of the stack = 1 if NT or 0 if not +; +; Usage: +; Call IsNT +; Pop $R0 +; ($R0 at this point is 1 or 0) + +!macro IsNT un +Function ${un}IsNT + Push $0 + ReadRegStr $0 HKLM "SOFTWARE\Microsoft\Windows NT\CurrentVersion" CurrentVersion + StrCmp $0 "" 0 IsNT_yes + ; we are not NT. + Pop $0 + Push 0 + Return + + IsNT_yes: + ; NT!!! + Pop $0 + Push 1 +FunctionEnd +!macroend +!insertmacro IsNT "" +!insertmacro IsNT "un." + +!endif ; IsNT_KiCHiK + +; StrStr +; input, top of stack = string to search for +; top of stack-1 = string to search in +; output, top of stack (replaces with the portion of the string remaining) +; modifies no other variables. +; +; Usage: +; Push "this is a long ass string" +; Push "ass" +; Call StrStr +; Pop $R0 +; ($R0 at this point is "ass string") + +!macro StrStr un +Function ${un}StrStr +Exch $R1 ; st=haystack,old$R1, $R1=needle + Exch ; st=old$R1,haystack + Exch $R2 ; st=old$R1,old$R2, $R2=haystack + Push $R3 + Push $R4 + Push $R5 + StrLen $R3 $R1 + StrCpy $R4 0 + ; $R1=needle + ; $R2=haystack + ; $R3=len(needle) + ; $R4=cnt + ; $R5=tmp + loop: + StrCpy $R5 $R2 $R3 $R4 + StrCmp $R5 $R1 done + StrCmp $R5 "" done + IntOp $R4 $R4 + 1 + Goto loop +done: + StrCpy $R1 $R2 "" $R4 + Pop $R5 + Pop $R4 + Pop $R3 + Pop $R2 + Exch $R1 +FunctionEnd +!macroend +!insertmacro StrStr "" +!insertmacro StrStr "un." + +!endif ; _AddToPath_nsh Property changes on: trunk/installer/add_to_path.nsh ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/installer/openlibraries_lib32.spec ___________________________________________________________________ Name: svn:eol-style + native Modified: trunk/installer/openlibraries_runtime.nsi =================================================================== --- trunk/installer/openlibraries_runtime.nsi 2007-10-28 11:24:51 UTC (rev 1316) +++ trunk/installer/openlibraries_runtime.nsi 2007-10-28 12:53:57 UTC (rev 1317) @@ -3,7 +3,8 @@ ;-------------------------------- !ifndef VERSION - !define VERSION 0.4.1 + !define VERSION 0_5_0 + !define VERSION_DOT 0.5.0 !endif ;-------------------------------- @@ -12,7 +13,7 @@ !ifdef OUTFILE OutFile "${OUTFILE}" !else - OutFile openlibraries-${VERSION}-runtime.exe + OutFile openlibraries-${VERSION_DOT}-runtime.exe !endif SetCompressor /SOLID lzma @@ -34,7 +35,7 @@ ;Names Name "OpenLibraries" -Caption "OpenLibraries (v.${VERSION}) Setup" +Caption "OpenLibraries (v.${VERSION_DOT}) Setup" ;Interface Settings !define MUI_ABORTWARNING @@ -46,7 +47,7 @@ !define MUI_COMPONENTSPAGE_SMALLDESC ;Pages -!define MUI_WELCOMEPAGE_TITLE "Welcome to the OpenLibraries (v.${VERSION}) Setup Wizard" +!define MUI_WELCOMEPAGE_TITLE "Welcome to the OpenLibraries (v.${VERSION_DOT}) Setup Wizard" !define MUI_WELCOMEPAGE_TEXT "This wizard will guide you through the installation of OpenLibraries.\r\n\r\n$_CLICK" !insertmacro MUI_PAGE_WELCOME @@ -128,30 +129,30 @@ SectionEnd -Section "MSXML4 SP2" msxml2 +;Section "MSXML4 SP2" msxml2 - SectionIn 1 - SetOutPath $INSTDIR +; SectionIn 1 +; SetOutPath $INSTDIR - SetOverwrite on - SetShellVarContext all +; SetOverwrite on +; SetShellVarContext all - SetDetailsPrint textonly - DetailPrint "Installing MSXML4 SP2..." - SetDetailsPrint listonly +; SetDetailsPrint textonly +; DetailPrint "Installing MSXML4 SP2..." +; SetDetailsPrint listonly - SetOutPath $INSTDIR - File "msxml4.msi" +; SetOutPath $INSTDIR +; File "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"' +; 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" "" +; WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenLibraries" "msxml2" "" - SetDetailsPrint both +; SetDetailsPrint both -SectionEnd +;SectionEnd Section "OpenAL" openal @@ -185,33 +186,34 @@ SetOverwrite on SetOutPath $INSTDIR\bin - File "..\src\openpluginlib\pl\Multi-threaded Release DLL\openpluginlib_pl-vc80-r-0_4_1.dll" - File "..\src\openimagelib\il\Multi-threaded Release DLL\openimagelib_il-vc80-r-0_4_1.dll" - File "..\src\openmedialib\ml\Multi-threaded Release DLL\openmedialib_ml-vc80-r-0_4_1.dll" - File "..\src\openobjectlib\sg\Multi-threaded Release DLL\openobjectlib_sg-vc80-r-0_4_1.dll" - File "..\src\openassetlib\al\Multi-threaded Release DLL\openassetlib_al-vc80-r-0_4_1.dll" + File "..\src\openpluginlib\pl\Multi-threaded Release DLL\openpluginlib_pl-vc80-r-${VERSION}.dll" + File "..\src\openimagelib\il\Multi-threaded Release DLL\openimagelib_il-vc80-r-${VERSION}.dll" + File "..\src\openmedialib\ml\Multi-threaded Release DLL\openmedialib_ml-vc80-r-${VERSION}.dll" + File "..\src\openobjectlib\sg\Multi-threaded Release DLL\openobjectlib_sg-vc80-r-${VERSION}.dll" + File "..\src\openassetlib\al\Multi-threaded Release DLL\openassetlib_al-vc80-r-${VERSION}.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:\Program Files\FFmpeg\lib\libogg-0.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:\OpenEXR\bin\Debug\Half.dll" + File "C:\OpenEXR\bin\Debug\Iex.dll" + File "C:\OpenEXR\bin\Debug\IlmImf.dll" + File "C:\OpenEXR\bin\Debug\Half.dll" + File "C:\OpenEXR\bin\Debug\IlmThread.dll" + File "C:\OpenEXR\bin\Debug\Imath.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" + 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" ; Python SetOutPath $INSTDIR\python\release @@ -222,59 +224,50 @@ 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-0_4_1.dll" + 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-0_4_1.dll" + File "..\src\openimagelib\plugins\dds\Multi-threaded Release DLL\openimagelib_dds-vc80-r-${VERSION}.dll" File "..\src\openimagelib\plugins\dpx\dpx_plugin.opl" - File "..\src\openimagelib\plugins\dpx\Multi-threaded Release DLL\openimagelib_dpx-vc80-r-0_4_1.dll" + File "..\src\openimagelib\plugins\dpx\Multi-threaded Release DLL\openimagelib_dpx-vc80-r-${VERSION}.dll" File "..\src\openimagelib\plugins\exr\exr_plugin.opl" - File "..\src\openimagelib\plugins\exr\Multi-threaded Release DLL\openimagelib_exr-vc80-r-0_4_1.dll" + File "..\src\openimagelib\plugins\exr\Multi-threaded Release DLL\openimagelib_exr-vc80-r-${VERSION}.dll" File "..\src\openimagelib\plugins\gdi+\gdi_plugin.opl" - File "..\src\openimagelib\plugins\gdi+\Multi-threaded Release DLL\openimagelib_gdi-vc80-r-0_4_1.dll" + File "..\src\openimagelib\plugins\gdi+\Multi-threaded Release DLL\openimagelib_gdi-vc80-r-${VERSION}.dll" File "..\src\openimagelib\plugins\hdr\hdr_plugin.opl" - File "..\src\openimagelib\plugins\hdr\Multi-threaded Release DLL\openimagelib_hdr-vc80-r-0_4_1.dll" + File "..\src\openimagelib\plugins\hdr\Multi-threaded Release DLL\openimagelib_hdr-vc80-r-${VERSION}.dll" File "..\src\openimagelib\plugins\sgi\sgi_plugin.opl" - File "..\src\openimagelib\plugins\sgi\Multi-threaded Release DLL\openimagelib_sgi-vc80-r-0_4_1.dll" + File "..\src\openimagelib\plugins\sgi\Multi-threaded Release DLL\openimagelib_sgi-vc80-r-${VERSION}.dll" File "..\src\openimagelib\plugins\tga\tga_plugin.opl" - File "..\src\openimagelib\plugins\tga\Multi-threaded Release DLL\openimagelib_tga-vc80-r-0_4_1.dll" - File "..\src\openimagelib\plugins\qim\qim_plugin.opl" - File "..\src\openimagelib\plugins\qim\Multi-threaded Release DLL\openimagelib_qim-vc80-r-0_4_1.dll" + File "..\src\openimagelib\plugins\tga\Multi-threaded Release DLL\openimagelib_tga-vc80-r-${VERSION}.dll" File "..\src\openmedialib\plugins\avformat\avformat_plugin.opl" - File "..\src\openmedialib\plugins\avformat\Multi-threaded Release DLL\openmedialib_avformat-vc80-r-0_4_1.dll" + File "..\src\openmedialib\plugins\avformat\Multi-threaded Release DLL\openmedialib_avformat-vc80-r-${VERSION}.dll" File "..\src\openmedialib\plugins\glew\glew_plugin.opl" - File "..\src\openmedialib\plugins\glew\Multi-threaded Release DLL\openmedialib_glew-vc80-r-0_4_1.dll" + File "..\src\openmedialib\plugins\glew\Multi-threaded Release DLL\openmedialib_glew-vc80-r-${VERSION}.dll" File "..\src\openmedialib\plugins\oil\oil_plugin.opl" - File "..\src\openmedialib\plugins\oil\Multi-threaded Release DLL\openmedialib_oil-vc80-r-0_4_1.dll" + 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-0_4_1.dll" - File "..\src\openmedialib\plugins\template\template_plugin.opl" - File "..\src\openmedialib\plugins\template\Multi-threaded Release DLL\openmedialib_template-vc80-r-0_4_1.dll" + 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-0_4_1.dll" + 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-0_4_1.dll" + 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-0_4_1.dll" + File "..\src\openmedialib\plugins\sdl\Multi-threaded Release DLL\openmedialib_sdl-vc80-r-${VERSION}.dll" File "..\src\openobjectlib\plugins\3ds\3ds_plugin.opl" - File "..\src\openobjectlib\plugins\3ds\Multi-threaded Release DLL\openobjectlib_3ds-vc80-r-0_4_1.dll" + File "..\src\openobjectlib\plugins\3ds\Multi-threaded Release DLL\openobjectlib_3ds-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-0_4_1.dll" - File "..\src\openobjectlib\plugins\tsto\tsto_plugin.opl" - File "..\src\openobjectlib\plugins\tsto\Multi-threaded Release DLL\openobjectlib_tsto-vc80-r-0_4_1.dll" + 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-0_4_1.dll" + 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-0_4_1.dll" + 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-0_4_1.dll" + File "..\src\openeffectslib\plugins\tonemap\Multi-threaded Release DLL\openeffectslib_tonemap-vc80-r-${VERSION}.dll" File "..\src\openassetlib\plugins\filesystem_storage_plugin\filesystem_storage_plugin.opl" - File "..\src\openassetlib\plugins\filesystem_storage_plugin\Multi-threaded Release DLL\openassetlib_filesystem-vc80-r-0_4_1.dll" + File "..\src\openassetlib\plugins\filesystem_storage_plugin\Multi-threaded Release DLL\openassetlib_filesystem-vc80-r-${VERSION}.dll" File "..\src\openassetlib\plugins\sqlite3_metadata_plugin\sqlite3_metadata_plugin.opl" - File "..\src\openassetlib\plugins\sqlite3_metadata_plugin\Multi-threaded Release DLL\openassetlib_sqlite3-vc80-r-0_4_1.dll" - - SetOutPath $INSTDIR\kernels - File "..\effects\kernels\sepia.gpu_kernel" - + File "..\src\openassetlib\plugins\sqlite3_metadata_plugin\Multi-threaded Release DLL\openassetlib_sqlite3-vc80-r-${VERSION}.dll" + SetOutPath $INSTDIR\shaders File "..\effects\shaders\sepia.cg" File "..\effects\shaders\sepia.frag" @@ -308,7 +301,7 @@ ;-------------------------------- ;Registry - WriteRegStr HKLM "Software\OpenLibraries" "CurrentVersion" "${VERSION}" + WriteRegStr HKLM "Software\OpenLibraries" "CurrentVersion" "${VERSION_DOT}" WriteRegStr HKLM "Software\OpenLibraries" "Installation type" "Runtime" WriteRegStr HKLM "Software\OpenLibraries" "PluginsDirRelease" "$INSTDIR\plugins\release" WriteRegStr HKLM "Software\OpenLibraries" "KernelsDir" "$INSTDIR\kernels" Property changes on: trunk/installer/openlibraries_runtime.nsi ___________________________________________________________________ Name: svn:eol-style + native Modified: trunk/installer/openlibraries_sdk.nsi =================================================================== --- trunk/installer/openlibraries_sdk.nsi 2007-10-28 11:24:51 UTC (rev 1316) +++ trunk/installer/openlibraries_sdk.nsi 2007-10-28 12:53:57 UTC (rev 1317) @@ -3,7 +3,8 @@ ;-------------------------------- !ifndef VERSION - !define VERSION 0.4.1 + !define VERSION 0_5_0 + !define VERSION_DOT 0.5.0 !endif ;-------------------------------- @@ -12,7 +13,7 @@ !ifdef OUTFILE OutFile "${OUTFILE}" !else - OutFile openlibraries-${VERSION}-sdk.exe + OutFile openlibraries-${VERSION_DOT}-sdk.exe !endif SetCompressor /SOLID lzma @@ -34,7 +35,7 @@ ;Names Name "OpenLibraries" -Caption "OpenLibraries (v.${VERSION}) Setup" +Caption "OpenLibraries (v.${VERSION_DOT}) Setup" ;Interface Settings !define MUI_ABORTWARNING @@ -46,7 +47,7 @@ !define MUI_COMPONENTSPAGE_SMALLDESC ;Pages -!define MUI_WELCOMEPAGE_TITLE "Welcome to the OpenLibraries (v.${VERSION}) Setup Wizard" +!define MUI_WELCOMEPAGE_TITLE "Welcome to the OpenLibraries (v.${VERSION_DOT}) Setup Wizard" !define MUI_WELCOMEPAGE_TEXT "This wizard will guide you through the installation of OpenLibraries.\r\n\r\n$_CLICK" !insertmacro MUI_PAGE_WELCOME @@ -108,72 +109,6 @@ 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 - - SectionIn 1 - SetOutPath $INSTDIR - - SetOverwrite on - SetShellVarContext all - - SetDetailsPrint textonly - DetailPrint "Installing MSXML4 SP2..." - SetDetailsPrint listonly - - SetOutPath $INSTDIR - File "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" SecCore SetDetailsPrint textonly @@ -185,12 +120,11 @@ SetOverwrite on - SetOutPath $INSTDIR\include\openlibraries-${VERSION}\openpluginlib\pl + SetOutPath $INSTDIR\include\openlibraries-${VERSION_DOT}\openpluginlib\pl File ..\src\openpluginlib\pl\allocatorstringstorage.h File ..\src\openpluginlib\pl\bind_info.hpp File ..\src\openpluginlib\pl\cg.hpp File ..\src\openpluginlib\pl\config.hpp - File ..\src\openpluginlib\pl\content_handler_libxml.hpp File ..\src\openpluginlib\pl\content_handler_msxml.hpp File ..\src\openpluginlib\pl\cowstringopt.h File ..\src\openpluginlib\pl\discovery_traits.hpp @@ -212,7 +146,7 @@ File ..\src\openpluginlib\pl\utf8_utils.hpp File ..\src\openpluginlib\pl\vectorstringstorage.h - SetOutPath $INSTDIR\include\openlibraries-${VERSION}\openpluginlib\pl\pcos + SetOutPath $INSTDIR\include\openlibraries-${VERSION_DOT}\openpluginlib\pl\pcos File ..\src\openpluginlib\pl\pcos\any.hpp File ..\src\openpluginlib\pl\pcos\iproperty_container.hpp File ..\src\openpluginlib\pl\pcos\isubject.hpp @@ -224,7 +158,7 @@ File ..\src\openpluginlib\pl\pcos\subject.hpp File ..\src\openpluginlib\pl\pcos\visitor.hpp - SetOutPath $INSTDIR\include\openlibraries-${VERSION}\openimagelib\il + SetOutPath $INSTDIR\include\openlibraries-${VERSION_DOT}\openimagelib\il File ..\src\openimagelib\il\basic_image.hpp File ..\src\openimagelib\il\compression_traits.hpp File ..\src\openimagelib\il\config.hpp @@ -237,7 +171,7 @@ File ..\src\openimagelib\il\utility.hpp File ..\src\openimagelib\il\yuv_traits.hpp - SetOutPath $INSTDIR\include\openlibraries-${VERSION}\openmedialib\ml + SetOutPath $INSTDIR\include\openlibraries-${VERSION_DOT}\openmedialib\ml File ..\src\openmedialib\ml\audio.hpp File ..\src\openmedialib\ml\config.hpp File ..\src\openmedialib\ml\filter.hpp @@ -248,7 +182,7 @@ File ..\src\openmedialib\ml\store.hpp File ..\src\openmedialib\ml\utilities.hpp - SetOutPath $INSTDIR\include\openlibraries-${VERSION}\openobjectlib\sg + SetOutPath $INSTDIR\include\openlibraries-${VERSION_DOT}\openobjectlib\sg File ..\src\openobjectlib\sg\appearance.hpp File ..\src\openobjectlib\sg\bbox_volume.hpp File ..\src\openobjectlib\sg\calculate_tangent_space.hpp @@ -267,7 +201,7 @@ File ..\src\openobjectlib\sg\spatial.hpp File ..\src\openobjectlib\sg\spirit.hpp - SetOutPath $INSTDIR\include\openlibraries-${VERSION}\openassetlib\al + SetOutPath $INSTDIR\include\openlibraries-${VERSION_DOT}\openassetlib\al File ..\src\openassetlib\al\al.hpp File ..\src\openassetlib\al\al_plugin.hpp File ..\src\openassetlib\al\asset.hpp @@ -277,44 +211,38 @@ File ..\src\openassetlib\al\set.hpp SetOutPath $INSTDIR\bin - File "..\src\openpluginlib\pl\Multi-threaded Debug DLL\openpluginlib_pl-vc80-d-0_4_1.dll" - File "..\src\openpluginlib\pl\Multi-threaded Release DLL\openpluginlib_pl-vc80-r-0_4_1.dll" - File "..\src\openimagelib\il\Multi-threaded Debug DLL\openimagelib_il-vc80-d-0_4_1.dll" - File "..\src\openimagelib\il\Multi-threaded Release DLL\openimagelib_il-vc80-r-0_4_1.dll" - File "..\src\openmedialib\ml\Multi-threaded Debug DLL\openmedialib_ml-vc80-d-0_4_1.dll" - File "..\src\openmedialib\ml\Multi-threaded Release DLL\openmedialib_ml-vc80-r-0_4_1.dll" - File "..\src\openobjectlib\sg\Multi-threaded Debug DLL\openobjectlib_sg-vc80-d-0_4_1.dll" - File "..\src\openobjectlib\sg\Multi-threaded Release DLL\openobjectlib_sg-vc80-r-0_4_1.dll" - File "..\src\openassetlib\al\Multi-threaded Debug DLL\openassetlib_al-vc80-d-0_4_1.dll" - File "..\src\openassetlib\al\Multi-threaded Release DLL\openassetlib_al-vc80-r-0_4_1.dll" + File "..\src\openpluginlib\pl\Multi-threaded Debug DLL\openpluginlib_pl-vc80-d-${VERSION}.dll" + File "..\src\openpluginlib\pl\Multi-threaded Release DLL\openpluginlib_pl-vc80-r-${VERSION}.dll" + File "..\src\openimagelib\il\Multi-threaded Debug DLL\openimagelib_il-vc80-d-${VERSION}.dll" + File "..\src\openimagelib\il\Multi-threaded Release DLL\openimagelib_il-vc80-r-${VERSION}.dll" + File "..\src\openmedialib\ml\Multi-threaded Debug DLL\openmedialib_ml-vc80-d-${VERSION}.dll" + File "..\src\openmedialib\ml\Multi-threaded Release DLL\openmedialib_ml-vc80-r-${VERSION}.dll" + File "..\src\openobjectlib\sg\Multi-threaded Debug DLL\openobjectlib_sg-vc80-d-${VERSION}.dll" + File "..\src\openobjectlib\sg\Multi-threaded Release DLL\openobjectlib_sg-vc80-r-${VERSION}.dll" + File "..\src\openassetlib\al\Multi-threaded Debug DLL\openassetlib_al-vc80-d-${VERSION}.dll" + File "..\src\openassetlib\al\Multi-threaded Release DLL\openassetlib_al-vc80-r-${VERSION}.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:\Program Files\FFmpeg\lib\libogg-0.dll" - File "C:\openexr-1.4.0-vs2005\bin\Half_dll_d.dll" - File "C:\openexr-1.4.0-vs2005\bin\Half_dll.dll" - File "C:\openexr-1.4.0-vs2005\bin\IlmImf_dll_d.dll" - File "C:\openexr-1.4.0-vs2005\bin\IlmImf_dll.dll" - File "C:\openexr-1.4.0-vs2005\bin\Iex_dll_d.dll" - File "C:\openexr-1.4.0-vs2005\bin\Iex_dll.dll" - File "C:\openexr-1.4.0-vs2005\bin\Imath_dll_d.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\zlib1d.dll" - File "C:\openexr-1.4.0-vs2005\bin\IlmThread_dll_d.dll" - File "C:\openexr-1.4.0-vs2005\bin\IlmThread_dll.dll" + File "C:\OpenEXR\bin\Debug\Half.dll" + File "C:\OpenEXR\bin\Debug\Iex.dll" + File "C:\OpenEXR\bin\Debug\IlmImf.dll" + File "C:\OpenEXR\bin\Debug\Half.dll" + File "C:\OpenEXR\bin\Debug\IlmThread.dll" + File "C:\OpenEXR\bin\Debug\Imath.dll" File "C:\SDL-1.2.12\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_34_1.dll" + File "C:\Windows\system32\msvcp71.dll" + File "C:\Windows\system32\msvcr71.dll" + File "C:\Windows\system32\glew32.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" ; Python SetOutPath $INSTDIR\python\release @@ -331,130 +259,127 @@ File "..\src\openassetlib\py\Multi-threaded Debug DLL\openassetlib.pyd" SetOutPath $INSTDIR\lib - File "..\src\openpluginlib\pl\Multi-threaded Debug DLL\openpluginlib_pl-vc80-d-0_4_1.lib" - File "..\src\openpluginlib\pl\Multi-threaded Release DLL\openpluginlib_pl-vc80-r-0_4_1.lib" - File "..\src\openimagelib\il\Multi-threaded Debug DLL\openimagelib_il-vc80-d-0_4_1.lib" - File "..\src\openimagelib\il\Multi-threaded Release DLL\openimagelib_il-vc80-r-0_4_1.lib" - File "..\src\openmedialib\ml\Multi-threaded Debug DLL\openmedialib_ml-vc80-d-0_4_1.lib" - File "..\src\openmedialib\ml\Multi-threaded Release DLL\openmedialib_ml-vc80-r-0_4_1.lib" - File "..\src\openobjectlib\sg\Multi-threaded Debug DLL\openobjectlib_sg-vc80-d-0_4_1.lib" - File "..\src\openobjectlib\sg\Multi-threaded Release DLL\openobjectlib_sg-vc80-r-0_4_1.lib" - File "..\src\openassetlib\al\Multi-threaded Debug DLL\openassetlib_al-vc80-d-0_4_1.lib" - File "..\src\openassetlib\al\Multi-threaded Release DLL\openassetlib_al-vc80-r-0_4_1.lib" + File "..\src\openpluginlib\pl\Multi-threaded Debug DLL\openpluginlib_pl-vc80-d-${VERSION}.lib" + File "..\src\openpluginlib\pl\Multi-threaded Release DLL\openpluginlib_pl-vc80-r-${VERSION}.lib" + File "..\src\openimagelib\il\Multi-threaded Debug DLL\openimagelib_il-vc80-d-${VERSION}.lib" + File "..\src\openimagelib\il\Multi-threaded Release DLL\openimagelib_il-vc80-r-${VERSION}.lib" + File "..\src\openmedialib\ml\Multi-threaded Debug DLL\openmedialib_ml-vc80-d-${VERSION}.lib" + File "..\src\openmedialib\ml\Multi-threaded Release DLL\openmedialib_ml-vc80-r-${VERSION}.lib" + File "..\src\openobjectlib\sg\Multi-threaded Debug DLL\openobjectlib_sg-vc80-d-${VERSION}.lib" + File "..\src\openobjectlib\sg\Multi-threaded Release DLL\openobjectlib_sg-vc80-r-${VERSION}.lib" + File "..\src\openassetlib\al\Multi-threaded Debug DLL\openassetlib_al-vc80-d-${VERSION}.lib" + File "..\src\openassetlib\al\Multi-threaded Release DLL\openassetlib_al-vc80-r-${VERSION}.lib" SetOutPath $INSTDIR\plugins\debug File "..\src\openimagelib\plugins\3D_lightmap\3D_lightmap_plugin.opl" - File "..\src\openimagelib\plugins\3D_lightmap\Multi-threaded Debug DLL\openimagelib_3D_lightmap-vc80-d-0_4_1.dll" + File "..\src\openimagelib\plugins\3D_lightmap\Multi-threaded Debug DLL\openimagelib_3D_lightmap-vc80-d-${VERSION}.dll" File "..\src\openimagelib\plugins\dds\dds_plugin.opl" - File "..\src\openimagelib\plugins\dds\Multi-threaded Debug DLL\openimagelib_dds-vc80-d-0_4_1.dll" + File "..\src\openimagelib\plugins\dds\Multi-threaded Debug DLL\openimagelib_dds-vc80-d-${VERSION}.dll" File "..\src\openimagelib\plugins\dpx\dpx_plugin.opl" - File "..\src\openimagelib\plugins\dpx\Multi-threaded Debug DLL\openimagelib_dpx-vc80-d-0_4_1.dll" + File "..\src\openimagelib\plugins\dpx\Multi-threaded Debug DLL\openimagelib_dpx-vc80-d-${VERSION}.dll" File "..\src\openimagelib\plugins\exr\exr_plugin.opl" - File "..\src\openimagelib\plugins\exr\Multi-threaded Debug DLL\openimagelib_exr-vc80-d-0_4_1.dll" + File "..\src\openimagelib\plugins\exr\Multi-threaded Debug DLL\openimagelib_exr-vc80-d-${VERSION}.dll" File "..\src\openimagelib\plugins\gdi+\gdi_plugin.opl" - File "..\src\openimagelib\plugins\gdi+\Multi-threaded Debug DLL\openimagelib_gdi-vc80-d-0_4_1.dll" + File "..\src\openimagelib\plugins\gdi+\Multi-threaded Debug DLL\openimagelib_gdi-vc80-d-${VERSION}.dll" File "..\src\openimagelib\plugins\hdr\hdr_plugin.opl" - File "..\src\openimagelib\plugins\hdr\Multi-threaded Debug DLL\openimagelib_hdr-vc80-d-0_4_1.dll" + File "..\src\openimagelib\plugins\hdr\Multi-threaded Debug DLL\openimagelib_hdr-vc80-d-${VERSION}.dll" File "..\src\openimagelib\plugins\sgi\sgi_plugin.opl" - File "..\src\openimagelib\plugins\sgi\Multi-threaded Debug DLL\openimagelib_sgi-vc80-d-0_4_1.dll" + File "..\src\openimagelib\plugins\sgi\Multi-threaded Debug DLL\openimagelib_sgi-vc80-d-${VERSION}.dll" File "..\src\openimagelib\plugins\tga\tga_plugin.opl" - File "..\src\openimagelib\plugins\tga\Multi-threaded Debug DLL\openimagelib_tga-vc80-d-0_4_1.dll" + File "..\src\openimagelib\plugins\tga\Multi-threaded Debug DLL\openimagelib_tga-vc80-d-${VERSION}.dll" File "..\src\openimagelib\plugins\qim\qim_plugin.opl" - File "..\src\openimagelib\plugins\qim\Multi-threaded Debug DLL\openimagelib_qim-vc80-d-0_4_1.dll" + File "..\src\openimagelib\plugins\qim\Multi-threaded Debug DLL\openimagelib_qim-vc80-d-${VERSION}.dll" File "..\src\openmedialib\plugins\avformat\avformat_plugin.opl" - File "..\src\openmedialib\plugins\avformat\Multi-threaded Debug DLL\openmedialib_avformat-vc80-d-0_4_1.dll" + File "..\src\openmedialib\plugins\avformat\Multi-threaded Debug DLL\openmedialib_avformat-vc80-d-${VERSION}.dll" File "..\src\openmedialib\plugins\glew\glew_plugin.opl" - File "..\src\openmedialib\plugins\glew\Multi-threaded Debug DLL\openmedialib_glew-vc80-d-0_4_1.dll" + File "..\src\openmedialib\plugins\glew\Multi-threaded Debug DLL\openmedialib_glew-vc80-d-${VERSION}.dll" File "..\src\openmedialib\plugins\oil\oil_plugin.opl" - File "..\src\openmedialib\plugins\oil\Multi-threaded Debug DLL\openmedialib_oil-vc80-d-0_4_1.dll" + File "..\src\openmedialib\plugins\oil\Multi-threaded Debug DLL\openmedialib_oil-vc80-d-${VERSION}.dll" File "..\src\openmedialib\plugins\openal\openal_plugin.opl" - File "..\src\openmedialib\plugins\openal\Multi-threaded Debug DLL\openmedialib_openal-vc80-d-0_4_1.dll" + File "..\src\openmedialib\plugins\openal\Multi-threaded Debug DLL\openmedialib_openal-vc80-d-${VERSION}.dll" File "..\src\openmedialib\plugins\template\template_plugin.opl" - File "..\src\openmedialib\plugins\template\Multi-threaded Debug DLL\openmedialib_template-vc80-d-0_4_1.dll" + File "..\src\openmedialib\plugins\template\Multi-threaded Debug DLL\openmedialib_template-vc80-d-${VERSION}.dll" File "..\src\openmedialib\plugins\gensys\gensys_plugin.opl" - File "..\src\openmedialib\plugins\gensys\Multi-threaded Debug DLL\openmedialib_gensys-vc80-d-0_4_1.dll" + File "..\src\openmedialib\plugins\gensys\Multi-threaded Debug DLL\openmedialib_gensys-vc80-d-${VERSION}.dll" File "..\src\openmedialib\plugins\quicktime\quicktime_plugin.opl" - File "..\src\openmedialib\plugins\quicktime\Multi-threaded Debug DLL\openmedialib_quicktime-vc80-d-0_4_1.dll" + File "..\src\openmedialib\plugins\quicktime\Multi-threaded Debug DLL\openmedialib_quicktime-vc80-d-${VERSION}.dll" File "..\src\openmedialib\plugins\sdl\sdl_plugin.opl" - File "..\src\openmedialib\plugins\sdl\Multi-threaded Debug DLL\openmedialib_sdl-vc80-d-0_4_1.dll" + File "..\src\openmedialib\plugins\sdl\Multi-threaded Debug DLL\openmedialib_sdl-vc80-d-${VERSION}.dll" File "..\src\openobjectlib\plugins\3ds\3ds_plugin.opl" - File "..\src\openobjectlib\plugins\3ds\Multi-threaded Debug DLL\openobjectlib_3ds-vc80-d-0_4_1.dll" + File "..\src\openobjectlib\plugins\3ds\Multi-threaded Debug DLL\openobjectlib_3ds-vc80-d-${VERSION}.dll" File "..\src\openobjectlib\plugins\model\model_plugin.opl" - File "..\src\openobjectlib\plugins\model\Multi-threaded Debug DLL\openobjectlib_model-vc80-d-0_4_1.dll" + File "..\src\openobjectlib\plugins\model\Multi-threaded Debug DLL\openobjectlib_model-vc80-d-${VERSION}.dll" File "..\src\openobjectlib\plugins\obj\obj_plugin.opl" - File "..\src\openobjectlib\plugins\obj\Multi-threaded Debug DLL\openobjectlib_obj-vc80-d-0_4_1.dll" + File "..\src\openobjectlib\plugins\obj\Multi-threaded Debug DLL\openobjectlib_obj-vc80-d-${VERSION}.dll" File "..\src\openobjectlib\plugins\tsto\tsto_plugin.opl" - File "..\src\openobjectlib\plugins\tsto\Multi-threaded Debug DLL\openobjectlib_tsto-vc80-d-0_4_1.dll" + File "..\src\openobjectlib\plugins\tsto\Multi-threaded Debug DLL\openobjectlib_tsto-vc80-d-${VERSION}.dll" File "..\src\openobjectlib\plugins\X3D\x3d_plugin.opl" - File "..\src\openobjectlib\plugins\X3D\Multi-threaded Debug DLL\openobjectlib_x3d-vc80-d-0_4_1.dll" + File "..\src\openobjectlib\plugins\X3D\Multi-threaded Debug DLL\openobjectlib_x3d-vc80-d-${VERSION}.dll" File "..\src\openobjectlib\plugins\Collada\collada_plugin.opl" - File "..\src\openobjectlib\plugins\Collada\Multi-threaded Debug DLL\openobjectlib_collada-vc80-d-0_4_1.dll" + File "..\src\openobjectlib\plugins\Collada\Multi-threaded Debug DLL\openobjectlib_collada-vc80-d-${VERSION}.dll" File "..\src\openeffectslib\plugins\tonemap\tonemap_plugin.opl" - File "..\src\openeffectslib\plugins\tonemap\Multi-threaded Debug DLL\openeffectslib_tonemap-vc80-d-0_4_1.dll" + File "..\src\openeffectslib\plugins\tonemap\Multi-threaded Debug DLL\openeffectslib_tonemap-vc80-d-${VERSION}.dll" File "..\src\openassetlib\plugins\filesystem_storage_plugin\filesystem_storage_plugin.opl" - File "..\src\openassetlib\plugins\filesystem_storage_plugin\Multi-threaded Debug DLL\openassetlib_filesystem-vc80-d-0_4_1.dll" + File "..\src\openassetlib\plugins\filesystem_storage_plugin\Multi-threaded Debug DLL\openassetlib_filesystem-vc80-d-${VERSION}.dll" File "..\src\openassetlib\plugins\sqlite3_metadata_plugin\sqlite3_metadata_plugin.opl" - File "..\src\openassetlib\plugins\sqlite3_metadata_plugin\Multi-threaded Debug DLL\openassetlib_sqlite3-vc80-d-0_4_1.dll" + File "..\src\openassetlib\plugins\sqlite3_metadata_plugin\Multi-threaded Debug DLL\openassetlib_sqlite3-vc80-d-${VERSION}.dll" 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-0_4_1.dll" + 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-0_4_1.dll" + File "..\src\openimagelib\plugins\dds\Multi-threaded Release DLL\openimagelib_dds-vc80-r-${VERSION}.dll" File "..\src\openimagelib\plugins\dpx\dpx_plugin.opl" - File "..\src\openimagelib\plugins\dpx\Multi-threaded Release DLL\openimagelib_dpx-vc80-r-0_4_1.dll" + File "..\src\openimagelib\plugins\dpx\Multi-threaded Release DLL\openimagelib_dpx-vc80-r-${VERSION}.dll" File "..\src\openimagelib\plugins\exr\exr_plugin.opl" - File "..\src\openimagelib\plugins\exr\Multi-threaded Release DLL\openimagelib_exr-vc80-r-0_4_1.dll" + File "..\src\openimagelib\plugins\exr\Multi-threaded Release DLL\openimagelib_exr-vc80-r-${VERSION}.dll" File "..\src\openimagelib\plugins\gdi+\gdi_plugin.opl" - File "..\src\openimagelib\plugins\gdi+\Multi-threaded Release DLL\openimagelib_gdi-vc80-r-0_4_1.dll" + File "..\src\openimagelib\plugins\gdi+\Multi-threaded Release DLL\openimagelib_gdi-vc80-r-${VERSION}.dll" File "..\src\openimagelib\plugins\hdr\hdr_plugin.opl" - File "..\src\openimagelib\plugins\hdr\Multi-threaded Release DLL\openimagelib_hdr-vc80-r-0_4_1.dll" + File "..\src\openimagelib\plugins\hdr\Multi-threaded Release DLL\openimagelib_hdr-vc80-r-${VERSION}.dll" File "..\src\openimagelib\plugins\sgi\sgi_plugin.opl" - File "..\src\openimagelib\plugins\sgi\Multi-threaded Release DLL\openimagelib_sgi-vc80-r-0_4_1.dll" + File "..\src\openimagelib\plugins\sgi\Multi-threaded Release DLL\openimagelib_sgi-vc80-r-${VERSION}.dll" File "..\src\openimagelib\plugins\tga\tga_plugin.opl" - File "..\src\openimagelib\plugins\tga\Multi-threaded Release DLL\openimagelib_tga-vc80-r-0_4_1.dll" + File "..\src\openimagelib\plugins\tga\Multi-threaded Release DLL\openimagelib_tga-vc80-r-${VERSION}.dll" File "..\src\openimagelib\plugins\qim\qim_plugin.opl" - File "..\src\openimagelib\plugins\qim\Multi-threaded Release DLL\openimagelib_qim-vc80-r-0_4_1.dll" + File "..\src\openimagelib\plugins\qim\Multi-threaded Release DLL\openimagelib_qim-vc80-r-${VERSION}.dll" File "..\src\openmedialib\plugins\avformat\avformat_plugin.opl" - File "..\src\openmedialib\plugins\avformat\Multi-threaded Release DLL\openmedialib_avformat-vc80-r-0_4_1.dll" + File "..\src\openmedialib\plugins\avformat\Multi-threaded Release DLL\openmedialib_avformat-vc80-r-${VERSION}.dll" ;File "..\src\openmedialib\plugins\dshow\dshow_plugin.opl" - ;File "..\src\openmedialib\plugins\dshow\Multi-threaded Release DLL\openmedialib_dshow-vc80-r-0_4_1.dll" + ;File "..\src\openmedialib\plugins\dshow\Multi-threaded Release DLL\openmedialib_dshow-vc80-r-${VERSION}.dll" File "..\src\openmedialib\plugins\glew\glew_plugin.opl" - File "..\src\openmedialib\plugins\glew\Multi-threaded Release DLL\openmedialib_glew-vc80-r-0_4_1.dll" + File "..\src\openmedialib\plugins\glew\Multi-threaded Release DLL\openmedialib_glew-vc80-r-${VERSION}.dll" File "..\src\openmedialib\plugins\oil\oil_plugin.opl" - File "..\src\openmedialib\plugins\oil\Multi-threaded Release DLL\openmedialib_oil-vc80-r-0_4_1.dll" + 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-0_4_1.dll" + File "..\src\openmedialib\plugins\openal\Multi-threaded Release DLL\openmedialib_openal-vc80-r-${VERSION}.dll" File "..\src\openmedialib\plugins\template\template_plugin.opl" - File "..\src\openmedialib\plugins\template\Multi-threaded Release DLL\openmedialib_template-vc80-r-0_4_1.dll" + File "..\src\openmedialib\plugins\template\Multi-threaded Release DLL\openmedialib_template-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-0_4_1.dll" + 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-0_4_1.dll" + 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-0_4_1.dll" + File "..\src\openmedialib\plugins\sdl\Multi-threaded Release DLL\openmedialib_sdl-vc80-r-${VERSION}.dll" File "..\src\openobjectlib\plugins\3ds\3ds_plugin.opl" - File "..\src\openobjectlib\plugins\3ds\Multi-threaded Release DLL\openobjectlib_3ds-vc80-r-0_4_1.dll" + File "..\src\openobjectlib\plugins\3ds\Multi-threaded Release DLL\openobjectlib_3ds-vc80-r-${VERSION}.dll" File "..\src\openobjectlib\plugins\model\model_plugin.opl" - File "..\src\openobjectlib\plugins\model\Multi-threaded Release DLL\openobjectlib_model-vc80-r-0_4_1.dll" + File "..\src\openobjectlib\plugins\model\Multi-threaded Release DLL\openobjectlib_model-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-0_4_1.dll" + File "..\src\openobjectlib\plugins\obj\Multi-threaded Release DLL\openobjectlib_obj-vc80-r-${VERSION}.dll" File "..\src\openobjectlib\plugins\tsto\tsto_plugin.opl" - File "..\src\openobjectlib\plugins\tsto\Multi-threaded Release DLL\openobjectlib_tsto-vc80-r-0_4_1.dll" + File "..\src\openobjectlib\plugins\tsto\Multi-threaded Release DLL\openobjectlib_tsto-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-0_4_1.dll" + 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-0_4_1.dll" + 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-0_4_1.dll" + File "..\src\openeffectslib\plugins\tonemap\Multi-threaded Release DLL\openeffectslib_tonemap-vc80-r-${VERSION}.dll" File "..\src\openassetlib\plugins\filesystem_storage_plugin\filesystem_sto... [truncated message content] |