From 678cc132f942ff4d84a803550eedf96acc543bca Mon Sep 17 00:00:00 2001 From: tobigun Date: Sun, 23 May 2010 09:07:15 +0000 Subject: update to trunk rev. 2391 git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/experimental@2401 b956fd51-792f-4845-bead-9b4dfca2ff2c --- cmake/installer/settings/GameExplorer.nsh | 198 ----- cmake/installer/settings/files_main_install.nsh | 90 ++- cmake/installer/settings/files_main_uninstall.nsh | 71 +- cmake/installer/settings/files_opt_songs.nsh | 931 ++++++++++++++++++++++ cmake/installer/settings/functions.nsh | 153 +--- cmake/installer/settings/settings-1031.ini | 197 +++-- cmake/installer/settings/settings-1033.ini | 201 +++-- cmake/installer/settings/settings-1038.ini | 161 ++++ cmake/installer/settings/variables.nsh | 22 +- 9 files changed, 1438 insertions(+), 586 deletions(-) delete mode 100644 cmake/installer/settings/GameExplorer.nsh create mode 100644 cmake/installer/settings/files_opt_songs.nsh create mode 100644 cmake/installer/settings/settings-1038.ini (limited to 'cmake/installer/settings') diff --git a/cmake/installer/settings/GameExplorer.nsh b/cmake/installer/settings/GameExplorer.nsh deleted file mode 100644 index d5056661..00000000 --- a/cmake/installer/settings/GameExplorer.nsh +++ /dev/null @@ -1,198 +0,0 @@ -# user interface - -!define GameExplorer_GenerateGUID '!insertmacro GameExplorer_GenerateGUID' -!define GameExplorer_AddGame '!insertmacro GameExplorer_AddGame' -!define GameExplorer_UpdateGame '!insertmacro GameExplorer_UpdateGame' -!define GameExplorer_RemoveGame '!insertmacro GameExplorer_RemoveGame' - -# internal stuff - -!define CLSCTX_INPROC_SERVER 1 -!define IID_IGameExplorer {E7B2FB72-D728-49B3-A5F2-18EBF5F1349E} -!define CLSID_GameExplorer {9A5EA990-3034-4D6F-9128-01F3C61022BC} - -!define GIS_CURRENT_USER 2 -!define GIS_ALL_USERS 3 - -!define IGameExplorer_QueryInterface 0 -!define IGameExplorer_AddRef 1 -!define IGameExplorer_Release 2 -!define IGameExplorer_AddGame 3 -!define IGameExplorer_RemoveGame 4 -!define IGameExplorer_UpdateGame 5 -!define IGameExplorer_VerifyAccess 6 - -# includes - -!include LogicLib.nsh - -# the actual code - -!macro GameExplorer_GenerateGUID - - System::Call 'ole32::CoCreateGuid(g .s)' - -!macroend - -!macro GameExplorer_AddGame CONTEXT GDF INSTDIR EXE GUID - - !define __GAME_EXPLORER_UNIQUE "${__LINE__}${__FILE__}" - - Push $0 - Push $1 - - Push $R0 - Push $R1 - Push $R2 - Push $R3 - - Push "${EXE}" - Push "${GUID}" - Push "${INSTDIR}" - Push "${GDF}" - - Pop $R0 # == ${GDF} - Pop $R1 # == ${INSTDIR} - Pop $R2 # == ${GUID} - Pop $R3 # == ${EXE} - - ClearErrors - - System::Call "ole32::CoCreateInstance( \ - g '${CLSID_GameExplorer}', i 0, \ - i ${CLSCTX_INPROC_SERVER}, \ - g '${IID_IGameExplorer}', *i .r1) i .r0" - - ${If} $0 != 0 # S_OK - - SetErrors - Goto "done_${__GAME_EXPLORER_UNIQUE}" - - ${EndIf} - - !if ${CONTEXT} == all - - System::Call "$1->${IGameExplorer_AddGame}(w R0, w R1, i ${GIS_ALL_USERS}, g R2) i .r0" - - !else if ${CONTEXT} == user - - System::Call "$1->${IGameExplorer_AddGame}(w R1, w R0, i ${GIS_CURRENT_USER}, g R2) i .r0" - - !else - - !error "Invalid CONTEXT passed to GameExplorer_AddGame! Must be `user` or `all`." - - !endif - - ${If} $0 != 0 # S_OK - - SetErrors - - ${Else} - - # Create play task - - !if ${CONTEXT} == all - - SetShellVarContext all - - !else if if ${CONTEXT} == user - - SetShellVarContext user - - !endif - - CreateDirectory $APPDATA\Microsoft\Windows\GameExplorer\$R2\PlayTasks\0 - CreateShortcut $APPDATA\Microsoft\Windows\GameExplorer\$R2\PlayTasks\0\Play.lnk $R3 - - ${EndIf} - - System::Call "$1->${IGameExplorer_Release}()" - - "done_${__GAME_EXPLORER_UNIQUE}:" - - Pop $R3 - Pop $R2 - Pop $R1 - Pop $R0 - - Pop $1 - Pop $0 - - !undef __GAME_EXPLORER_UNIQUE - -!macroend - -!macro _GameExplorer_GUID_Function Function GUID - - !define __GAME_EXPLORER_UNIQUE "${__LINE__}${__FILE__}" - - Push $0 - Push $1 - Push $2 - Push $3 - Push $4 - Push $5 - - Push $R0 - - Push "${GUID}" - - Pop $R0 # == ${GUID} - - System::Alloc 16 - Exch $R0 - System::Call "ole32::CLSIDFromString(w s, i R0)" - System::Call "*$R0(i .r2, i .r3, i .r4, i .r5)" - System::Free $R0 - - ClearErrors - - System::Call "ole32::CoCreateInstance( \ - g '${CLSID_GameExplorer}', i 0, \ - i ${CLSCTX_INPROC_SERVER}, \ - g '${IID_IGameExplorer}', *i .r1) i .r0" - - ${If} $0 != 0 # S_OK - - SetErrors - Goto "done_${__GAME_EXPLORER_UNIQUE}" - - ${EndIf} - - System::Call "$1->${Function}(i r2, i r3, i r4, i r5) i .r0" - - ${If} $0 != 0 # S_OK - - SetErrors - - ${EndIf} - - System::Call "$1->${IGameExplorer_Release}()" - - "done_${__GAME_EXPLORER_UNIQUE}:" - - Pop $R0 - - Pop $5 - Pop $4 - Pop $3 - Pop $2 - Pop $1 - Pop $0 - - !undef __GAME_EXPLORER_UNIQUE - -!macroend - -!macro GameExplorer_UpdateGame GUID - - !insertmacro _GameExplorer_GUID_Function ${IGameExplorer_UpdateGame} "${GUID}" - -!macroend - -!macro GameExplorer_RemoveGame GUID - - !insertmacro _GameExplorer_GUID_Function ${IGameExplorer_RemoveGame} "${GUID}" - -!macroend \ No newline at end of file diff --git a/cmake/installer/settings/files_main_install.nsh b/cmake/installer/settings/files_main_install.nsh index c2cdf727..a79d4991 100644 --- a/cmake/installer/settings/files_main_install.nsh +++ b/cmake/installer/settings/files_main_install.nsh @@ -2,55 +2,89 @@ ; UltraStar Deluxe Installer: Main components ; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ +; Remove old files from previous versions +IfFileExists $INSTDIR\ScoreConverter.exe 0 +2 +Delete "$INSTDIR\ScoreConverter.exe" +IfFileExists $INSTDIR\USdx.exe 0 +2 +Delete "$INSTDIR\USdx.exe" +IfFileExists $INSTDIR\covers.cache 0 +2 +Delete "$INSTDIR\covers.cache" +IfFileExists $INSTDIR\avcodec-51.dll 0 +2 +Delete "$INSTDIR\avcodec-51.dll" +IfFileExists $INSTDIR\avformat-50.dll 0 +2 +Delete "$INSTDIR\avformat-50.dll" +IfFileExists $INSTDIR\avutil-49.dll 0 +2 +Delete "$INSTDIR\avutil-49.dll" +IfFileExists $INSTDIR\bass.dll 0 +2 +Delete "$INSTDIR\bass.dll" +IfFileExists $INSTDIR\SDL.dll 0 +2 +Delete "$INSTDIR\SDL.dll" +IfFileExists $INSTDIR\sqlite3.dll 0 +2 +Delete "$INSTDIR\sqlite3.dll" + +RMDir /r "$INSTDIR\Themes" +RMDir /r "$INSTDIR\Skins" +RMDir /r "$INSTDIR\Plugins" +RMDir /r "$INSTDIR\Languages" + ; Create Directories: -CreateDirectory $INSTDIR\Plugins -CreateDirectory $INSTDIR\Songs -CreateDirectory $INSTDIR\Screenshots -CreateDirectory $INSTDIR\Playlists -CreateDirectory $INSTDIR\Covers +CreateDirectory $INSTDIR\plugins +CreateDirectory $INSTDIR\covers +CreateDirectory $INSTDIR\songs -SetOutPath "$INSTDIR" +${If} ${AtLeastWinVista} + + ; Create folders in appdata for current user + SetShellVarContext current + CreateDirectory $APPDATA\ultrastardx + CreateDirectory $APPDATA\ultrastardx\screenshots + CreateDirectory $APPDATA\ultrastardx\playlists + + SetOutPath "$INSTDIR" + + CreateShortCut "screenshots.lnk" "$APPDATA\ultrastardx\screenshots" + CreateShortCut "playlists.lnk" "$APPDATA\ultrastardx\playlists" + CreateShortCut "config.ini.lnk" "$APPDATA\ultrastardx\config.ini" + + SetShellVarContext all +${EndIf} ; themes, languages, sounds, fonts, visuals dir -File /r ..\game\themes -File /r ..\game\languages -File /r ..\game\sounds -File /r ..\game\fonts -File /r ..\installerdependencies\visuals +SetOutPath "$INSTDIR" + +File /r /x .svn /x .gitignore ..\game\themes +File /r /x .svn /x .gitignore ..\game\languages +File /r /x .svn /x .gitignore ..\game\sounds +File /r /x .svn /x .gitignore ..\game\fonts +File /r /x .svn /x .gitignore ..\game\resources +File /r /x .svn /x .gitignore ..\game\visuals ; Root dir: -File ..\installerdependencies\dll\*.dll +File .\dependencies\dll\*.dll File ..\ChangeLog.txt -File ..\ChangeLog.german.txt +File ..\ChangeLog.GERMAN.txt +File ..\game\LuaCommands.odt File ..\README.txt -File ..\installerdependencies\documents\documentation.pdf -File ..\installerdependencies\documents\license.txt +File .\dependencies\documents\license.txt +File .\dependencies\documents\documentation.pdf -File "..\ScoreConverter.exe" File "..\${exe}.exe" ; Covers dir: -SetOutPath "$INSTDIR\Covers" +SetOutPath "$INSTDIR\covers" IfFileExists $INSTDIR\covers\covers.ini +2 0 -File ..\game\covers\Covers.ini +File ..\game\covers\covers.ini File ..\game\covers\NoCover.jpg ; Plugins dir: -SetOutPath "$INSTDIR\Plugins\" - File "..\Plugins\*.dll" - -${If} ${AtLeastWinVista} - - SetOutPath "$WINDIR" - File "..\installerdependencies\plugins\gdf.dll" - -${EndIf} +SetOutPath "$INSTDIR\plugins\" +File "..\game\plugins\*.*" -SetOutPath "$INSTDIR" +SetOutPath "$INSTDIR" \ No newline at end of file diff --git a/cmake/installer/settings/files_main_uninstall.nsh b/cmake/installer/settings/files_main_uninstall.nsh index af61cb0b..ed2259bf 100644 --- a/cmake/installer/settings/files_main_uninstall.nsh +++ b/cmake/installer/settings/files_main_uninstall.nsh @@ -2,17 +2,16 @@ ; UltraStar Deluxe Uninstaller: Main components ; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ - ; Delete created Icons in startmenu SetShellVarContext all - RMDir /r "$SMPROGRAMS\$ICONS_GROUP\" ; Delete created Icon on Desktop Delete "$Desktop\Play UltraStar Deluxe.lnk" Delete "$Desktop\UltraStar Deluxe spielen.lnk" + Delete "$Desktop\UltraStar Deluxe karaoke.lnk" ; Remove dirs @@ -21,32 +20,41 @@ RMDir /r "$INSTDIR\fonts" RMDir /r "$INSTDIR\languages" RMDir /r "$INSTDIR\visuals" + RMDir /r "$INSTDIR\resources" RMDir /r "$INSTDIR\sounds" ; Delete remaining files - Delete "$INSTDIR\ScoreConverter.exe" Delete "$INSTDIR\${exe}.exe" - Delete "$INSTDIR\Changelog.german.txt" - Delete "$INSTDIR\Changelog.txt" + Delete "$INSTDIR\ChangeLog.GERMAN.txt" + Delete "$INSTDIR\ChangeLog.txt" + Delete "$INSTDIR\LuaCommands.odt" Delete "$INSTDIR\documentation.pdf" - Delete "$INSTDIR\License.txt" - Delete "$INSTDIR\config.ini" + Delete "$INSTDIR\license.txt" Delete "$INSTDIR\README.txt" + Delete "$INSTDIR\screenshots.lnk" + Delete "$INSTDIR\playlists.lnk" + Delete "$INSTDIR\config.ini.lnk" + Delete "$INSTDIR\Error.log" - Delete "$INSTDIR\covers.cache" + Delete "$INSTDIR\Benchmark.log" Delete "$INSTDIR\cover.db" - Delete "$INSTDIR\avcodec-51.dll" - Delete "$INSTDIR\avformat-50.dll" - Delete "$INSTDIR\avutil-49.dll" + Delete "$INSTDIR\avcodec-52.dll" + Delete "$INSTDIR\avformat-52.dll" + Delete "$INSTDIR\avfilter-1.dll" + Delete "$INSTDIR\avdevice-52.dll" + Delete "$INSTDIR\avutil-50.dll" Delete "$INSTDIR\bass.dll" + Delete "$INSTDIR\freetype6.dll" Delete "$INSTDIR\glew32.dll" Delete "$INSTDIR\jpeg.dll" - Delete "$INSTDIR\libfreetype-6.dll" Delete "$INSTDIR\libpng12-0.dll" Delete "$INSTDIR\libprojectM.dll" Delete "$INSTDIR\libtiff-3.dll" + Delete "$INSTDIR\lua5.1.dll" + Delete "$INSTDIR\lua51.dll" + Delete "$INSTDIR\pcre3.dll" Delete "$INSTDIR\portaudio_x86.dll" Delete "$INSTDIR\portmixer.dll" Delete "$INSTDIR\projectM-cwrapper.dll" @@ -54,29 +62,46 @@ Delete "$INSTDIR\SDL_image.dll" Delete "$INSTDIR\SDL_ttf.dll" Delete "$INSTDIR\sqlite3.dll" + Delete "$INSTDIR\swscale-0.dll" Delete "$INSTDIR\zlib1.dll" -${If} ${AtLeastWinVista} - Delete "$WINDIR\gdf.dll" -${EndIf} + StrCpy $0 "$INSTDIR\songs" + Call un.DeleteIfEmpty + StrCpy $0 "$INSTDIR\covers" + Call un.DeleteIfEmpty - RMDir "$INSTDIR\songs\Dead Smiling Pirates - I 18" - RMDir "$INSTDIR\songs\Joshua Morin - On The Run" - RMDir "$INSTDIR\songs\Pornophonique - Space Invaders" - RMDir "$INSTDIR\songs\Steven Dunston - Northern Star" + StrCpy $0 "$INSTDIR\screenshots" + Call un.DeleteIfEmpty - StrCpy $0 "$INSTDIR\songs" + StrCpy $0 "$INSTDIR\playlists" Call un.DeleteIfEmpty - Delete "$INSTDIR\covers\NoCover.jpg" + ; Clean up AppData - StrCpy $0 "$INSTDIR\screenshots" + SetShellVarContext current + + Delete "$APPDATA\ultrastardx\Error.log" + Delete "$APPDATA\ultrastardx\Benchmark.log" + Delete "$APPDATA\ultrastardx\cover.db" + + StrCpy $0 "$APPDATA\ultrastardx\covers" Call un.DeleteIfEmpty - StrCpy $0 "$INSTDIR\playlists" + StrCpy $0 "$APPDATA\ultrastardx\songs" Call un.DeleteIfEmpty + StrCpy $0 "$APPDATA\ultrastardx\screenshots" + Call un.DeleteIfEmpty + + StrCpy $0 "$APPDATA\ultrastardx\playlists" + Call un.DeleteIfEmpty + + StrCpy $0 "$APPDATA\ultrastardx" + Call un.DeleteIfEmpty + + SetShellVarContext all + ; Self delete: Delete "$INSTDIR\Uninstall.exe" diff --git a/cmake/installer/settings/files_opt_songs.nsh b/cmake/installer/settings/files_opt_songs.nsh new file mode 100644 index 00000000..d8d4ef28 --- /dev/null +++ b/cmake/installer/settings/files_opt_songs.nsh @@ -0,0 +1,931 @@ +; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ +; UltraStar Deluxe Installer: Download optional songs +; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ + +SectionGroup $(name_section2) Section2 + +;----------------------------------------------------------------------- +; BODO WARTKE +;----------------------------------------------------------------------- +Section /o "Bodo Wartke - Liebeslied (Love Song)" g2Section1 + + AddSize 10343 + SetOverwrite try + SetOutPath "$INSTDIR\songs\" + +; Download song: + NSISdl::download /TIMEOUT=50000 ${download_song1} $LOCALAPPDATA\Temp\Song-BodoWartke-LoveSong.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-BodoWartke-LoveSong.zip" "$INSTDIR\songs\" + + Delete "$LOCALAPPDATA\Temp\Song-BodoWartke-LoveSong.zip" + + SetOutPath "$INSTDIR" + +SectionEnd + +;----------------------------------------------------------------------- +; Dead Smiling Pirates - I 18 +;----------------------------------------------------------------------- + +Section /o "Dead Smiling Pirates - I 18" g2Section2 + AddSize 2816 + SetOverwrite try + SetOutPath "$INSTDIR" + CreateDirectory "$INSTDIR\songs\Dead Smiling Pirates - I 18" + SetOutPath "$INSTDIR\songs\Dead Smiling Pirates - I 18\" + +; Download song: + NSISdl::download /TIMEOUT=50000 ${download_song2} $LOCALAPPDATA\Temp\Song-I-18.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-I-18.zip" "$INSTDIR\songs\Dead Smiling Pirates - I 18\" + + Delete "$LOCALAPPDATA\Temp\Song-I-18.zip" + + SetOutPath "$INSTDIR" + +SectionEnd + +;----------------------------------------------------------------------- +; Jonathan Coulton Songs +;----------------------------------------------------------------------- + +SectionGroup $(name_s2_sub1) s2_sub1 + +Section /o "A Talk With George" s2_sub1_Section15 + + AddSize 4076 + SetOverwrite try + SetOutPath "$INSTDIR\songs\" + +; Download song: + NSISdl::download /TIMEOUT=50000 ${download_sub1_song15} $LOCALAPPDATA\Temp\Song-JC-ATWG.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-ATWG.zip" "$INSTDIR\songs\" + + Delete "$LOCALAPPDATA\Temp\Song-JC-ATWG.zip" + + SetOutPath "$INSTDIR" +SectionEnd +;----------------------------------------------------------------------- +Section /o "Better" s2_sub1_Section19 + + AddSize 4199 + SetOverwrite try + SetOutPath "$INSTDIR\songs\" + +; Download song: + NSISdl::download /TIMEOUT=50000 ${download_sub1_song19} $LOCALAPPDATA\Temp\Song-JC-Better.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-Better.zip" "$INSTDIR\songs\" + + Delete "$LOCALAPPDATA\Temp\Song-JC-Better.zip" + + SetOutPath "$INSTDIR" + +SectionEnd +;----------------------------------------------------------------------- +Section /o "Monkey Shines" s2_sub1_Section1 + + AddSize 1455 + SetOverwrite try + SetOutPath "$INSTDIR\songs\" + +; Download song: + NSISdl::download /TIMEOUT=50000 ${download_sub1_song1} $LOCALAPPDATA\Temp\Song-JC-MS.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-MS.zip" "$INSTDIR\songs\" + + Delete "$LOCALAPPDATA\Temp\Song-JC-MS.zip" + + SetOutPath "$INSTDIR" + +SectionEnd +;----------------------------------------------------------------------- +Section /o "I Crush Everything" s2_sub1_Section2 + + AddSize 7127 + SetOverwrite try + SetOutPath "$INSTDIR\songs\" + +; Download song: + NSISdl::download /TIMEOUT=50000 ${download_sub1_song2} $LOCALAPPDATA\Temp\Song-JC-ICE.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-ICE.zip" "$INSTDIR\songs\" + + Delete "$LOCALAPPDATA\Temp\Song-JC-ICE.zip" + + SetOutPath "$INSTDIR" + +SectionEnd +;----------------------------------------------------------------------- +Section /o "Not About You" s2_sub1_Section3 + + AddSize 3492 + SetOverwrite try + SetOutPath "$INSTDIR\songs\" + +; Download song: + NSISdl::download /TIMEOUT=50000 ${download_sub1_song3} $LOCALAPPDATA\Temp\Song-JC-NAY.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-NAY.zip" "$INSTDIR\songs\" + + Delete "$LOCALAPPDATA\Temp\Song-JC-NAY.zip" + + SetOutPath "$INSTDIR" + +SectionEnd +;----------------------------------------------------------------------- +Section /o "Mr. Fancy Pants" s2_sub1_Section4 + + AddSize 2427 + SetOverwrite try + SetOutPath "$INSTDIR\songs\" + +; Download song: + NSISdl::download /TIMEOUT=50000 ${download_sub1_song4} $LOCALAPPDATA\Temp\Song-JC-MFP.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-MFP.zip" "$INSTDIR\songs\" + + Delete "$LOCALAPPDATA\Temp\Song-JC-MFP.zip" + + SetOutPath "$INSTDIR" + +SectionEnd +;----------------------------------------------------------------------- +Section /o "Big Bad World One" s2_sub1_Section5 + + AddSize 4424 + SetOverwrite try + SetOutPath "$INSTDIR\songs\" + +; Download song: + NSISdl::download /TIMEOUT=50000 ${download_sub1_song5} $LOCALAPPDATA\Temp\Song-JC-BBWO.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-BBWO.zip" "$INSTDIR\songs\" + + Delete "$LOCALAPPDATA\Temp\Song-JC-BBWO.zip" + + SetOutPath "$INSTDIR" + +SectionEnd +;----------------------------------------------------------------------- +Section /o "Flickr" s2_sub1_Section6 + + AddSize 21607 + SetOverwrite try + SetOutPath "$INSTDIR\songs\" + +; Download song: + NSISdl::download /TIMEOUT=50000 ${download_sub1_song6} $LOCALAPPDATA\Temp\Song-JC-Flickr.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-Flickr.zip" "$INSTDIR\songs\" + + Delete "$LOCALAPPDATA\Temp\Song-JC-Flickr.zip" + + SetOutPath "$INSTDIR" + +SectionEnd +;----------------------------------------------------------------------- +Section /o "My Beige Bear" s2_sub1_Section7 + + AddSize 4926 + SetOverwrite try + SetOutPath "$INSTDIR\songs\" + +; Download song: + NSISdl::download /TIMEOUT=50000 ${download_sub1_song7} $LOCALAPPDATA\Temp\Song-JC-MBB.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-MBB.zip" "$INSTDIR\songs\" + + Delete "$LOCALAPPDATA\Temp\Song-JC-MBB.zip" + + SetOutPath "$INSTDIR" + +SectionEnd +;----------------------------------------------------------------------- +Section /o "The Future Soon" s2_sub1_Section8 + + AddSize 5612 + SetOverwrite try + SetOutPath "$INSTDIR\songs\" + +; Download song: + NSISdl::download /TIMEOUT=50000 ${download_sub1_song8} $LOCALAPPDATA\Temp\Song-JC-TFS.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-TFS.zip" "$INSTDIR\songs\" + + Delete "$LOCALAPPDATA\Temp\Song-JC-TFS.zip" + + SetOutPath "$INSTDIR" + +SectionEnd +;----------------------------------------------------------------------- +Section /o "Ikea" s2_sub1_Section9 + + AddSize 4608 + SetOverwrite try + SetOutPath "$INSTDIR\songs\" + +; Download song: + NSISdl::download /TIMEOUT=50000 ${download_sub1_song9} $LOCALAPPDATA\Temp\Song-JC-Ikea.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-Ikea.zip" "$INSTDIR\songs\" + + Delete "$LOCALAPPDATA\Temp\Song-JC-Ikea.zip" + + SetOutPath "$INSTDIR" + +SectionEnd +;----------------------------------------------------------------------- +Section /o "Furry Old Lobster" s2_sub1_Section10 + + AddSize 3288 + SetOverwrite try + SetOutPath "$INSTDIR\songs\" + +; Download song: + NSISdl::download /TIMEOUT=50000 ${download_sub1_song10} $LOCALAPPDATA\Temp\Song-JC-FOL.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-FOL.zip" "$INSTDIR\songs\" + + Delete "$LOCALAPPDATA\Temp\Song-JC-FOL.zip" + + SetOutPath "$INSTDIR" + +SectionEnd +;----------------------------------------------------------------------- +Section /o "Code Monkey" s2_sub1_Section11 + + AddSize 21402 + SetOverwrite try + SetOutPath "$INSTDIR\songs\" + +; Download song: + NSISdl::download /TIMEOUT=50000 ${download_sub1_song11} $LOCALAPPDATA\Temp\Song-JC-CM.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-CM.zip" "$INSTDIR\songs\" + + Delete "$LOCALAPPDATA\Temp\Song-JC-CM.zip" + + SetOutPath "$INSTDIR" + +SectionEnd +;----------------------------------------------------------------------- +Section /o "I´m Your Moon" s2_sub1_Section12 + + AddSize 4916 + SetOverwrite try + SetOutPath "$INSTDIR\songs\" + +; Download song: + NSISdl::download /TIMEOUT=50000 ${download_sub1_song12} $LOCALAPPDATA\Temp\Song-JC-IYM.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-IYM.zip" "$INSTDIR\songs\" + + Delete "$LOCALAPPDATA\Temp\Song-JC-IYM.zip" + + SetOutPath "$INSTDIR" + +SectionEnd +;----------------------------------------------------------------------- +Section /o "First Of May" s2_sub1_Section13 + + AddSize 6257 + SetOverwrite try + SetOutPath "$INSTDIR\songs\" + +; Download song: + NSISdl::download /TIMEOUT=50000 ${download_sub1_song13} $LOCALAPPDATA\Temp\Song-JC-FOM.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-FOM.zip" "$INSTDIR\songs\" + + Delete "$LOCALAPPDATA\Temp\Song-JC-FOM.zip" + + SetOutPath "$INSTDIR" + +SectionEnd +;----------------------------------------------------------------------- +Section /o "Dance, Soterious Johnson, Dance" s2_sub1_Section14 + + AddSize 5929 + SetOverwrite try + SetOutPath "$INSTDIR\songs\" + +; Download song: + NSISdl::download /TIMEOUT=50000 ${download_sub1_song14} $LOCALAPPDATA\Temp\Song-JC-DSJD.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-DSJD.zip" "$INSTDIR\songs\" + + Delete "$LOCALAPPDATA\Temp\Song-JC-DSJD.zip" + + SetOutPath "$INSTDIR" + +SectionEnd +;----------------------------------------------------------------------- +Section /o "Creepy Doll" s2_sub1_Section16 + + AddSize 66560 + SetOverwrite try + SetOutPath "$INSTDIR\songs\" + +; Download song: + NSISdl::download /TIMEOUT=50000 ${download_sub1_song16} $LOCALAPPDATA\Temp\Song-JC-CD.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-CD.zip" "$INSTDIR\songs\" + + Delete "$LOCALAPPDATA\Temp\Song-JC-CD.zip" + + SetOutPath "$INSTDIR" + +SectionEnd +;----------------------------------------------------------------------- +Section /o "That Spells DNA" s2_sub1_Section17 + + AddSize 4158 + SetOverwrite try + SetOutPath "$INSTDIR\songs\" + +; Download song: + NSISdl::download /TIMEOUT=50000 ${download_sub1_song17} $LOCALAPPDATA\Temp\Song-JC-TSDNA.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-TSDNA.zip" "$INSTDIR\songs\" + + Delete "$LOCALAPPDATA\Temp\Song-JC-TSDNA.zip" + + SetOutPath "$INSTDIR" + +SectionEnd +;----------------------------------------------------------------------- +Section /o "When You Go" s2_sub1_Section18 + + AddSize 5755 + SetOverwrite try + SetOutPath "$INSTDIR\songs\" + +; Download song: + NSISdl::download /TIMEOUT=50000 ${download_sub1_song18} $LOCALAPPDATA\Temp\Song-JC-WYG.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-WYG.zip" "$INSTDIR\songs\" + + Delete "$LOCALAPPDATA\Temp\Song-JC-WYG.zip" + + SetOutPath "$INSTDIR" + +SectionEnd +;----------------------------------------------------------------------- +Section /o "Shop Vac" s2_sub1_Section20 + + AddSize 5448 + SetOverwrite try + SetOutPath "$INSTDIR\songs\" + +; Download song: + NSISdl::download /TIMEOUT=50000 ${download_sub1_song20} $LOCALAPPDATA\Temp\Song-JC-SV.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-SV.zip" "$INSTDIR\songs\" + + Delete "$LOCALAPPDATA\Temp\Song-JC-SV.zip" + + SetOutPath "$INSTDIR" + +SectionEnd +;----------------------------------------------------------------------- +Section /o "I Feel Fantastic" s2_sub1_Section21 + + AddSize 3851 + SetOverwrite try + SetOutPath "$INSTDIR\songs\" + +; Download song: + NSISdl::download /TIMEOUT=50000 ${download_sub1_song21} $LOCALAPPDATA\Temp\Song-JC-IFF.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-IFF.zip" "$INSTDIR\songs\" + + Delete "$LOCALAPPDATA\Temp\Song-JC-IFF.zip" + + SetOutPath "$INSTDIR" + +SectionEnd +;----------------------------------------------------------------------- +Section /o "Re: Your Brains" s2_sub1_Section22 + + AddSize 7087 + SetOverwrite try + SetOutPath "$INSTDIR\songs\" + +; Download song: + NSISdl::download /TIMEOUT=50000 ${download_sub1_song22} $LOCALAPPDATA\Temp\Song-JC-ReYB.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-ReYB.zip" "$INSTDIR\songs\" + + Delete "$LOCALAPPDATA\Temp\Song-JC-ReYB.zip" + + SetOutPath "$INSTDIR" + +SectionEnd +;----------------------------------------------------------------------- +Section /o "Skullcrusher Mountain" s2_sub1_Section23 + + AddSize 6298 + SetOverwrite try + SetOutPath "$INSTDIR\songs\" + +; Download song: + NSISdl::download /TIMEOUT=50000 ${download_sub1_song23} $LOCALAPPDATA\Temp\Song-JC-SCM.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-SCM.zip" "$INSTDIR\songs\" + + Delete "$LOCALAPPDATA\Temp\Song-JC-SCM.zip" + + SetOutPath "$INSTDIR" + +SectionEnd +;----------------------------------------------------------------------- +Section /o "Chiron Beta Prime" s2_sub1_Section24 + + AddSize 38298 + SetOverwrite try + SetOutPath "$INSTDIR\songs\" + +; Download song: + NSISdl::download /TIMEOUT=50000 ${download_sub1_song24} $LOCALAPPDATA\Temp\Song-JC-CBP.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-CBP.zip" "$INSTDIR\songs\" + + Delete "$LOCALAPPDATA\Temp\Song-JC-CBP.zip" + + SetOutPath "$INSTDIR" + +SectionEnd + +SectionGroupEnd +;----------------------------------------------------------------------- +; Joshua Morin - On The Run +;----------------------------------------------------------------------- +Section /o "Joshua Morin - On The Run" g2Section3 + AddSize 3881 + SetOverwrite try + SetOutPath "$INSTDIR" + CreateDirectory "$INSTDIR\songs\Joshua Morin - On The Run" + SetOutPath "$INSTDIR\songs\Joshua Morin - On The Run\" + +; Download song: + NSISdl::download /TIMEOUT=50000 ${download_song3} $LOCALAPPDATA\Temp\Song-On-the-run.zip + + Pop $R0 ;Get the return value + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-On-the-run.zip" "$INSTDIR\songs\Joshua Morin - On The Run\" + + Delete "$LOCALAPPDATA\Temp\Song-On-the-run.zip" + + SetOutPath "$INSTDIR" + +SectionEnd +;----------------------------------------------------------------------- +; Pornophonique +;----------------------------------------------------------------------- +SectionGroup $(name_s2_sub4) s2_sub4 + +Section /o "Pornophonique - Space Invaders" g2Section4 + AddSize 3646 + SetOverwrite try + SetOutPath "$INSTDIR" + CreateDirectory "$INSTDIR\songs\Pornophonique - Space Invaders" + SetOutPath "$INSTDIR\songs\Pornophonique - Space Invaders\" + +; Download song: + NSISdl::download /TIMEOUT=50000 ${download_song4} $LOCALAPPDATA\Temp\Song-Space-Invaders.zip + + Pop $R0 ;Get the return value + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-Space-Invaders.zip" "$INSTDIR\songs\Pornophonique - Space Invaders\" + + Delete "$LOCALAPPDATA\Temp\Song-Space-Invaders.zip" + + SetOutPath "$INSTDIR" + +SectionEnd +;----------------------------------------------------------------------- +Section /o "Pornophonique - Space Invaders (Karaoke)" g2Section6 + AddSize 3779 + SetOverwrite try + SetOutPath "$INSTDIR\songs" + +; Download song: + NSISdl::download /TIMEOUT=50000 ${download_song6} $LOCALAPPDATA\Temp\Song-SpaceInvadersKAR.zip + + Pop $R0 ;Get the return value + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-SpaceInvadersKAR.zip" "$INSTDIR\songs\" + + Delete "$LOCALAPPDATA\Temp\Song-SpaceInvadersKAR.zip" + + SetOutPath "$INSTDIR" + +SectionEnd + +SectionGroupEnd +;----------------------------------------------------------------------- +; Shearer +;----------------------------------------------------------------------- +SectionGroup $(name_s2_sub2) s2_sub2 + +Section /o "Shearer - 69" s2_sub2_Section1 + + AddSize 4557 + SetOverwrite try + SetOutPath "$INSTDIR\songs\" + +; Download song: + NSISdl::download /TIMEOUT=50000 ${download_sub2_song1} $LOCALAPPDATA\Temp\Song-Shearer-69.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-Shearer-69.zip" "$INSTDIR\songs\" + + Delete "$LOCALAPPDATA\Temp\Song-Shearer-69.zip" + + SetOutPath "$INSTDIR" + +SectionEnd +;----------------------------------------------------------------------- +Section /o "Shearer - 69 (Karaoke)" s2_sub2_Section2 + + AddSize 4772 + SetOverwrite try + SetOutPath "$INSTDIR\songs\" + +; Download song: + NSISdl::download /TIMEOUT=50000 ${download_sub2_song2} $LOCALAPPDATA\Temp\Song-Shearer-69-Kar.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-Shearer-69-Kar.zip" "$INSTDIR\songs\" + + Delete "$LOCALAPPDATA\Temp\Song-Shearer-69-Kar.zip" + + SetOutPath "$INSTDIR" + +SectionEnd +;----------------------------------------------------------------------- +Section /o "Shearer - Can't stop it" s2_sub2_Section3 + + AddSize 5510 + SetOverwrite try + SetOutPath "$INSTDIR\songs\" + +; Download song: + NSISdl::download /TIMEOUT=50000 ${download_sub2_song3} $LOCALAPPDATA\Temp\Song-Shearer-CSI.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-Shearer-CSI.zip" "$INSTDIR\songs\" + + Delete "$LOCALAPPDATA\Temp\Song-Shearer-CSI.zip" + + SetOutPath "$INSTDIR" + +SectionEnd +;----------------------------------------------------------------------- +Section /o "Shearer - Can't stop it (Karaoke)" s2_sub2_Section4 + + AddSize 4178 + SetOverwrite try + SetOutPath "$INSTDIR\songs\" + +; Download song: + NSISdl::download /TIMEOUT=50000 ${download_sub2_song4} $LOCALAPPDATA\Temp\Song-Shearer-CSI-Kar.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-Shearer-CSI-Kar.zip" "$INSTDIR\songs\" + + Delete "$LOCALAPPDATA\Temp\Song-Shearer-CSI-Kar.zip" + + SetOutPath "$INSTDIR" + +SectionEnd +;----------------------------------------------------------------------- +Section /o "Shearer - In My Hand" s2_sub2_Section5 + + AddSize 5960 + SetOverwrite try + SetOutPath "$INSTDIR\songs\" + +; Download song: + NSISdl::download /TIMEOUT=50000 ${download_sub2_song5} $LOCALAPPDATA\Temp\Song-Shearer-IMH.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-Shearer-IMH.zip" "$INSTDIR\songs\" + + Delete "$LOCALAPPDATA\Temp\Song-Shearer-IMH.zip" + + SetOutPath "$INSTDIR" + +SectionEnd +;----------------------------------------------------------------------- +Section /o "Shearer - Man Song" s2_sub2_Section6 + + AddSize 7270 + SetOverwrite try + SetOutPath "$INSTDIR\songs\" + +; Download song: + NSISdl::download /TIMEOUT=50000 ${download_sub2_song6} $LOCALAPPDATA\Temp\Song-Shearer-MS.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-Shearer-MS.zip" "$INSTDIR\songs\" + + Delete "$LOCALAPPDATA\Temp\Song-Shearer-MS.zip" + + SetOutPath "$INSTDIR" + +SectionEnd +;----------------------------------------------------------------------- +Section /o "Shearer - Man Song (Karaoke)" s2_sub2_Section7 + + AddSize 5807 + SetOverwrite try + SetOutPath "$INSTDIR\songs\" + +; Download song: + NSISdl::download /TIMEOUT=50000 ${download_sub2_song7} $LOCALAPPDATA\Temp\Song-Shearer-MS-Kar.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-Shearer-MS-Kar.zip" "$INSTDIR\songs\" + + Delete "$LOCALAPPDATA\Temp\Song-Shearer-MS-Kar.zip" + + SetOutPath "$INSTDIR" + +SectionEnd +;----------------------------------------------------------------------- +Section /o "Shearer - Stay With Me" s2_sub2_Section8 + + AddSize 6400 + SetOverwrite try + SetOutPath "$INSTDIR\songs\" + +; Download song: + NSISdl::download /TIMEOUT=50000 ${download_sub2_song8} $LOCALAPPDATA\Temp\Song-Shearer-SWM.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-Shearer-SWM.zip" "$INSTDIR\songs\" + + Delete "$LOCALAPPDATA\Temp\Song-Shearer-SWM.zip" + + SetOutPath "$INSTDIR" + +SectionEnd +;----------------------------------------------------------------------- +Section /o "Shearer - Stay With Me (Karaoke)" s2_sub2_Section9 + + AddSize 5417 + SetOverwrite try + SetOutPath "$INSTDIR\songs\" + +; Download song: + NSISdl::download /TIMEOUT=50000 ${download_sub2_song9} $LOCALAPPDATA\Temp\Song-Shearer-SWM-Kar.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-Shearer-SWM-Kar.zip" "$INSTDIR\songs\" + + Delete "$LOCALAPPDATA\Temp\Song-Shearer-SWM-Kar.zip" + + SetOutPath "$INSTDIR" + +SectionEnd +;----------------------------------------------------------------------- +SectionGroupEnd + +Section /o "Steven Dunston - Northern Star" g2Section5 + AddSize 2427 + SetOverwrite try + SetOutPath "$INSTDIR" + CreateDirectory "$INSTDIR\songs\Steven Dunston - Northern Star" + SetOutPath "$INSTDIR\songs\Steven Dunston - Northern Star\" + +; Download song: + NSISdl::download /TIMEOUT=50000 ${download_song5} $LOCALAPPDATA\Temp\Song-Northern-Star.zip + + Pop $R0 ;Get the return value + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-Northern-Star.zip" "$INSTDIR\songs\Steven Dunston - Northern Star\" + + Delete "$LOCALAPPDATA\Temp\Song-Northern-Star.zip" + + SetOutPath "$INSTDIR" + +SectionEnd +;----------------------------------------------------------------------- +; Wise Guys +;----------------------------------------------------------------------- +SectionGroup $(name_s2_sub3) s2_sub3 + +Section /o "Wise Guys - Lebendig und kräftig und schärfer" s2_sub3_Section1 + + AddSize 4015 + SetOverwrite try + SetOutPath "$INSTDIR\songs\" + +; Download song: + NSISdl::download /TIMEOUT=50000 ${download_sub3_song1} $LOCALAPPDATA\Temp\Song-WiseGuys-LUKUS.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-WiseGuys-LUKUS.zip" "$INSTDIR\songs\" + + Delete "$LOCALAPPDATA\Temp\Song-WiseGuys-LUKUS.zip" + + SetOutPath "$INSTDIR" + +SectionEnd +;----------------------------------------------------------------------- +Section /o "Wise Guys - Mensch, wo bist du?" s2_sub3_Section2 + + AddSize 5335 + SetOverwrite try + SetOutPath "$INSTDIR\songs\" + +; Download song: + NSISdl::download /TIMEOUT=50000 ${download_sub3_song2} $LOCALAPPDATA\Temp\Song-WiseGuys-MWBD.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-WiseGuys-MWBD.zip" "$INSTDIR\songs\" + + Delete "$LOCALAPPDATA\Temp\Song-WiseGuys-MWBD.zip" + + SetOutPath "$INSTDIR" + +SectionEnd +;----------------------------------------------------------------------- +Section /o "Wise Guys - Mensch, wo bist du? (Karaoke)" s2_sub3_Section3 + + AddSize 5335 + SetOverwrite try + SetOutPath "$INSTDIR\songs\" + +; Download song: + NSISdl::download /TIMEOUT=50000 ${download_sub3_song3} $LOCALAPPDATA\Temp\Song-WiseGuys-MWBDKar.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-WiseGuys-MWBDKar.zip" "$INSTDIR\songs\" + + Delete "$LOCALAPPDATA\Temp\Song-WiseGuys-MWBDKar.zip" + + SetOutPath "$INSTDIR" + +SectionEnd + +SectionGroupEnd + +SectionGroupEnd \ No newline at end of file diff --git a/cmake/installer/settings/functions.nsh b/cmake/installer/settings/functions.nsh index bbd4fea2..d437c9e1 100644 --- a/cmake/installer/settings/functions.nsh +++ b/cmake/installer/settings/functions.nsh @@ -2,11 +2,8 @@ ; checked on Finish Page Function CreateDesktopShortCuts - SetOutPath "$INSTDIR" - -CreateShortcut "$Desktop\$(sm_shortcut).lnk" "$INSTDIR\USdx.exe" - +CreateShortcut "$Desktop\$(sm_shortcut).lnk" "$INSTDIR\ultrastardx.exe" FunctionEnd ; Deletes only empty dirs which are @@ -27,30 +24,6 @@ Function un.DeleteIfEmpty FindClose $R0 FunctionEnd -; This is used to write a -; string to config.ini - -Function WriteToConfig - Exch $0 - Exch - Exch $1 - - FileOpen $0 $0 a - FileSeek $0 0 END - FileWrite $0 $1 - FileClose $0 - - Pop $1 - Pop $0 -FunctionEnd - -!macro WriteToConfig String File - Push "${String}" - Push "${File}" - Call WriteToConfig -!macroend -!define WriteToConfig "!insertmacro WriteToConfig" - ; Finds UltraStar Deluxe process ; @@ -74,126 +47,4 @@ FunctionEnd !macro nsProcess::Unload nsProcess::_Unload -!macroend - -Function OnCheckbox - GetDlgItem $R0 $HWNDPARENT 1 - Pop $0 # HWND - ${NSD_GetState} $0 $1 - IntCmp $1 1 _Next _Close - _Next: - SendMessage $R0 ${WM_SETTEXT} 0 "STR:$(button_next)" - goto _done - _Close: - SendMessage $R0 ${WM_SETTEXT} 0 "STR:$(button_close)" - _done: -FunctionEnd - -Function VersionCompare - !define VersionCompare `!insertmacro VersionCompareCall` - - !macro VersionCompareCall _VER1 _VER2 _RESULT - Push `${_VER1}` - Push `${_VER2}` - Call VersionCompare - Pop ${_RESULT} - !macroend - - Exch $1 - Exch - Exch $0 - Exch - Push $2 - Push $3 - Push $4 - Push $5 - Push $6 - Push $7 - - begin: - StrCpy $2 -1 - IntOp $2 $2 + 1 - StrCpy $3 $0 1 $2 - StrCmp $3 '' +2 - StrCmp $3 '.' 0 -3 - StrCpy $4 $0 $2 - IntOp $2 $2 + 1 - StrCpy $0 $0 '' $2 - - StrCpy $2 -1 - IntOp $2 $2 + 1 - StrCpy $3 $1 1 $2 - StrCmp $3 '' +2 - StrCmp $3 '.' 0 -3 - StrCpy $5 $1 $2 - IntOp $2 $2 + 1 - StrCpy $1 $1 '' $2 - - StrCmp $4$5 '' equal - - StrCpy $6 -1 - IntOp $6 $6 + 1 - StrCpy $3 $4 1 $6 - StrCmp $3 '0' -2 - StrCmp $3 '' 0 +2 - StrCpy $4 0 - - StrCpy $7 -1 - IntOp $7 $7 + 1 - StrCpy $3 $5 1 $7 - StrCmp $3 '0' -2 - StrCmp $3 '' 0 +2 - StrCpy $5 0 - - StrCmp $4 0 0 +2 - StrCmp $5 0 begin newer2 - StrCmp $5 0 newer1 - IntCmp $6 $7 0 newer1 newer2 - - StrCpy $4 '1$4' - StrCpy $5 '1$5' - IntCmp $4 $5 begin newer2 newer1 - - equal: - StrCpy $0 0 - goto end - newer1: - StrCpy $0 1 - goto end - newer2: - StrCpy $0 2 - - end: - Pop $7 - Pop $6 - Pop $5 - Pop $4 - Pop $3 - Pop $2 - Pop $1 - Exch $0 -FunctionEnd - -Function ReadFileLine -Exch $0 ;file -Exch -Exch $1 ;line number -Push $2 -Push $3 - - FileOpen $2 $0 r - StrCpy $3 0 - -Loop: - IntOp $3 $3 + 1 - ClearErrors - FileRead $2 $0 - IfErrors +2 - StrCmp $3 $1 0 loop - FileClose $2 - -Pop $3 -Pop $2 -Pop $1 -Exch $0 -FunctionEnd \ No newline at end of file +!macroend \ No newline at end of file diff --git a/cmake/installer/settings/settings-1031.ini b/cmake/installer/settings/settings-1031.ini index 9e588fcb..7f9573a1 100644 --- a/cmake/installer/settings/settings-1031.ini +++ b/cmake/installer/settings/settings-1031.ini @@ -1,136 +1,161 @@ [Settings] -NumFields=16 +NumFields=19 + +; Background Group of Settings Box +[Field 17] +Type=GroupBox +Left=0 +Top=0 +Right=300 +Bottom=140 +Text=UltraStar Deluxe Konfiguration (Optional) [Field 1] Type=Label Text="Vollbild Modus:" -Left=0 -Right=53 -Top=27 -Bottom=35 +Left=5 +Right=58 +Top=30 +Bottom=38 [Field 2] Type=Label Text="Sprache:" -Left=0 -Right=53 -Top=51 -Bottom=59 +Left=5 +Right=58 +Top=47 +Bottom=55 [Field 3] Type=Label Text="Auflösung:" -Left=0 -Right=53 -Top=73 -Bottom=81 +Left=5 +Right=58 +Top=64 +Bottom=72 [Field 4] Type=Label Text="Ordnerstruktur:" -Left=0 -Right=53 -Top=97 -Bottom=105 +Left=5 +Right=58 +Top=82 +Bottom=90 [Field 5] -Type=Label -Text="Animationen/Effekte:" -Left=0 -Right=70 -Top=124 -Bottom=132 - -[Field 6] -Type=Droplist +Type=DropList ListItems=On|Off State=On -Left=71 -Right=161 -Top=25 -Bottom=38 +Left=62 +Right=152 +Top=28 +Bottom=39 -[Field 7] -Type=Droplist -ListItems=Catalan|Croatian|Danish|Dutch|English|Euskara|French|German|Italian|Norwegian|Polish|Portuguese|Serbian|Slovak|Spanish|Swedish +[Field 6] +Type=DropList +ListItems=Catalan|Croatian|Dutch|English|Euskara|Finnish|French|German|Greek|Icelandic|Italian|Japanese|Luxembourgish|Portuguese|Spanish|Swedish State=German -Left=71 -Right=161 -Top=48 -Bottom=62 +Left=62 +Right=152 +Top=45 +Bottom=56 -[Field 8] -Type=Droplist +[Field 7] +Type=DropList ListItems=320x200|640x480|800x600|1024x768|1280x1024|1440x900|1680x1050|1920x1200 State=800x600 -Left=71 -Right=161 -Top=72 -Bottom=86 +Left=62 +Right=152 +Top=62 +Bottom=73 -[Field 9] -Type=Droplist +[Field 8] +Type=DropList ListItems=On|Off State=Off -Left=71 -Right=161 -Top=96 -Bottom=110 +Left=62 +Right=152 +Top=81 +Bottom=91 + +[Field 9] +Type=Label +Text=Spiel im Fenster oder Vollbild starten? +Left=157 +Right=300 +Top=30 +Bottom=38 [Field 10] -Type=Droplist -ListItems=On|Off -State=On -Left=71 -Right=161 -Top=121 -Bottom=136 +Type=Label +Text=Alle Einstellungen können nachträglich im Spielmenü geändert werden. +Left=5 +Right=246 +Top=14 +Bottom=23 [Field 11] Type=Label -Text="Wähle aus, ob das Spiel im Fenster oder \r\nals Vollbild gestartet werden soll." -Left=170 -Right=315 -Top=24 -Bottom=44 +Text=Passe die Sprache des Menüs an. +Left=158 +Right=300 +Top=46 +Bottom=55 [Field 12] Type=Label -Text="Hier können einige Einstellungen für UltraStar Deluxe vorgenommen werden.\r\nAlle Einstellungen können später im Spielmenü geändert werden." -Left=0 -Right=315 -Top=3 -Bottom=20 +Text=Wähle die Auflösung/Fenstergröße aus. +Left=157 +Right=300 +Top=64 +Bottom=72 [Field 13] Type=Label -Text="Wähle deine favorisierte Sprache, in der UltraStar Deluxe angezeigt werden soll." -Left=170 -Right=315 -Top=46 -Bottom=68 +Text=Eine virtuelle Ordnerstruktur zum Anzeigen der Lieder verwenden? +Left=158 +Right=300 +Top=78 +Bottom=94 [Field 14] Type=Label -Text="Wähle deine, dem Monitor angepasste, bevorzugte Auflösung." -Left=170 -Right=315 -Top=70 -Bottom=96 +Left=5 +Top=100 +Right=58 +Bottom=109 +Text=Sortierung: [Field 15] -Type=Label -Text="Wähle aus, ob UltraStar Deluxe eine Ordnerstruktur zum Anzeigen der Lieder verwenden soll." -Left=170 -Right=315 -Top=92 -Bottom=116 +Type=DropList +Left=62 +Top=100 +Right=152 +Bottom=111 +State=Artist +ListItems=Edition|Genre|Language|Folder|Title|Artist [Field 16] Type=Label -Text="Wähle, ob Spezialeffekte und \r\nAnimationen benutzt werden sollen." -Left=170 -Right=315 +Left=157 +Top=101 +Right=300 +Bottom=110 +Text=Kriterium zum Sortieren der Lieder wählen. + +[Field 18] +Type=DirRequest +Left=5 Top=121 -Bottom=137 +Right=152 +Bottom=132 +Text=SongDir +State= +[Field 19] +Type=Label +Left=158 +Top=119 +Right=295 +Bottom=134 +Text=Hier kann ein weiterer Ordner mit Songs für UltraStar Deluxe angegeben werden. diff --git a/cmake/installer/settings/settings-1033.ini b/cmake/installer/settings/settings-1033.ini index 17a08a8c..5e6b6055 100644 --- a/cmake/installer/settings/settings-1033.ini +++ b/cmake/installer/settings/settings-1033.ini @@ -1,136 +1,161 @@ [Settings] -NumFields=16 +NumFields=19 + +; Background Group of Settings Box +[Field 17] +Type=GroupBox +Left=1 +Top=1 +Right=300 +Bottom=140 +Text=UltraStar Deluxe Konfiguration (Optional) [Field 1] Type=Label Text="Fullscreen Mode:" -Left=0 -Right=50 -Top=27 -Bottom=35 +Left=5 +Right=58 +Top=30 +Bottom=38 [Field 2] Type=Label Text="Language:" -Left=0 -Right=50 -Top=51 -Bottom=59 +Left=5 +Right=58 +Top=47 +Bottom=55 [Field 3] Type=Label Text="Resolution:" -Left=0 -Right=50 -Top=73 -Bottom=81 +Left=5 +Right=58 +Top=64 +Bottom=72 [Field 4] Type=Label Text="Tabs:" -Left=0 -Right=50 -Top=100 -Bottom=108 +Left=5 +Right=58 +Top=82 +Bottom=90 [Field 5] -Type=Label -Text="Animations/Effects:" -Left=0 -Right=67 -Top=124 -Bottom=132 - -[Field 6] -Type=Droplist +Type=DropList ListItems=On|Off State=On -Left=70 -Right=160 -Top=24 -Bottom=36 +Left=62 +Right=152 +Top=28 +Bottom=39 -[Field 7] -Type=Droplist -ListItems=Catalan|Croatian|Danish|Dutch|English|Euskara|French|German|Italian|Norwegian|Polish|Portuguese|Serbian|Slovak|Spanish|Swedish -State=English -Left=70 -Right=160 -Top=48 -Bottom=60 +[Field 6] +Type=DropList +ListItems=Catalan|Croatian|Dutch|English|Euskara|Finnish|French|German|Greek|Icelandic|Italian|Japanese|Luxembourgish|Portuguese|Spanish|Swedish +State=German +Left=62 +Right=152 +Top=45 +Bottom=56 -[Field 8] -Type=Droplist +[Field 7] +Type=DropList ListItems=320x200|640x480|800x600|1024x768|1280x1024|1440x900|1680x1050|1920x1200 State=800x600 -Left=70 -Right=160 -Top=72 -Bottom=86 +Left=62 +Right=152 +Top=62 +Bottom=73 -[Field 9] -Type=Droplist +[Field 8] +Type=DropList ListItems=On|Off State=Off -Left=70 -Right=160 -Top=99 -Bottom=113 +Left=62 +Right=152 +Top=81 +Bottom=91 + +[Field 9] +Type=Label +Text=Start game in window or fullscreen? +Left=157 +Right=300 +Top=30 +Bottom=38 [Field 10] -Type=Droplist -ListItems=On|Off -State=On -Left=70 -Right=160 -Top=123 -Bottom=137 +Type=Label +Text=All settings can also be changed in the GUI later. +Left=5 +Right=246 +Top=14 +Bottom=23 [Field 11] Type=Label -Text="Choose if you want to run UltraStar Deluxe in a window or fullscreen." -Left=170 -Right=305 -Top=25 -Bottom=46 +Text=Adjust the GUI language. +Left=158 +Right=300 +Top=46 +Bottom=55 [Field 12] Type=Label -Text="Choose your favorite language, in that UltraStar Deluxe should be displayed." -Left=170 -Right=305 -Top=48 -Bottom=70 +Text=Choose screen resolution/window size. +Left=157 +Right=300 +Top=64 +Bottom=72 [Field 13] Type=Label -Text="Choose your favorite screen resolution for UltraStar Deluxe adjusted to your display device." -Left=170 -Right=305 -Top=72 -Bottom=97 +Text=Employ a virtual folder structure to show songs? +Left=158 +Right=300 +Top=78 +Bottom=94 [Field 14] Type=Label -Text="Choose whether you would like to view folders in UltraStar Deluxe or not." -Left=170 -Right=305 -Top=99 -Bottom=122 +Left=5 +Top=100 +Right=58 +Bottom=109 +Text=Sorting: [Field 15] -Type=Label -Text="Here you can define some settings for UltraStar Deluxe. The settings can\r\nalso be changed in the GUI later." -Left=0 -Right=289 -Top=3 -Bottom=20 +Type=DropList +Left=62 +Top=100 +Right=152 +Bottom=111 +State=Artist +ListItems=Edition|Genre|Language|Folder|Title|Artist [Field 16] Type=Label -Text="Choose if special effects or animations should be used by UltraStar Deluxe. Recommended: On" -Left=170 -Right=305 -Top=123 -Bottom=139 +Left=157 +Top=101 +Right=300 +Bottom=110 +Text=Select criterion to sort songs. + +[Field 18] +Type=DirRequest +Left=5 +Top=121 +Right=152 +Bottom=132 +Text=SongDir +State= +[Field 19] +Type=Label +Left=158 +Top=119 +Right=295 +Bottom=134 +Text=Choose additional song directory for UltraStar Deluxe. \ No newline at end of file diff --git a/cmake/installer/settings/settings-1038.ini b/cmake/installer/settings/settings-1038.ini new file mode 100644 index 00000000..62994a1f --- /dev/null +++ b/cmake/installer/settings/settings-1038.ini @@ -0,0 +1,161 @@ +[Settings] +NumFields=19 + +; Background Group of Settings Box +[Field 17] +Type=GroupBox +Left=1 +Top=1 +Right=300 +Bottom=140 +Text=UltraStar Deluxe Konfiguration (Optional) + +[Field 1] +Type=Label +Text="Teljes képernyõs mód:" +Left=5 +Right=58 +Top=30 +Bottom=38 + +[Field 2] +Type=Label +Text="Nyelv:" +Left=5 +Right=58 +Top=47 +Bottom=55 + +[Field 3] +Type=Label +Text="Felbontás:" +Left=5 +Right=58 +Top=64 +Bottom=72 + +[Field 4] +Type=Label +Text="Tabs:" +Left=5 +Right=58 +Top=82 +Bottom=90 + +[Field 5] +Type=DropList +ListItems=On|Off +State=On +Left=62 +Right=152 +Top=28 +Bottom=39 + +[Field 6] +Type=DropList +ListItems=Catalan|Croatian|Dutch|English|Euskara|Finnish|French|German|Greek|Icelandic|Italian|Japanese|Luxembourgish|Portuguese|Spanish|Swedish +State=German +Left=62 +Right=152 +Top=45 +Bottom=56 + +[Field 7] +Type=DropList +ListItems=320x200|640x480|800x600|1024x768|1280x1024|1440x900|1680x1050|1920x1200 +State=800x600 +Left=62 +Right=152 +Top=62 +Bottom=73 + +[Field 8] +Type=DropList +ListItems=On|Off +State=Off +Left=62 +Right=152 +Top=81 +Bottom=91 + +[Field 9] +Type=Label +Text=Start game in window or fullscreen? +Left=157 +Right=300 +Top=30 +Bottom=38 + +[Field 10] +Type=Label +Text=All settings can also be changed in the GUI later. +Left=5 +Right=246 +Top=14 +Bottom=23 + +[Field 11] +Type=Label +Text=Adjust the GUI language. +Left=158 +Right=300 +Top=46 +Bottom=55 + +[Field 12] +Type=Label +Text=Choose screen resolution/window size. +Left=157 +Right=300 +Top=64 +Bottom=72 + +[Field 13] +Type=Label +Text=Employ a virtual folder structure to show songs? +Left=158 +Right=300 +Top=78 +Bottom=94 + +[Field 14] +Type=Label +Left=5 +Top=100 +Right=58 +Bottom=109 +Text=Sorting: + +[Field 15] +Type=DropList +Left=62 +Top=100 +Right=152 +Bottom=111 +State=Artist +ListItems=Edition|Genre|Language|Folder|Title|Artist + +[Field 16] +Type=Label +Left=157 +Top=101 +Right=300 +Bottom=110 +Text=Select criterion to sort songs. + +[Field 18] +Type=DirRequest +Left=5 +Top=121 +Right=152 +Bottom=132 +Text=SongDir +State= + +[Field 19] +Type=Label +Left=158 +Top=119 +Right=295 +Bottom=134 +Text=Choose additional song directory for UltraStar Deluxe. diff --git a/cmake/installer/settings/variables.nsh b/cmake/installer/settings/variables.nsh index db98d89f..5d79e115 100644 --- a/cmake/installer/settings/variables.nsh +++ b/cmake/installer/settings/variables.nsh @@ -4,17 +4,18 @@ ; Product Information: -!define version "1.1a" ; Make sure version is also set in onInit +!define version "1.1beta" ; Make sure version is also set in onInit !define name "UltraStar Deluxe" !define publisher "USDX Team" !define homepage "http://www.ultrastardeluxe.org" !define forum "http://forum.ultrastardeluxe.org" +!define wiki "http://wiki.ultrastardeluxe.org" -!define exe "USdx" +!define exe "ultrastardx" -!define license "..\installerdependencies\documents\license.txt" +!define license ".\dependencies\documents\license.txt" ; Icons @@ -34,15 +35,16 @@ !define PRODUCT_WEB_SITE "${homepage}" !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${name}" !define PRODUCT_UNINST_ROOT_KEY "HKLM" -!define PRODUCT_STARTMENU_REGVAL "NSIS:StartMenuDir" ; Download URLs for Songs and Themes: +; SONGS +!define download_song1 "http://downloads.sourceforge.net/ultrastardx/usdx_song-bodo_wartke_-_liebeslied.zip" !define download_song2 "http://downloads.sourceforge.net/ultrastardx/usdx_song-dead_smiling_pirates_-_i_18.zip" !define download_song3 "http://downloads.sourceforge.net/ultrastardx/usdx_song-joshua_morin_-_on_the_run.zip" !define download_song4 "http://downloads.sourceforge.net/ultrastardx/usdx_song-pornophonique_-_space_-_invaders.zip" !define download_song5 "http://downloads.sourceforge.net/ultrastardx/usdx_song-steven_dunston_-_northern_star.zip" -!define download_song1 "http://downloads.sourceforge.net/ultrastardx/usdx_song-bodo_wartke_-_liebeslied.zip" +!define download_song6 "http://downloads.sourceforge.net/ultrastardx/usdx_song-pornophonique_-_space_invaders_kar.zip" !define download_sub1_song1 "http://downloads.sourceforge.net/ultrastardx/usdx_song-jonathan_coulton_-_monkey_shines.zip" !define download_sub1_song2 "http://downloads.sourceforge.net/ultrastardx/usdx_song-jonathan_coulton_-_i_crush_everything.zip" @@ -81,11 +83,7 @@ !define download_sub3_song1 "http://downloads.sourceforge.net/ultrastardx/usdx_song-wise_guys_-_lebendig_und_kraeftig_und_schaerfer.zip" !define download_sub3_song2 "http://downloads.sourceforge.net/ultrastardx/usdx_song-wise_guys_-_mensch_wo_bist_du.zip" +!define download_sub3_song3 "http://downloads.sourceforge.net/ultrastardx/usdx_song-wise_guys_-_mensch_wo_bist_du_kar.zip" -!define download_theme1 "http://downloads.sourceforge.net/ultrastardx/usdx_skin-orange_by_Skar.zip" -!define download_theme2 "http://downloads.sourceforge.net/ultrastardx/usdx_skin-Streetlight_by_Skar.zip" -!define download_theme3 "http://downloads.sourceforge.net/ultrastardx/usdx_skin-Vistar_by_Skar.zip" -!define download_theme4 "http://downloads.sourceforge.net/ultrastardx/usdx_skin-bluesensationV5.1_by_Charis.zip" -!define download_theme6 "http://downloads.sourceforge.net/ultrastardx/usdx_skin-WiiStar_by_MasterPhW.zip" -!define download_theme7 "http://downloads.sourceforge.net/ultrastardx/usdx_skin-istar_by_MezzoX.zip" -!define download_theme5 "http://downloads.sourceforge.net/ultrastardx/usdx_skin-whitesensationV101_by_Charis.zip" \ No newline at end of file +; THEMES +; (removed theme section - currently no additional skins available for this usdx version) \ No newline at end of file -- cgit v1.2.3