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

Revert "now retrieve version for gui directly from lib"

Browse source 
This reverts commit 0aa0d500c001730e05ffecd69cf3068d87138557.

The GUI and LIB could have two different version when compiling, so we
need to keep both version info.

Conflicts:

	retroshare-gui/src/version_detail.sh

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1531 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
joss17 2009-08-13 15:11:08 +00:00
parent 0043af68c1
commit eef31ea805
4 changed files with 68 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -13,12 +13,20 @@ MOC_DIR = temp/moc
linux-g++ {
OBJECTS_DIR = temp/linux-g++/obj
QMAKE_LFLAGS += -L"../../../../lib/linux-g++"
CONFIG += version_detail_bash_script
}
linux-g++-64 {
OBJECTS_DIR = temp/linux-g++-64/obj
QMAKE_LFLAGS += -L"../../../../lib/linux-g++-64"
CONFIG += version_detail_bash_script
}
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
}
#################### Cross compilation for windows under Linux ###################
win32-x-g++ {
@ -163,6 +171,7 @@ HEADERS += rshare.h \
util/MouseEventFilter.h \
util/EventFilter.h \
util/Widget.h \
util/rsversion.h \
util/RsAction.h \
util/printpreview.h \
util/log.h \
@ -380,6 +389,7 @@ SOURCES += main.cpp \
util/EventFilter.cpp \
util/Widget.cpp \
util/RsAction.cpp \
util/rsversion.cpp \
util/printpreview.cpp \
util/log.cpp \
gui/bwgraph/bwgraph.cpp \