Skip to content

Commit

Permalink
fixed compilation
Browse files Browse the repository at this point in the history
csoler committed Nov 27, 2024
1 parent e110705 commit 3334e84
Showing 2 changed files with 12 additions and 14 deletions.
22 changes: 10 additions & 12 deletions src/libretroshare.pro
Original file line number Diff line number Diff line change
@@ -1153,19 +1153,17 @@ message("In rnp_rnplib precompilation code")
cd $${RS_SRC_PATH} && \
(git submodule update --init supportlibs/librnp || true ) && \
cd $${LIBRNP_SRC_PATH} && git submodule update --init src/libsexpp && \
mkdir -p $${LIBRNP_BUILD_PATH}
mkdir -p $${LIBRNP_BUILD_PATH}
}
librnp.commands += \
cd $${LIBRNP_BUILD_PATH} && \
cmake -DCMAKE_C_COMPILER=$$fixQmakeCC($$QMAKE_CC) \
-DCMAKE_CXX_COMPILER=$$QMAKE_CXX \
\"-DCMAKE_CXX_FLAGS=$${QMAKE_CXXFLAGS}\" \
$${CMAKE_GENERATOR_OVERRIDE} \
-DENABLE_COVERAGE=Off \
-DCMAKE_INSTALL_PREFIX=. -B. ..

librnp.commands += \
cd $$shell_path($${LIBRNP_BUILD_PATH}) && $(MAKE) $${LIBRNP_MAKE_PARAMS} rnp
librnp.commands += && cd $${LIBRNP_BUILD_PATH} && \
cmake -DCMAKE_C_COMPILER=$$fixQmakeCC($$QMAKE_CC) \
-DCMAKE_CXX_COMPILER=$$QMAKE_CXX \
\"-DCMAKE_CXX_FLAGS=$${QMAKE_CXXFLAGS}\" \
$${CMAKE_GENERATOR_OVERRIDE} \
-DENABLE_COVERAGE=Off \
-DCMAKE_INSTALL_PREFIX=. -B. ..

librnp.commands += && cd $$shell_path($${LIBRNP_BUILD_PATH}) && $(MAKE) $${LIBRNP_MAKE_PARAMS} rnp

QMAKE_EXTRA_COMPILERS += librnp
}
4 changes: 2 additions & 2 deletions src/use_libretroshare.pri
Original file line number Diff line number Diff line change
@@ -46,14 +46,14 @@ rs_rnplib {
LIBRNP_SRC_PATH=$$clean_path($${RS_SRC_PATH}/supportlibs/librnp)
LIBRNP_BUILD_PATH=$$clean_path($${RS_BUILD_PATH}/supportlibs/librnp/Build)
INCLUDEPATH *= $$clean_path($${LIBRNP_SRC_PATH}/include/)
INCLUDEPATH *= $$clean_path($${LIBRNP_SRC_PATH}/src/lib/)
INCLUDEPATH *= $$clean_path($${LIBRNP_BUILD_PATH}/src/lib/)
DEPENDPATH *= $$clean_path($${LIBRNP_BUILD_PATH})
QMAKE_LIBDIR *= $$clean_path($${LIBRNP_BUILD_PATH}/src/lib/)

LIBS *= -L$$clean_path($${LIBRNP_BUILD_PATH}/src/lib) -lrnp -lbz2 -lz
LIBS *= -L$$clean_path($${LIBRNP_BUILD_PATH}/src/libsexpp) -lsexpp -lbotan-2 -ljsoncpp -ljson-c

PRE_TARGETDEPS += $$clean_path($${LIBRNP_BUILD_PATH}/src/lib/librnp.a)
#PRE_TARGETDEPS += $$clean_path($${LIBRNP_BUILD_PATH}/src/lib/librnp.a)

message("Using librnp. Configuring paths for submodule.")
message(" LIBRNP_SRC_PATH = "$${LIBRNP_SRC_PATH})

0 comments on commit 3334e84

Please sign in to comment.