From 0573171e6fa2fe6bf2e9811fa2fec2794bc7ba38 Mon Sep 17 00:00:00 2001
From: csoler <retroshare.project@gmail.com>
Date: Sat, 5 Sep 2009 18:15:23 +0000
Subject: [PATCH] fixed win32-x-g++ compilation

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1600 b45a01b8-16f6-495d-af2f-9b41ad6348cc
---
 retroshare-gui/src/RetroShare.pro          | 35 ++++++++++++----------
 retroshare-gui/src/gui/StartDialog.cpp     |  4 +--
 retroshare-gui/src/gui/TransfersDialog.cpp |  2 +-
 3 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/retroshare-gui/src/RetroShare.pro b/retroshare-gui/src/RetroShare.pro
index 09c9f500f..905a4f196 100644
--- a/retroshare-gui/src/RetroShare.pro
+++ b/retroshare-gui/src/RetroShare.pro
@@ -14,11 +14,13 @@ linux-g++ {
 	OBJECTS_DIR = temp/linux-g++/obj
  	QMAKE_LFLAGS += -L"../../../../lib/linux-g++"
  	CONFIG += version_detail_bash_script
+	LIBS += -L"../../../../lib" -lretroshare -lssl -lcrypto -lpthread -lminiupnpc -lz
 }
 linux-g++-64 {
 	OBJECTS_DIR = temp/linux-g++-64/obj
 	QMAKE_LFLAGS += -L"../../../../lib/linux-g++-64"
 	CONFIG += version_detail_bash_script
+	LIBS += -L"../../../../lib" -lretroshare -lssl -lcrypto -lpthread -lminiupnpc -lz
 }
 
 version_detail_bash_script {
@@ -30,16 +32,25 @@ version_detail_bash_script {
 #################### Cross compilation for windows under Linux ###################
 
 win32-x-g++ {
-	OBJECTS_DIR = temp/win32-x-g++/obj
+		OBJECTS_DIR = temp/win32-x-g++/obj
 
-	LIBS += -L"../../../../lib/win32-x-g++"
-    	LIBS += -lpthreadGCE2
-    	LIBS += -lws2_32 -luuid -lole32 -liphlpapi -lcrypt32-cygwin -lgdi32
-    	LIBS += -lole32 -lwinmm
+		LIBS += ../../libretroshare/src/lib.win32xgcc/libretroshare.a
+		LIBS += ../../../../lib/win32-x-g++-v0.5/libssl.a 
+		LIBS += ../../../../lib/win32-x-g++-v0.5/libcrypto.a 
+		LIBS += ../../../../lib/win32-x-g++-v0.5/libgpgme.dll.a 
+		LIBS += ../../../../lib/win32-x-g++-v0.5/libminiupnpc.a 
+		LIBS += ../../../../lib/win32-x-g++-v0.5/libz.a 
+		LIBS += -L${HOME}/.wine/drive_c/pthreads/lib -lpthreadGCE2
+		LIBS += -lQtUiTools
+		LIBS += -lws2_32 -luuid -lole32 -liphlpapi -lcrypt32 -gdi32
+		LIBS += -lole32 -lwinmm
 
-	DEFINES *= WIN32
+		DEFINES *= WIN32 WIN32_CROSS_UBUNTU
 
-	RC_FILE = gui/images/retroshare_win.rc
+		INCLUDEPATH += ../../../../gpgme-1.1.8/src/
+		INCLUDEPATH += ../../../../libgpg-error-1.7/src/
+
+		RC_FILE = gui/images/retroshare_win.rc
 }
 
 #################################### Windows #####################################
@@ -68,6 +79,8 @@ macx {
 
     LIBS += -Wl,-search_paths_first
     LIBS += -L"../../../../lib" -lretroshare -lssl -lcrypto -lminiupnpc -lz
+	 LIBS += -lgpgme
+	 LIBS += -lQtUiTools
 }
 
 ############################## Common stuff ######################################
@@ -75,16 +88,8 @@ macx {
 # On Linux systems that alredy have libssl and libcrypto it is advisable
 # to rename the patched version of SSL to something like libsslxpgp.a and libcryptoxpg.a
 
-# comment the next option if you renamed libcrtypto and libssl
-LIBS += -L"../../../../lib" -lretroshare -lminiupnpc -lssl -lcrypto
-
-# uncomment the next option if you renamed libcrtypto and libssl
-#LIBS += -L"../../../../lib" -lretroshare -lminiupnpc -lsslxpgp -lcryptoxpgp
-
 # ###########################################
 
-LIBS += -lz -lgpgme
-LIBS += -lQtUiTools
 
 DEPENDPATH += . \
             rsiface \
diff --git a/retroshare-gui/src/gui/StartDialog.cpp b/retroshare-gui/src/gui/StartDialog.cpp
index 6a750e267..67926b8b8 100644
--- a/retroshare-gui/src/gui/StartDialog.cpp
+++ b/retroshare-gui/src/gui/StartDialog.cpp
@@ -78,8 +78,8 @@ StartDialog::StartDialog(QWidget *parent, Qt::WFlags flags)
 	ui.autoBox->hide();
 #endif
 	//comment those to show the ssl password dialog
-	ui.loadPasswd->hide();
-	ui.label_4->hide();
+	//ui.loadPasswd->hide();
+	//ui.label_4->hide();
 
 	/* get all available pgp private certificates....
 	 * mark last one as default.
diff --git a/retroshare-gui/src/gui/TransfersDialog.cpp b/retroshare-gui/src/gui/TransfersDialog.cpp
index fba93fc66..bec1eb7bb 100644
--- a/retroshare-gui/src/gui/TransfersDialog.cpp
+++ b/retroshare-gui/src/gui/TransfersDialog.cpp
@@ -20,7 +20,7 @@
  ****************************************************************/
 
 #ifdef WIN32
-	#include <Windows.h>
+	#include <windows.h>
 #endif