aboutsummaryrefslogtreecommitdiffstats
path: root/Installer
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--Installer/Readme.txt16
-rw-r--r--Installer/UltraStar Deluxe.nsi17
-rw-r--r--Installer/images/Thumbs.dbbin12800 -> 0 bytes
-rw-r--r--Installer/images/mce.pngbin56081 -> 0 bytes
-rw-r--r--Installer/plugins/Games.dllbin61440 -> 0 bytes
-rw-r--r--Installer/settings/files_in.nsh28
-rw-r--r--Installer/settings/functions.nsh2
-rw-r--r--Installer/settings/variables.nsh9
-rw-r--r--InstallerDependencies/README-SDL.txt13
-rw-r--r--InstallerDependencies/dll/SDL.dll (renamed from InstallerDependencies/SDL.dll)bin320512 -> 320512 bytes
-rw-r--r--InstallerDependencies/dll/bass.dll (renamed from InstallerDependencies/bass.dll)bin93240 -> 93240 bytes
-rw-r--r--InstallerDependencies/dll/smpeg.dll (renamed from InstallerDependencies/smpeg.dll)bin209920 -> 209920 bytes
-rw-r--r--InstallerDependencies/dll/sqlite3.dll (renamed from InstallerDependencies/sqlite3.dll)bin388126 -> 388126 bytes
-rw-r--r--InstallerDependencies/documents/Changelog.german.txt (renamed from InstallerDependencies/Changelog.german.txt)0
-rw-r--r--InstallerDependencies/documents/Changelog.txt (renamed from InstallerDependencies/Changelog.txt)0
-rw-r--r--InstallerDependencies/documents/License.txt (renamed from InstallerDependencies/License.txt)0
-rw-r--r--InstallerDependencies/documents/ReadMe.txt (renamed from InstallerDependencies/ReadMe.txt)0
-rw-r--r--InstallerDependencies/documents/documentation.pdf (renamed from InstallerDependencies/documentation.pdf)bin575306 -> 575306 bytes
-rw-r--r--InstallerDependencies/icons/uninstall.ico (renamed from Installer/icons/uninstall.ico)bin22486 -> 22486 bytes
-rw-r--r--InstallerDependencies/icons/ustar.ico (renamed from Installer/icons/ustar.ico)bin22486 -> 22486 bytes
-rw-r--r--InstallerDependencies/images/header.bmp (renamed from Installer/images/header.bmp)bin25818 -> 25818 bytes
-rw-r--r--InstallerDependencies/images/left.bmp (renamed from Installer/images/left.bmp)bin618006 -> 618006 bytes
-rw-r--r--InstallerDependencies/images/modern.bmp (renamed from Installer/images/modern.bmp)bin1652 -> 1652 bytes
-rw-r--r--InstallerDependencies/plugins/NSISdl.dll (renamed from Installer/plugins/NSISdl.dll)bin14848 -> 14848 bytes
-rw-r--r--InstallerDependencies/plugins/gdf.dll (renamed from Installer/plugins/gdf.dll)bin159744 -> 159744 bytes
-rw-r--r--InstallerDependencies/plugins/nsProcess.dll (renamed from Installer/plugins/nsProcess.dll)bin4096 -> 4096 bytes
-rw-r--r--InstallerDependencies/plugins/nsisunz.dll (renamed from Installer/plugins/nsisunz.dll)bin40960 -> 40960 bytes
27 files changed, 43 insertions, 42 deletions
diff --git a/Installer/Readme.txt b/Installer/Readme.txt
index 7cfbd4de..f3e72b98 100644
--- a/Installer/Readme.txt
+++ b/Installer/Readme.txt
@@ -1,18 +1,18 @@
-SOURCE (2th of November 2007, 23:35 UTC+1 MESZ)
+SOURCE (3th of November 2007, 14:00 UTC+1 MESZ)
Build using Nullsoft Install System
-(http://nsis.sourceforge.net/Download)
+(http://nsis.sourceforge.net/)
----------------------------------------
-Plugins
----------------------------------------
+-----------------------------------------------
+Dependencies
+-----------------------------------------------
The installer needs the plugins
-within the plugins dir.
+within the ..\InstallerDependencies\plugins dir.
--------------------------------------------
+-----------------------------------------------
Custom language files (Dir: clanguage):
--------------------------------------------
+-----------------------------------------------
Place the edited custom languages files in:
diff --git a/Installer/UltraStar Deluxe.nsi b/Installer/UltraStar Deluxe.nsi
index 59b33eda..b38f7ca3 100644
--- a/Installer/UltraStar Deluxe.nsi
+++ b/Installer/UltraStar Deluxe.nsi
@@ -8,8 +8,8 @@
!include ".\settings\functions.nsh"
!include "WinVer.nsh"
-!define icon_inst ".\icons\ustar.ico" ; Icon for Installation
-!define icon_uninst ".\icons\uninstall.ico" ; Icon for Uninstallation
+!define icon_inst "..\InstallerDependencies\icons\ustar.ico" ; Icon for Installation
+!define icon_uninst "..\InstallerDependencies\icons\uninstall.ico" ; Icon for Uninstallation
SetCompress Auto
SetCompressor /SOLID lzma
@@ -24,7 +24,7 @@ SetDatablockOptimize On
!include ".\settings\variables.nsh"
-!addPluginDir ".\plugins\"
+!addPluginDir "..\InstallerDependencies\plugins\"
; -------------------------------
; Strings for Installation Wizard
@@ -247,11 +247,12 @@ Section $(sec1) Section1
; Create shortcuts
- SetOutPath $INSTDIR\
+ SetOutPath "$INSTDIR"
!insertmacro MUI_STARTMENU_WRITE_BEGIN Application
SetShellVarContext all
+ SetOutPath "$INSTDIR"
CreateDirectory "${p_name}"
CreateDirectory "$SMPROGRAMS\$ICONS_GROUP"
@@ -338,6 +339,8 @@ nsisunz::Unzip "$TEMP\Song-I-18.zip" "$INSTDIR\Songs\Dead Smiling Pirates - I 18
Delete "$TEMP\Song-I-18.zip"
+ SetOutPath "$INSTDIR"
+
SectionEnd
Section /o "Steven Dunston - Northern Star" g2Section2
@@ -358,6 +361,8 @@ nsisunz::Unzip "$TEMP\Song-Northern-Star.zip" "$INSTDIR\Songs\Steven Dunston - N
Delete "$TEMP\Song-Northern-Star.zip"
+ SetOutPath "$INSTDIR"
+
SectionEnd
SectionGroupEnd
@@ -396,6 +401,7 @@ nsisunz::Unzip "$TEMP\Theme-Orange.zip" "$INSTDIR\"
Delete "$TEMP\Theme-Orange.zip"
+ SetOutPath "$INSTDIR"
SectionEnd
@@ -412,6 +418,7 @@ nsisunz::Unzip "$TEMP\Theme-Streetlight.zip" "$INSTDIR\"
Delete "$TEMP\Theme-Streetlight.zip"
+ SetOutPath "$INSTDIR"
SectionEnd
@@ -428,6 +435,8 @@ nsisunz::Unzip "$TEMP\Theme-Vistar.zip" "$INSTDIR\"
Delete "$TEMP\Theme-Vistar.zip"
+ SetOutPath "$INSTDIR"
+
SectionEnd
diff --git a/Installer/images/Thumbs.db b/Installer/images/Thumbs.db
deleted file mode 100644
index 7ac63d07..00000000
--- a/Installer/images/Thumbs.db
+++ /dev/null
Binary files differ
diff --git a/Installer/images/mce.png b/Installer/images/mce.png
deleted file mode 100644
index 2759936d..00000000
--- a/Installer/images/mce.png
+++ /dev/null
Binary files differ
diff --git a/Installer/plugins/Games.dll b/Installer/plugins/Games.dll
deleted file mode 100644
index bdb27ea1..00000000
--- a/Installer/plugins/Games.dll
+++ /dev/null
Binary files differ
diff --git a/Installer/settings/files_in.nsh b/Installer/settings/files_in.nsh
index 2e8dab91..de9acb75 100644
--- a/Installer/settings/files_in.nsh
+++ b/Installer/settings/files_in.nsh
@@ -15,22 +15,24 @@
; Extract files to the directories:
SetOutPath "$INSTDIR"
- File "..\bass.dll"
- File "..\Changelog.german.txt"
- File "..\Changelog.txt"
- File "..\documentation.pdf"
- File "..\License.txt"
- File "..\ReadMe.txt"
+ File "..\InstallerDependencies\dll\bass.dll"
+ File "..\InstallerDependencies\dll\SDL.dll"
+ File "..\InstallerDependencies\dll\smpeg.dll"
+ File "..\InstallerDependencies\dll\sqlite3.dll"
+
+ File "..\InstallerDependencies\documents\Changelog.german.txt"
+ File "..\InstallerDependencies\documents\Changelog.txt"
+ File "..\InstallerDependencies\documents\documentation.pdf"
+ File "..\InstallerDependencies\documents\License.txt"
+ File "..\InstallerDependencies\documents\ReadMe.txt"
+
File "..\ScoreConverter.exe"
- File "..\SDL.dll"
- File "..\smpeg.dll"
- File "..\sqlite3.dll"
File "..\${exe}.exe"
${If} ${AtLeastWinVista}
SetOutPath "$WINDIR"
- File ".\plugins\gdf.dll"
+ File "..\InstallerDependencies\plugins\gdf.dll"
${EndIf}
@@ -39,6 +41,9 @@ ${EndIf}
File "..\Covers\NoCover.jpg"
SetOutPath "$INSTDIR\Languages\"
+
+ File "..\Languages\readme.txt"
+
File "..\Languages\Catalan.ini"
File "..\Languages\Dutch.ini"
File "..\Languages\English.ini"
@@ -46,11 +51,10 @@ ${EndIf}
File "..\Languages\German.ini"
File "..\Languages\Italian.ini"
File "..\Languages\Norwegian.ini"
- File "..\Languages\readme.txt"
+ File "..\Languages\Portuguese.ini"
File "..\Languages\Serbian.ini"
File "..\Languages\Spanish.ini"
File "..\Languages\Swedish.ini"
- File "..\Languages\Portuguese.ini"
SetOutPath "$INSTDIR\Plugins\"
File "..\Plugins\Blind.dll"
diff --git a/Installer/settings/functions.nsh b/Installer/settings/functions.nsh
index 03dcf7f4..a62b9137 100644
--- a/Installer/settings/functions.nsh
+++ b/Installer/settings/functions.nsh
@@ -4,6 +4,8 @@
Function CreateDesktopShortCuts
+SetOutPath "$INSTDIR"
+
CreateShortcut "$Desktop\$(sm_shortcut).lnk" "$INSTDIR\${exe2}.exe"
FunctionEnd
diff --git a/Installer/settings/variables.nsh b/Installer/settings/variables.nsh
index e4d03924..1bb3a7b6 100644
--- a/Installer/settings/variables.nsh
+++ b/Installer/settings/variables.nsh
@@ -56,13 +56,12 @@
; Skin:
!define gdf_path "$WINDIR\gdf.dll" ; Path to gdf.dll for Vista Game Explorer
-!define bmp_header ".\images\header.bmp" ; Bitmap of the Installation Header (Size: 150x57 px)
-!define bmp_side ".\images\left.bmp" ; Bitmap on the left side of Welcome & Finish Page (Size: 164x314 px)
+!define bmp_header "..\InstallerDependencies\images\header.bmp" ; Bitmap of the Installation Header (Size: 150x57 px)
+!define bmp_side "..\InstallerDependencies\images\left.bmp" ; Bitmap on the left side of Welcome & Finish Page (Size: 164x314 px)
!define mui_ini ".\settings\io.ini" ; Installation Options for Welcome & Finish Page
!define license_bgcolor "FFFFFF" ; RGB Background Color for Licence agreement
-!define bmp_check ".\images\modern.bmp" ; Bitmap of Checks at Components Selection Page
+!define bmp_check "..\InstallerDependencies\images\modern.bmp" ; Bitmap of Checks at Components Selection Page
!define directory_bgcolor "FFFFFF" ; RGB Background Color for Directory textbox
!define smp_bgcolor "FFFFFF" ; RGB Background of Startmenu List and Textbox
;!define dets_bgcolor "FFFFFF" ; Background Color of Details Screen while files are being extracted
-!define file_license "..\License.txt" ; Choose the file with the license agreement
-!define gameicon ".\images\mce.png" ; Name of the png file which will be displayed in MCE (Size: 170x170) \ No newline at end of file
+!define file_license "..\InstallerDependencies\documents\License.txt" ; Choose the file with the license agreement \ No newline at end of file
diff --git a/InstallerDependencies/README-SDL.txt b/InstallerDependencies/README-SDL.txt
deleted file mode 100644
index 1669736c..00000000
--- a/InstallerDependencies/README-SDL.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-
-Please distribute this file with the SDL runtime environment:
-
-The Simple DirectMedia Layer (SDL for short) is a cross-platfrom library
-designed to make it easy to write multi-media software, such as games and
-emulators.
-
-The Simple DirectMedia Layer library source code is available from:
-http://www.libsdl.org/
-
-This library is distributed under the terms of the GNU LGPL license:
-http://www.gnu.org/copyleft/lesser.html
-
diff --git a/InstallerDependencies/SDL.dll b/InstallerDependencies/dll/SDL.dll
index a5da7bbd..a5da7bbd 100644
--- a/InstallerDependencies/SDL.dll
+++ b/InstallerDependencies/dll/SDL.dll
Binary files differ
diff --git a/InstallerDependencies/bass.dll b/InstallerDependencies/dll/bass.dll
index 964d8996..964d8996 100644
--- a/InstallerDependencies/bass.dll
+++ b/InstallerDependencies/dll/bass.dll
Binary files differ
diff --git a/InstallerDependencies/smpeg.dll b/InstallerDependencies/dll/smpeg.dll
index 439cd897..439cd897 100644
--- a/InstallerDependencies/smpeg.dll
+++ b/InstallerDependencies/dll/smpeg.dll
Binary files differ
diff --git a/InstallerDependencies/sqlite3.dll b/InstallerDependencies/dll/sqlite3.dll
index 7111873f..7111873f 100644
--- a/InstallerDependencies/sqlite3.dll
+++ b/InstallerDependencies/dll/sqlite3.dll
Binary files differ
diff --git a/InstallerDependencies/Changelog.german.txt b/InstallerDependencies/documents/Changelog.german.txt
index db8d1b35..db8d1b35 100644
--- a/InstallerDependencies/Changelog.german.txt
+++ b/InstallerDependencies/documents/Changelog.german.txt
diff --git a/InstallerDependencies/Changelog.txt b/InstallerDependencies/documents/Changelog.txt
index 5fc14b84..5fc14b84 100644
--- a/InstallerDependencies/Changelog.txt
+++ b/InstallerDependencies/documents/Changelog.txt
diff --git a/InstallerDependencies/License.txt b/InstallerDependencies/documents/License.txt
index 4964fc70..4964fc70 100644
--- a/InstallerDependencies/License.txt
+++ b/InstallerDependencies/documents/License.txt
diff --git a/InstallerDependencies/ReadMe.txt b/InstallerDependencies/documents/ReadMe.txt
index eece4d65..eece4d65 100644
--- a/InstallerDependencies/ReadMe.txt
+++ b/InstallerDependencies/documents/ReadMe.txt
diff --git a/InstallerDependencies/documentation.pdf b/InstallerDependencies/documents/documentation.pdf
index 16267bb9..16267bb9 100644
--- a/InstallerDependencies/documentation.pdf
+++ b/InstallerDependencies/documents/documentation.pdf
Binary files differ
diff --git a/Installer/icons/uninstall.ico b/InstallerDependencies/icons/uninstall.ico
index 1c72432a..1c72432a 100644
--- a/Installer/icons/uninstall.ico
+++ b/InstallerDependencies/icons/uninstall.ico
Binary files differ
diff --git a/Installer/icons/ustar.ico b/InstallerDependencies/icons/ustar.ico
index f3214d1a..f3214d1a 100644
--- a/Installer/icons/ustar.ico
+++ b/InstallerDependencies/icons/ustar.ico
Binary files differ
diff --git a/Installer/images/header.bmp b/InstallerDependencies/images/header.bmp
index 5d1ecc72..5d1ecc72 100644
--- a/Installer/images/header.bmp
+++ b/InstallerDependencies/images/header.bmp
Binary files differ
diff --git a/Installer/images/left.bmp b/InstallerDependencies/images/left.bmp
index 68370f63..68370f63 100644
--- a/Installer/images/left.bmp
+++ b/InstallerDependencies/images/left.bmp
Binary files differ
diff --git a/Installer/images/modern.bmp b/InstallerDependencies/images/modern.bmp
index 62468ded..62468ded 100644
--- a/Installer/images/modern.bmp
+++ b/InstallerDependencies/images/modern.bmp
Binary files differ
diff --git a/Installer/plugins/NSISdl.dll b/InstallerDependencies/plugins/NSISdl.dll
index a3675054..a3675054 100644
--- a/Installer/plugins/NSISdl.dll
+++ b/InstallerDependencies/plugins/NSISdl.dll
Binary files differ
diff --git a/Installer/plugins/gdf.dll b/InstallerDependencies/plugins/gdf.dll
index fa887cbd..fa887cbd 100644
--- a/Installer/plugins/gdf.dll
+++ b/InstallerDependencies/plugins/gdf.dll
Binary files differ
diff --git a/Installer/plugins/nsProcess.dll b/InstallerDependencies/plugins/nsProcess.dll
index 064097a3..064097a3 100644
--- a/Installer/plugins/nsProcess.dll
+++ b/InstallerDependencies/plugins/nsProcess.dll
Binary files differ
diff --git a/Installer/plugins/nsisunz.dll b/InstallerDependencies/plugins/nsisunz.dll
index 5466f156..5466f156 100644
--- a/Installer/plugins/nsisunz.dll
+++ b/InstallerDependencies/plugins/nsisunz.dll
Binary files differ
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-27 10:28:22 +0000