Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-01-11 23:49:38 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Final changes for Windows V0.4.06a

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@466 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2008-04-03 17:30:08 +00:00
parent da08515d28
commit 2a485cf6eb
3 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libretroshare/src/scripts/config-cygwin.mk
View File

@ -14,13 +14,16 @@ PQI_USE_XPGP = 1
###########################################################################
CYGWIN_SRC_ROOT=/cygdrive/c/home/rmfern/prog/MinGW
SSL_DIR=$(CYGWIN_SRC_ROOT)/openssl-0.9.7g
FLTK_DIR=$(CYGWIN_SRC_ROOT)/FLTK-1.1.6
PTHREADS_DIR=$(CYGWIN_SRC_ROOT)/pthreads/pthreads.2
KADC_DIR=$(CYGWIN_SRC_ROOT)/debug/KadC-2006-Oct-19
ZLIB_DIR=$(CYGWIN_SRC_ROOT)/zlib-1.2.3
UPNPC_DIR=$(CYGWIN_SRC_ROOT)/libs/src/miniupnpc-20070515
ALT_SRC_ROOT=/cygdrive/c/home/rmfern/prog/MinGW
SRC_ROOT=../../../..
# These never change.
PTHREADS_DIR=$(ALT_SRC_ROOT)/pthreads/pthreads.2
ZLIB_DIR=$(ALT_SRC_ROOT)/zlib-1.2.3
# 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

17
retroshare-gui/src/retroshare.nsi
View File

@ -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
@ -40,6 +40,10 @@ SetCompressor LZMA
!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
!insertmacro MUI_DEFAULT MUI_WELCOMEFINISHPAGE_BITMAP "${NSISDIR}\Contrib\Graphics\Wizard\orange.bmp"
@ -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,13 +166,17 @@ Section $(sec_data) sec_data
File /r release\qss\*.*
; Set Section emoticons need to remove svn path
SetOutPath "$INSTDIR\emoticons\"
File /r release\emoticons\*.*
; SetOutPath "$INSTDIR\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
Section $(sec_mplayer) sec_mplayer
@ -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

2
retroshare-gui/src/util/rsversion.cpp
View File

@ -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"