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

CONFIG shouldn't be reset at qmake call, use CONFIG+=… instead

Browse Source 
With CONFIG=…, the default values of CONFIG are cleared, with qt4 this
doesn't seem to be a problem, but with qt5 the build fails.

CONFIG=staticlib in openpgpsdk.pro was added in 3caeb0ab7f
for OS X, but is not necessary on linux
This commit is contained in:
AsamK 2015-08-31 21:40:52 +02:00
parent 829c2f396e
commit 2be400e33e
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -37,7 +37,7 @@ Compilation on Linux
3. Compile 3. Compile
```bash ```bash
cd trunk cd trunk
qmake CONFIG=debug qmake CONFIG+=debug
make make
``` ```
@ -55,7 +55,7 @@ For packagers
------------- -------------
Packagers can use PREFIX and LIB\_DIR to customize the installation paths: Packagers can use PREFIX and LIB\_DIR to customize the installation paths:
```bash ```bash
qmake PREFIX=/usr LIB_DIR=/usr/lib64 qmake PREFIX=/usr LIB_DIR=/usr/lib64 "CONFIG-=debug" "CONFIG+=release"
make make
make INSTALL_ROOT=${PKGDIR} install make INSTALL_ROOT=${PKGDIR} install
``` ```

2
build_scripts/Debian+Ubuntu/debian/rules
View File

@ -3,7 +3,7 @@
configure: configure-stamp configure: configure-stamp
configure-stamp: configure-stamp:
dh_testdir dh_testdir
cd src && qmake-qt4 CONFIG=release PREFIX=/usr LIB_DIR=/usr/lib RetroShare.pro cd src && qmake-qt4 "CONFIG-=debug" "CONFIG+=release" PREFIX=/usr LIB_DIR=/usr/lib RetroShare.pro
touch $@ touch $@

2
build_scripts/RedHat+Fedora/retroshare06.spec
View File

@ -56,7 +56,7 @@ cd lib/sqlcipher
make make
cd - cd -
cd src cd src
qmake-qt4 CONFIG=release PREFIX=%{_prefix} LIB_DIR=%{_libdir} RetroShare.pro qmake-qt4 "CONFIG-=debug" "CONFIG+=release" PREFIX=%{_prefix} LIB_DIR=%{_libdir} RetroShare.pro
make make
cd - cd -

6
openpgpsdk/src/openpgpsdk.pro
View File

@ -1,10 +1,10 @@
!include("../../retroshare.pri"): error("Could not include file ../../retroshare.pri") !include("../../retroshare.pri"): error("Could not include file ../../retroshare.pri")
TEMPLATE = lib TEMPLATE = lib
win32 { macx {
CONFIG += staticlib
} else {
CONFIG = staticlib CONFIG = staticlib
} else {
CONFIG += staticlib
} }
DEFINES *= OPENSSL_NO_IDEA DEFINES *= OPENSSL_NO_IDEA