Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-20 05:14:25 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed win32-x-g++ compilation

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1600 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2009-09-05 18:15:23 +00:00
parent d2b3458f2b
commit 0573171e6f
3 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
retroshare-gui/src/RetroShare.pro
View File

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

4
retroshare-gui/src/gui/StartDialog.cpp
View File

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

2
retroshare-gui/src/gui/TransfersDialog.cpp
View File

@ -20,7 +20,7 @@
****************************************************************/
#ifdef WIN32
#include <Windows.h>
#include <windows.h>
#endif