Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-03 22:55:04 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Reactivate minimal version

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4044 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2011-02-18 23:26:08 +00:00
parent 24b2b8ce29
commit 61b57ede65
5 changed files with 292 additions and 269 deletions
Download patch file Download diff file Expand all files Collapse all files

6
libbitdht/src/libbitdht.pro
View file

@ -59,11 +59,15 @@ win32 {
#DEFINES *= WINDOWS_SYS WIN32 STATICLIB MINGW #DEFINES *= WINDOWS_SYS WIN32 STATICLIB MINGW
DESTDIR = lib DESTDIR = lib
# Switch off optimization # Switch off optimization for release version
QMAKE_CXXFLAGS_RELEASE -= -O2 QMAKE_CXXFLAGS_RELEASE -= -O2
QMAKE_CXXFLAGS_RELEASE += -O0 QMAKE_CXXFLAGS_RELEASE += -O0
QMAKE_CFLAGS_RELEASE -= -O2 QMAKE_CFLAGS_RELEASE -= -O2
QMAKE_CFLAGS_RELEASE += -O0 QMAKE_CFLAGS_RELEASE += -O0
# Switch on optimization for debug version
#QMAKE_CXXFLAGS_DEBUG += -O2
#QMAKE_CFLAGS_DEBUG += -O2
} }
################################# MacOSX ########################################## ################################# MacOSX ##########################################

8
libretroshare/src/libretroshare.pro
View file

@ -9,7 +9,7 @@ TARGET = retroshare
#CONFIG += minimal #CONFIG += minimal
minimal { minimal {
CONFIG -= use_blogs bitdht CONFIG -= use_blogs
DEFINES += MINIMAL_LIBRS DEFINES += MINIMAL_LIBRS
} }
@ -236,12 +236,16 @@ win32 {
DEFINES *= MINIUPNPC_VERSION=13 DEFINES *= MINIUPNPC_VERSION=13
DESTDIR = lib DESTDIR = lib
# Switch off optimization # Switch off optimization for release version
QMAKE_CXXFLAGS_RELEASE -= -O2 QMAKE_CXXFLAGS_RELEASE -= -O2
QMAKE_CXXFLAGS_RELEASE += -O0 QMAKE_CXXFLAGS_RELEASE += -O0
QMAKE_CFLAGS_RELEASE -= -O2 QMAKE_CFLAGS_RELEASE -= -O2
QMAKE_CFLAGS_RELEASE += -O0 QMAKE_CFLAGS_RELEASE += -O0
# Switch on optimization for debug version
#QMAKE_CXXFLAGS_DEBUG += -O2
#QMAKE_CFLAGS_DEBUG += -O2
DEFINES -= DEBUG_PQISSL DEFINES -= DEBUG_PQISSL
DEFINES += USE_CMD_ARGS DEFINES += USE_CMD_ARGS

12
retroshare-gui/src/RetroShare.pro
View file

@ -18,7 +18,7 @@ debug {
} }
minimal { minimal {
CONFIG -= blogs bitdht CONFIG -= blogs
DEFINES += MINIMAL_RSGUI DEFINES += MINIMAL_RSGUI
} }
@ -91,12 +91,16 @@ win32-x-g++ {
#################################### Windows ##################################### #################################### Windows #####################################
win32 { win32 {
# Switch off optimization # Switch off optimization for release version
QMAKE_CXXFLAGS_RELEASE -= -O2 QMAKE_CXXFLAGS_RELEASE -= -O2
QMAKE_CXXFLAGS_RELEASE += -O0 QMAKE_CXXFLAGS_RELEASE += -O0
QMAKE_CFLAGS_RELEASE -= -O2 QMAKE_CFLAGS_RELEASE -= -O2
QMAKE_CFLAGS_RELEASE += -O0 QMAKE_CFLAGS_RELEASE += -O0
# Switch on optimization for debug version
#QMAKE_CXXFLAGS_DEBUG += -O2
#QMAKE_CFLAGS_DEBUG += -O2
OBJECTS_DIR = temp/obj OBJECTS_DIR = temp/obj
#LIBS += -L"D/Qt/2009.03/qt/plugins/imageformats" #LIBS += -L"D/Qt/2009.03/qt/plugins/imageformats"
#QTPLUGIN += qjpeg #QTPLUGIN += qjpeg
@ -716,6 +720,8 @@ minimal {
gui/settings/rsharesettings.cpp \ gui/settings/rsharesettings.cpp \
gui/common/rwindow.cpp \ gui/common/rwindow.cpp \
gui/common/StatusDefs.cpp \ gui/common/StatusDefs.cpp \
gui/common/PeerDefs.cpp \
gui/common/RSTreeWidgetItem.cpp \
gui/LogoBar.cpp \ gui/LogoBar.cpp \
gui/RsAutoUpdatePage.cpp \ gui/RsAutoUpdatePage.cpp \
gui/common/vmessagebox.cpp \ gui/common/vmessagebox.cpp \
@ -748,6 +754,8 @@ minimal {
gui/settings/RsharePeerSettings.h \ gui/settings/RsharePeerSettings.h \
gui/common/rwindow.h \ gui/common/rwindow.h \
gui/common/StatusDefs.h \ gui/common/StatusDefs.h \
gui/common/PeerDefs.h \
gui/common/RSTreeWidgetItem.h \
gui/LogoBar.h \ gui/LogoBar.h \
gui/RsAutoUpdatePage.h \ gui/RsAutoUpdatePage.h \
gui/common/vmessagebox.h \ gui/common/vmessagebox.h \

7
retroshare-gui/src/gui/connect/ConfCertDialog.cpp
View file

@ -35,9 +35,12 @@
#include "gui/help/browser/helpbrowser.h" #include "gui/help/browser/helpbrowser.h"
#include "gui/common/PeerDefs.h" #include "gui/common/PeerDefs.h"
#include "gui/MainWindow.h"
#include "gui/common/StatusDefs.h" #include "gui/common/StatusDefs.h"
#ifndef MINIMAL_RSGUI
#include "gui/MainWindow.h"
#endif // !MINIMAL_RSGUI
static QMap<std::string, ConfCertDialog*> instances; static QMap<std::string, ConfCertDialog*> instances;
ConfCertDialog *ConfCertDialog::instance(const std::string& peer_id) ConfCertDialog *ConfCertDialog::instance(const std::string& peer_id)
@ -73,10 +76,12 @@ ConfCertDialog::ConfCertDialog(const std::string& id, QWidget *parent, Qt::WFlag
connect(ui.trusthelpButton, SIGNAL(clicked()), this, SLOT(showHelpDialog())); connect(ui.trusthelpButton, SIGNAL(clicked()), this, SLOT(showHelpDialog()));
connect(ui.signers_listWidget, SIGNAL(customContextMenuRequested( QPoint ) ), this, SLOT( listWidgetContextMenuPopup( QPoint ) ) ); connect(ui.signers_listWidget, SIGNAL(customContextMenuRequested( QPoint ) ), this, SLOT( listWidgetContextMenuPopup( QPoint ) ) );
#ifndef MINIMAL_RSGUI
MainWindow *w = MainWindow::getInstance(); MainWindow *w = MainWindow::getInstance();
if (w) { if (w) {
connect(this, SIGNAL(configChanged()), w->getPage(MainWindow::Network), SLOT(insertConnect())); connect(this, SIGNAL(configChanged()), w->getPage(MainWindow::Network), SLOT(insertConnect()));
} }
#endif // !MINIMAL_RSGUI
} }
ConfCertDialog::~ConfCertDialog() ConfCertDialog::~ConfCertDialog()

2
retroshare-gui/src/main.cpp
View file

@ -210,6 +210,8 @@ int main(int argc, char *argv[])
MessengerWindow::showYourself(); MessengerWindow::showYourself();
rshare.setQuitOnLastWindowClosed(true); rshare.setQuitOnLastWindowClosed(true);
splashScreen.hide();
#else #else
Emoticons::load(); Emoticons::load();