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

Attempt to fix AppveyorCI

Browse source 
+ Cleanup macosx variables
This commit is contained in:
Gioacchino Mazzurco 2019-11-28 13:51:13 +01:00
parent 8a70174fb6
commit 722b1dbffc
No known key found for this signature in database
GPG key ID: A1FBCA3872E87051
4 changed files with 3 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

2
appveyor.yml
View file

@ -147,7 +147,7 @@ before_package:
build_script: build_script:
- env - env
- git submodule update --init - git submodule update --init
- qmake -Wall -spec win32-g++ "CONFIG=debug" - qmake -Wall -spec win32-g++ "CONFIG+=debug" "CONFIG+=c++11"
- mingw32-make -j3 - mingw32-make -j3
# scripts to run after build # scripts to run after build

2
libretroshare/src/retroshare/rsversion.h
View file

@ -81,7 +81,7 @@ constexpr auto RS_HUMAN_READABLE_VERSION =
RS_PRIVATE_STRINGIFY(RS_MINI_VERSION) RS_EXTRA_VERSION; RS_PRIVATE_STRINGIFY(RS_MINI_VERSION) RS_EXTRA_VERSION;
#include <cstdint> #include <stdint.h>
#include <string> #include <string>
/** /**

1
libretroshare/src/use_libretroshare.pri
View file

@ -18,6 +18,7 @@
RS_SRC_PATH=$$clean_path($${PWD}/../../) RS_SRC_PATH=$$clean_path($${PWD}/../../)
RS_BUILD_PATH=$$clean_path($${OUT_PWD}/../../) RS_BUILD_PATH=$$clean_path($${OUT_PWD}/../../)
CONFIG += c++11
DEPENDPATH *= $$clean_path($${RS_SRC_PATH}/libretroshare/src/) DEPENDPATH *= $$clean_path($${RS_SRC_PATH}/libretroshare/src/)
INCLUDEPATH *= $$clean_path($${RS_SRC_PATH}/libretroshare/src) INCLUDEPATH *= $$clean_path($${RS_SRC_PATH}/libretroshare/src)
LIBS *= -L$$clean_path($${RS_BUILD_PATH}/libretroshare/src/lib/) -lretroshare LIBS *= -L$$clean_path($${RS_BUILD_PATH}/libretroshare/src/lib/) -lretroshare

19
retroshare.pri
View file

@ -479,11 +479,6 @@ no_rs_cppwarning {
rs_gxs_trans { rs_gxs_trans {
DEFINES *= RS_GXS_TRANS DEFINES *= RS_GXS_TRANS
greaterThan(QT_MAJOR_VERSION, 4) {
CONFIG += c++11
} else {
QMAKE_CXXFLAGS += -std=c++0x
}
} }
bitdht { bitdht {
@ -707,21 +702,7 @@ macx-* {
message(***retroshare.pri:MacOSX) message(***retroshare.pri:MacOSX)
# BIN_DIR += "/usr/bin"
# INC_DIR += "/usr/include"
# INC_DIR += "/usr/local/include"
# INC_DIR += "/opt/local/include"
# LIB_DIR += "/usr/local/lib"
# LIB_DIR += "/opt/local/lib"
BIN_DIR += "/Applications/Xcode.app/Contents/Developer/usr/bin" BIN_DIR += "/Applications/Xcode.app/Contents/Developer/usr/bin"
INC_DIR += "/usr/local/Cellar/miniupnpc/2.1/include"
INC_DIR += "/usr/local/Cellar/libmicrohttpd/0.9.62_1/include"
INC_DIR += "/usr/local/Cellar/sqlcipher/4.1.0/include"
LIB_DIR += "/usr/local/opt/openssl/lib/"
LIB_DIR += "/usr/local/Cellar/libmicrohttpd/0.9.62_1/lib"
LIB_DIR += "/usr/local/Cellar/sqlcipher/4.1.0/lib"
LIB_DIR += "/usr/local/Cellar/miniupnpc/2.1/lib"
CONFIG += c++11
INCLUDEPATH += "/usr/local/include" INCLUDEPATH += "/usr/local/include"
RS_UPNP_LIB = miniupnpc RS_UPNP_LIB = miniupnpc
QT += macextras QT += macextras