Final changes for Windows V0.4.06a

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@466 b45a01b8-16f6-495d-af2f-9b41ad6348cc

libretroshare/src/scripts/config-cygwin.mk

@@ -14,13 +14,16 @@ PQI_USE_XPGP = 1
 
 ###########################################################################
 
-CYGWIN_SRC_ROOT=/cygdrive/c/home/rmfern/prog/MinGW
+ALT_SRC_ROOT=/cygdrive/c/home/rmfern/prog/MinGW
-SSL_DIR=$(CYGWIN_SRC_ROOT)/openssl-0.9.7g
+SRC_ROOT=../../../..
-FLTK_DIR=$(CYGWIN_SRC_ROOT)/FLTK-1.1.6
+
-PTHREADS_DIR=$(CYGWIN_SRC_ROOT)/pthreads/pthreads.2
+# These never change.
-KADC_DIR=$(CYGWIN_SRC_ROOT)/debug/KadC-2006-Oct-19
+PTHREADS_DIR=$(ALT_SRC_ROOT)/pthreads/pthreads.2
-ZLIB_DIR=$(CYGWIN_SRC_ROOT)/zlib-1.2.3
+ZLIB_DIR=$(ALT_SRC_ROOT)/zlib-1.2.3
-UPNPC_DIR=$(CYGWIN_SRC_ROOT)/libs/src/miniupnpc-20070515
+
+# pretty stable...
+SSL_DIR=$(SRC_ROOT)/openssl-0.9.7g-xpgp-0.1c
+UPNPC_DIR=$(SRC_ROOT)/miniupnpc-1.0
 
 include $(RS_TOP_DIR)/scripts/checks.mk
 
@@ -33,7 +36,7 @@ LIBDIR = $(RS_TOP_DIR)/lib
 LIBRS = $(LIBDIR)/libretroshare.a
 
 # Unix: Linux/Cygwin
-INCLUDE = -I $(RS_TOP_DIR) -I$(KADC_DIR)
+INCLUDE = -I $(RS_TOP_DIR) 
 
 ifdef PQI_DEBUG
 	CFLAGS = -Wall -g $(INCLUDE) 
@@ -95,7 +98,6 @@ ifdef PQI_USE_XPGP
 endif
 
 LIBS +=  -lssl -lcrypto 
-LIBS +=  -L$(KADC_DIR) -lKadC 
 LIBS +=  -L$(UPNPC_DIR) -lminiupnpc
 LIBS += -L$(ZLIB_DIR) -lz 
 LIBS += -L$(PTHREADS_DIR) -lpthreadGC2d 

retroshare-gui/src/retroshare.nsi

@@ -2,7 +2,7 @@
 
 ; Define your application name
 !define APPNAME "RetroShare"
-!define VERSION "0.4.01a"
+!define VERSION "0.4.06a"
 !define APPNAMEANDVERSION "${APPNAME} ${VERSION}"
 
 ; Main Install settings
@@ -39,6 +39,10 @@ SetCompressor LZMA
 !define MUI_LANGDLL_REGISTRY_ROOT HKLM
 !define MUI_LANGDLL_REGISTRY_KEY ${REGKEY}
 !define MUI_LANGDLL_REGISTRY_VALUENAME InstallerLanguage
+
+; !define MUI_WELCOMEPAGE_TEXT "This wizard will guide you through the installation of RetroShare. \r\n\r\nIt is recommended that you close all other applications before starting Setup. This will make it possible to update relevant system files without havinf to reboot your computer. \r\n\r\nIMPORTANT: Ensure that RetroShare is NOT RUNNING before continuing (you can exit from the taskbar menu), otherwise the installer cannot update the executables, and the installation will fail. \r\n\r\nClick Next to continue. "
+
+!define MUI_WELCOMEPAGE_TEXT "This wizard will guide you through the installation of RetroShare. \r\n\r\nIMPORTANT: Ensure that RetroShare is NOT RUNNING before continuing (you can exit from the taskbar menu), otherwise the installer cannot update the executables, and the installation will fail. \r\n\r\nClick Next to continue. "
 
 
 ; Defines the un-/installer logo of RetroShare
@@ -140,6 +144,7 @@ Section $(sec_main) sec_main
   ; Set Section Files and Shortcuts
   SetOutPath "$INSTDIR\"
   File /r "release\RetroShare.exe"
+  File /r "release\mingwm10.dll"
   File /r "release\changelog.txt"
 
   
@@ -161,12 +166,16 @@ Section  $(sec_data) sec_data
   File /r release\qss\*.*   
   
   ; Set Section emoticons need to remove svn path
-  SetOutPath "$INSTDIR\emoticons\"
+  ; SetOutPath "$INSTDIR\emoticons\"
-  File /r release\emoticons\*.*  
+  ; File /r release\emoticons\*.*  
   
   ; Set Section skin
   ; SetOutPath "$INSTDIR\skin\"
   ; File /r release\skin\*.* 
+
+  ; Add emoticons
+  SetOutPath "$INSTDIR\emoticons\kopete\"
+  File /r release\emoticons\kopete\*.*   
 	
 SectionEnd
 
@@ -180,7 +189,7 @@ Section $(sec_mplayer) sec_mplayer
 	
   ; Set Section Files and Shortcuts
   SetOutPath "$INSTDIR\mplayer"
-  File /r "E:\MPlayer-mingw32-1.0rc2\MPlayer-1.0rc2\*.*"
+  File /r "mplayer\MPlayer-1.0rc2\*.*"
 
 
 SectionEnd

retroshare-gui/src/util/rsversion.cpp

@@ -23,7 +23,7 @@
 
 //#define USE_SVN_VERSIONS 1
 
-#define VERSION "0.4.05a"
+#define VERSION "0.4.06a"
 
 #if USE_SVN_VERSIONS
 #include "svn_revision.h"