See: jira:USDX-162svn/1.01github/svn/1.01

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/1.01@566 b956fd51-792f-4845-bead-9b4dfca2ff2c

3 files changed, 22 insertions, 17 deletions

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