First round of installer fixes.

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4480 96395faa-99c1-11dd-bbfe-3dabce05a288

nsis/ApplyExeProps.nsh

@@ -6,7 +6,7 @@
 
 VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName"     "${APP_NAME}"
 ;VIAddVersionKey /LANG=${LANG_ENGLISH} "Comments"        "A test comment"
-VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalCopyright"  "© 2010 PCSX2 Dev Team"
+VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalCopyright"  "© 2011 PCSX2 Dev Team"
 VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription" "Installs PCSX2, a Playstation 2 Emulator for the PC."
 VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion"     "${APP_VERSION}.${SVNREV_PACKAGE}"
 

nsis/SectionCoreReqs.nsh

@@ -26,12 +26,14 @@
   ; ------------------------------------------
   ; (Binaries, shared DLLs, null plugins, game database, languages, etc)
 
-  ; Note that v3 pthreads is compatible with v4 pthreads, so we just copy v4 oover both
+  ; Note that v3 pthreads is compatible with v4 pthreads, so we just copy v4 over both
   ; filenames.  This allows many older plugin versions to continue to work.  (note that
   ; v3 will be removed for 0.9.8).
 
     File                                            ..\bin\w32pthreads.v4.dll
-    File           /oname=w32pthreads.v3.dll        ..\bin\w32pthreads.v4.dll
+    File                                            ..\bin\SDL.dll
+  ; See above comment.
+  ;  File           /oname=w32pthreads.v3.dll        ..\bin\w32pthreads.v4.dll
     File                                            ..\bin\GameIndex.dbf
 
 	!insertmacro UNINSTALL.LOG_CLOSE_INSTALL

nsis/SharedBase.nsh

@@ -13,8 +13,8 @@
 !endif
 
 !ifndef INC_LANGS
-  ; Set to 1 to enable inclusion of Languages folders (which are currently missing in 0.9.7)
+  ; Set to 1 to enable inclusion of Languages folders
-  !define INC_LANGS     0
+  !define INC_LANGS     1
 !endif
 
 !ifndef USE_PACKAGE_REV
@@ -44,7 +44,7 @@
 ;   uninstall folders.  
 
 !ifndef APP_VERSION
-  !define APP_VERSION      "0.9.7"
+  !define APP_VERSION      "0.9.8"
 !endif
 
 !define APP_NAME         "PCSX2 ${APP_VERSION} (r${SVNREV_PACKAGE})"

nsis/nsis_instructions.txt

@@ -2,7 +2,7 @@
   PCSX2 NSIS Installer Instructions
 -------------------------------------
 
- * Install NSIS (tested with 2.45)
+ * Install NSIS (tested with 2.46)
  * Install NSIS Script: Advanced Uninstall Log (you can find it on NSIS wiki)
 
  * Download the Visual C++ 2008 SP1 Redistributable and save it to this nsis/ folder under the name:

nsis/pcsx2_full_install.nsi

@@ -2,7 +2,7 @@
 ; PCSX2 Full/Complete Install Package!
 ; (a NSIS installer script)
 ;
-; Copyright 2009-2010  PCSX2 Dev Team
+; Copyright 2009-2011  PCSX2 Dev Team
 ;
 
 !ifndef INC_CRT_2008
@@ -19,7 +19,6 @@
 !include "SharedBase.nsh"
 
 ; Reserve features for improved performance with solid archiving.
-File C:\Users\Jake\Documents\devpcsx2\trunk\nsis\SharedBase.nsh
 ;  (uncomment if we add our own install options ini files)
 ;!insertmacro MUI_RESERVEFILE_INSTALLOPTIONS
 ;!insertmacro MUI_RESERVEFILE_LANGDLL
@@ -72,8 +71,6 @@ Section "!${APP_NAME} (required)" SEC_CORE
     File /nonfatal /oname=lilypad-r${SVNREV_LILYPAD}.dll   ..\bin\Plugins\lilypad.dll
     File                                                   ..\bin\Plugins\PadSSSPSX.dll
 
-  ;File                                                   ..\bin\Plugins\FWlinuz.dll
-
   !insertmacro UNINSTALL.LOG_CLOSE_INSTALL
 
 !endif
@@ -170,7 +167,7 @@ LangString DESC_STARTMENU  ${LANG_ENGLISH} "Adds shortcuts for PCSX2 to the star
 LangString DESC_DESKTOP    ${LANG_ENGLISH} "Adds a shortcut for PCSX2 to the desktop (all users)."
 
 LangString DESC_CRT2008    ${LANG_ENGLISH} "Required by the PCSX2 binaries packaged in this installer."
-LangString DESC_CRT2010    ${LANG_ENGLISH} "This will be used by future PCSX2 plugins and updates, but is not (yet) necessary."
+LangString DESC_CRT2010    ${LANG_ENGLISH} "This may be used by future PCSX2 plugins and updates, but is not (yet) necessary."
 LangString DESC_DIRECTX    ${LANG_ENGLISH} "Only uncheck this if you are quite certain your Direct3D runtimes are up to date."
 
 !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN

nsis/pcsx2_web_install.nsi

@@ -2,7 +2,7 @@
 ; PCSX2 Web-based Install Package!
 ; (a NSIS installer script)
 ;
-; Copyright 2009-2010  PCSX2 Dev Team
+; Copyright 2009-2011  PCSX2 Dev Team
 ;
 ; The installer generated by this script will download all relevant components for 
 ; PCSX2 from a variety of mirror hosts.  Packages are only downloaded on an as-needed
@@ -67,8 +67,6 @@ Section "!${APP_NAME} (required)" SEC_CORE
     File /nonfatal /oname=lilypad-r${SVNREV_LILYPAD}.dll   ..\bin\Plugins\lilypad.dll
     File                                                   ..\bin\Plugins\PadSSSPSX.dll
 
-  ;File                                                   ..\bin\Plugins\FWlinuz.dll
-
   !insertmacro UNINSTALL.LOG_CLOSE_INSTALL
 
 !endif

pcsx2/windows/VCprojects/pcsx2_2008.vcproj

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="windows-1253"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9.00"
+	Version="9,00"
 	Name="pcsx2"
 	ProjectGUID="{1CEFD830-2B76-4596-A4EE-BCD7280A60BD}"
 	RootNamespace="pcsx2"
@@ -148,7 +148,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="zlib.lib"
-				OutputFile="$(OutDir)\$(ProjectName)-dev.exe"
+				OutputFile="C:\Users\rama\Desktop\PCSX2_TEST_R4463\$(ProjectName)-dev.exe"
 			/>
 			<Tool
 				Name="VCALinkTool"