Switched off optimization for Windows build.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4035 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2011-02-12 00:47:10 +00:00
parent 1885b79b67
commit 0c22066d3d
3 changed files with 277 additions and 260 deletions

View File

@ -58,6 +58,12 @@ win32 {
# These have been replaced by _WIN32 && __MINGW32__
#DEFINES *= WINDOWS_SYS WIN32 STATICLIB MINGW
DESTDIR = lib
# Switch off optimization
QMAKE_CXXFLAGS_RELEASE -= -O2
QMAKE_CXXFLAGS_RELEASE += -O0
QMAKE_CFLAGS_RELEASE -= -O2
QMAKE_CFLAGS_RELEASE += -O0
}
################################# MacOSX ##########################################

View File

@ -236,6 +236,12 @@ win32 {
DEFINES *= MINIUPNPC_VERSION=13
DESTDIR = lib
# Switch off optimization
QMAKE_CXXFLAGS_RELEASE -= -O2
QMAKE_CXXFLAGS_RELEASE += -O0
QMAKE_CFLAGS_RELEASE -= -O2
QMAKE_CFLAGS_RELEASE += -O0
DEFINES -= DEBUG_PQISSL
DEFINES += USE_CMD_ARGS

View File

@ -1,268 +1,273 @@
CONFIG += qt gui uic qrc resources uitools idle bitdht # framecatcher# blogs
#CONFIG += use_links
QT += network xml script opengl
TEMPLATE = app
TARGET = RetroShare
#CONFIG += minimal
DEFINES += RS_RELEASE_VERSION
RCC_DIR = temp/qrc
UI_DIR = temp/ui
MOC_DIR = temp/moc
#CONFIG += debug
debug {
QMAKE_CFLAGS += -g
}
minimal {
CONFIG -= blogs bitdht
DEFINES += MINIMAL_RSGUI
}
################################# Linux ##########################################
# Put lib dir in QMAKE_LFLAGS so it appears before -L/usr/lib
linux-* {
#CONFIG += version_detail_bash_script
QMAKE_CXXFLAGS *= -D_FILE_OFFSET_BITS=64
system(which gpgme-config >/dev/null 2>&1) {
INCLUDEPATH += $$system(gpgme-config --cflags | sed -e "s/-I//g")
} else {
message(Could not find gpgme-config on your system, assuming gpgme.h is in /usr/include)
}
PRE_TARGETDEPS *= ../../libretroshare/src/lib/libretroshare.a
LIBS += ../../libretroshare/src/lib/libretroshare.a
CONFIG += qt gui uic qrc resources uitools idle bitdht # framecatcher# blogs
#CONFIG += use_links
QT += network xml script opengl
TEMPLATE = app
TARGET = RetroShare
#CONFIG += minimal
DEFINES += RS_RELEASE_VERSION
RCC_DIR = temp/qrc
UI_DIR = temp/ui
MOC_DIR = temp/moc
#CONFIG += debug
debug {
QMAKE_CFLAGS += -g
}
minimal {
CONFIG -= blogs bitdht
DEFINES += MINIMAL_RSGUI
}
################################# Linux ##########################################
# Put lib dir in QMAKE_LFLAGS so it appears before -L/usr/lib
linux-* {
#CONFIG += version_detail_bash_script
QMAKE_CXXFLAGS *= -D_FILE_OFFSET_BITS=64
system(which gpgme-config >/dev/null 2>&1) {
INCLUDEPATH += $$system(gpgme-config --cflags | sed -e "s/-I//g")
} else {
message(Could not find gpgme-config on your system, assuming gpgme.h is in /usr/include)
}
PRE_TARGETDEPS *= ../../libretroshare/src/lib/libretroshare.a
LIBS += ../../libretroshare/src/lib/libretroshare.a
LIBS += -lssl -lgpgme -lupnp -lXss -lgnome-keyring
DEFINES *= HAVE_XSS # for idle time, libx screensaver extensions
DEFINES *= HAVE_XSS # for idle time, libx screensaver extensions
DEFINES *= UBUNTU
}
linux-g++ {
OBJECTS_DIR = temp/linux-g++/obj
}
linux-g++-64 {
OBJECTS_DIR = temp/linux-g++-64/obj
}
version_detail_bash_script {
DEFINES += ADD_LIBRETROSHARE_VERSION_INFO
QMAKE_EXTRA_TARGETS += write_version_detail
PRE_TARGETDEPS = write_version_detail
write_version_detail.commands = ./version_detail.sh
}
install_rs {
INSTALLS += binary_rs
binary_rs.path = $$(PREFIX)/usr/bin
binary_rs.files = ./RetroShare
}
#################### Cross compilation for windows under Linux ###################
win32-x-g++ {
OBJECTS_DIR = temp/win32-x-g++/obj
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 *= WINDOWS_SYS WIN32 WIN32_CROSS_UBUNTU
INCLUDEPATH += ../../../../gpgme-1.1.8/src/
INCLUDEPATH += ../../../../libgpg-error-1.7/src/
RC_FILE = gui/images/retroshare_win.rc
}
#################################### Windows #####################################
win32 {
OBJECTS_DIR = temp/obj
#LIBS += -L"D/Qt/2009.03/qt/plugins/imageformats"
#QTPLUGIN += qjpeg
PRE_TARGETDEPS += ../../libretroshare/src/lib/libretroshare.a
LIBS += ../../libretroshare/src/lib/libretroshare.a
LIBS += -L"../../../../lib"
LIBS += -lssl -lcrypto -lgpgme -lpthreadGC2d -lminiupnpc -lz
# added after bitdht
# LIBS += -lws2_32
LIBS += -luuid -lole32 -liphlpapi -lcrypt32-cygwin -lgdi32
LIBS += -lole32 -lwinmm
RC_FILE = gui/images/retroshare_win.rc
DEFINES += WINDOWS_SYS
GPG_ERROR_DIR = ../../../../libgpg-error-1.7
GPGME_DIR = ../../../../gpgme-1.1.8
INCLUDEPATH += . $${GPGME_DIR}/src $${GPG_ERROR_DIR}/src
}
##################################### MacOS ######################################
macx {
# ENABLE THIS OPTION FOR Univeral Binary BUILD.
# CONFIG += ppc x86
CONFIG += version_detail_bash_script
LIBS += ../../libretroshare/src/lib/libretroshare.a
LIBS += -lssl -lcrypto -lz -lgpgme -lgpg-error -lassuan
LIBS += ../../../miniupnpc-1.0/libminiupnpc.a
LIBS += -framework CoreFoundation
}
linux-g++ {
OBJECTS_DIR = temp/linux-g++/obj
}
linux-g++-64 {
OBJECTS_DIR = temp/linux-g++-64/obj
}
version_detail_bash_script {
DEFINES += ADD_LIBRETROSHARE_VERSION_INFO
QMAKE_EXTRA_TARGETS += write_version_detail
PRE_TARGETDEPS = write_version_detail
write_version_detail.commands = ./version_detail.sh
}
install_rs {
INSTALLS += binary_rs
binary_rs.path = $$(PREFIX)/usr/bin
binary_rs.files = ./RetroShare
}
#################### Cross compilation for windows under Linux ###################
win32-x-g++ {
OBJECTS_DIR = temp/win32-x-g++/obj
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 *= WINDOWS_SYS WIN32 WIN32_CROSS_UBUNTU
INCLUDEPATH += ../../../../gpgme-1.1.8/src/
INCLUDEPATH += ../../../../libgpg-error-1.7/src/
RC_FILE = gui/images/retroshare_win.rc
}
#################################### Windows #####################################
win32 {
# Switch off optimization
QMAKE_CXXFLAGS_RELEASE -= -O2
QMAKE_CXXFLAGS_RELEASE += -O0
QMAKE_CFLAGS_RELEASE -= -O2
QMAKE_CFLAGS_RELEASE += -O0
OBJECTS_DIR = temp/obj
#LIBS += -L"D/Qt/2009.03/qt/plugins/imageformats"
#QTPLUGIN += qjpeg
PRE_TARGETDEPS += ../../libretroshare/src/lib/libretroshare.a
LIBS += ../../libretroshare/src/lib/libretroshare.a
LIBS += -L"../../../../lib"
LIBS += -lssl -lcrypto -lgpgme -lpthreadGC2d -lminiupnpc -lz
# added after bitdht
# LIBS += -lws2_32
LIBS += -luuid -lole32 -liphlpapi -lcrypt32-cygwin -lgdi32
LIBS += -lole32 -lwinmm
RC_FILE = gui/images/retroshare_win.rc
DEFINES += WINDOWS_SYS
GPG_ERROR_DIR = ../../../../libgpg-error-1.7
GPGME_DIR = ../../../../gpgme-1.1.8
INCLUDEPATH += . $${GPGME_DIR}/src $${GPG_ERROR_DIR}/src
}
##################################### MacOS ######################################
macx {
# ENABLE THIS OPTION FOR Univeral Binary BUILD.
# CONFIG += ppc x86
CONFIG += version_detail_bash_script
LIBS += ../../libretroshare/src/lib/libretroshare.a
LIBS += -lssl -lcrypto -lz -lgpgme -lgpg-error -lassuan
LIBS += ../../../miniupnpc-1.0/libminiupnpc.a
LIBS += -framework CoreFoundation
LIBS += -framework Security
# LIBS += -framework CoreServices
INCLUDEPATH += .
#DEFINES* = MAC_IDLE # for idle feature
CONFIG -= uitools
}
############################## Common stuff ######################################
# 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
# ###########################################
bitdht {
LIBS += ../../libbitdht/src/lib/libbitdht.a
PRE_TARGETDEPS *= ../../libbitdht/src/lib/libbitdht.a
}
win32 {
# must be added after bitdht
LIBS += -lws2_32
}
DEPENDPATH += . \
rsiface \
control \
gui \
lang \
util \
gui\bwgraph \
gui\chat \
gui\connect \
gui\images \
gui\common \
gui\toaster \
gui\help\browser \
gui\elastic
INCLUDEPATH += ../../libretroshare/src/
# Input
HEADERS += rshare.h \
gui/notifyqt.h \
control/bandwidthevent.h \
control/eventtype.h \
gui/QuickStartWizard.h \
gui/DetailsDialog.h \
gui/DLListDelegate.h \
gui/ULListDelegate.h \
gui/StartDialog.h \
gui/NetworkDialog.h \
gui/GenCertDialog.h \
gui/TransfersDialog.h \
gui/graphframe.h \
gui/linetypes.h \
gui/mainpage.h \
gui/mainpagestack.h \
gui/MainWindow.h \
gui/RSHumanReadableDelegate.h \
gui/TurtleRouterDialog.h \
gui/AboutDialog.h \
gui/ForumsDialog.h \
gui/forums/ForumDetails.h \
gui/forums/EditForumDetails.h \
gui/forums/CreateForum.h \
gui/forums/CreateForumMsg.h \
gui/NetworkView.h \
gui/TrustView.h \
gui/MessengerWindow.h \
gui/PeersDialog.h \
gui/RemoteDirModel.h \
gui/RetroShareLink.h \
gui/SearchTreeWidget.h \
gui/SearchDialog.h \
gui/SharedFilesDialog.h \
gui/ShareManager.h \
gui/ShareDialog.h \
gui/SFListDelegate.h \
gui/SoundManager.h \
gui/FileTransferInfoWidget.h \
gui/RsAutoUpdatePage.h \
gui/HelpDialog.h \
gui/InfoDialog.h \
gui/LogoBar.h \
gui/xprogressbar.h \
gui/plugins/PluginInterface.h \
gui/im_history/ImHistoryBrowser.h \
gui/im_history/IMHistoryKeeper.h \
gui/im_history/IMHistoryReader.h \
gui/im_history/IMHistoryItem.h \
gui/im_history/IMHistoryItemDelegate.h \
gui/im_history/IMHistoryItemPainter.h \
gui/im_history/IMHistoryWriter.h \
lang/languagesupport.h \
util/stringutil.h \
util/win32.h \
util/RetroStyleLabel.h \
util/dllexport.h \
util/NonCopyable.h \
util/rsutildll.h \
util/dllexport.h \
util/global.h \
util/rsqtutildll.h \
util/Interface.h \
util/PixmapMerging.h \
util/MouseEventFilter.h \
util/EventFilter.h \
util/Widget.h \
util/rsversion.h \
util/RsAction.h \
util/printpreview.h \
util/log.h \
util/misc.h \
gui/bwgraph/bwgraph.h \
gui/profile/ProfileView.h \
gui/profile/ProfileEdit.h \
gui/profile/ProfileWidget.h \
gui/profile/StatusMessage.h \
gui/chat/PopupChatWindow.h \
gui/chat/PopupChatDialog.h \
gui/chat/HandleRichText.h \
gui/chat/ChatStyle.h \
gui/channels/CreateChannel.h \
gui/channels/ChannelDetails.h \
gui/channels/CreateChannelMsg.h \
gui/channels/EditChanDetails.h \
gui/channels/ShareKey.h \
gui/connect/ConfCertDialog.h \
gui/msgs/MessageComposer.h \
gui/msgs/textformat.h \
gui/images/retroshare_win.rc.h \
gui/settings/rsharesettings.h \
gui/settings/RsharePeerSettings.h \
INCLUDEPATH += .
#DEFINES* = MAC_IDLE # for idle feature
CONFIG -= uitools
}
############################## Common stuff ######################################
# 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
# ###########################################
bitdht {
LIBS += ../../libbitdht/src/lib/libbitdht.a
PRE_TARGETDEPS *= ../../libbitdht/src/lib/libbitdht.a
}
win32 {
# must be added after bitdht
LIBS += -lws2_32
}
DEPENDPATH += . \
rsiface \
control \
gui \
lang \
util \
gui\bwgraph \
gui\chat \
gui\connect \
gui\images \
gui\common \
gui\toaster \
gui\help\browser \
gui\elastic
INCLUDEPATH += ../../libretroshare/src/
# Input
HEADERS += rshare.h \
gui/notifyqt.h \
control/bandwidthevent.h \
control/eventtype.h \
gui/QuickStartWizard.h \
gui/DetailsDialog.h \
gui/DLListDelegate.h \
gui/ULListDelegate.h \
gui/StartDialog.h \
gui/NetworkDialog.h \
gui/GenCertDialog.h \
gui/TransfersDialog.h \
gui/graphframe.h \
gui/linetypes.h \
gui/mainpage.h \
gui/mainpagestack.h \
gui/MainWindow.h \
gui/RSHumanReadableDelegate.h \
gui/TurtleRouterDialog.h \
gui/AboutDialog.h \
gui/ForumsDialog.h \
gui/forums/ForumDetails.h \
gui/forums/EditForumDetails.h \
gui/forums/CreateForum.h \
gui/forums/CreateForumMsg.h \
gui/NetworkView.h \
gui/TrustView.h \
gui/MessengerWindow.h \
gui/PeersDialog.h \
gui/RemoteDirModel.h \
gui/RetroShareLink.h \
gui/SearchTreeWidget.h \
gui/SearchDialog.h \
gui/SharedFilesDialog.h \
gui/ShareManager.h \
gui/ShareDialog.h \
gui/SFListDelegate.h \
gui/SoundManager.h \
gui/FileTransferInfoWidget.h \
gui/RsAutoUpdatePage.h \
gui/HelpDialog.h \
gui/InfoDialog.h \
gui/LogoBar.h \
gui/xprogressbar.h \
gui/plugins/PluginInterface.h \
gui/im_history/ImHistoryBrowser.h \
gui/im_history/IMHistoryKeeper.h \
gui/im_history/IMHistoryReader.h \
gui/im_history/IMHistoryItem.h \
gui/im_history/IMHistoryItemDelegate.h \
gui/im_history/IMHistoryItemPainter.h \
gui/im_history/IMHistoryWriter.h \
lang/languagesupport.h \
util/stringutil.h \
util/win32.h \
util/RetroStyleLabel.h \
util/dllexport.h \
util/NonCopyable.h \
util/rsutildll.h \
util/dllexport.h \
util/global.h \
util/rsqtutildll.h \
util/Interface.h \
util/PixmapMerging.h \
util/MouseEventFilter.h \
util/EventFilter.h \
util/Widget.h \
util/rsversion.h \
util/RsAction.h \
util/printpreview.h \
util/log.h \
util/misc.h \
gui/bwgraph/bwgraph.h \
gui/profile/ProfileView.h \
gui/profile/ProfileEdit.h \
gui/profile/ProfileWidget.h \
gui/profile/StatusMessage.h \
gui/chat/PopupChatWindow.h \
gui/chat/PopupChatDialog.h \
gui/chat/HandleRichText.h \
gui/chat/ChatStyle.h \
gui/channels/CreateChannel.h \
gui/channels/ChannelDetails.h \
gui/channels/CreateChannelMsg.h \
gui/channels/EditChanDetails.h \
gui/channels/ShareKey.h \
gui/connect/ConfCertDialog.h \
gui/msgs/MessageComposer.h \
gui/msgs/textformat.h \
gui/images/retroshare_win.rc.h \
gui/settings/rsharesettings.h \
gui/settings/RsharePeerSettings.h \
gui/settings/rsettings.h \
gui/settings/rsettingswin.h \
gui/settings/GeneralPage.h \