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

Merge pull request #2009 from hunbernd/feature/msys2enhancements

Browse source 
Reworked msys2 build scripts
This commit is contained in:
G10h4ck 2020-08-01 18:00:19 +02:00 • committed by GitHub
commit 9587cfd4d9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
47 changed files with 2940 additions and 167 deletions
Download patch file Download diff file Expand all files Collapse all files

5
retroshare-gui/src/retroshare-gui.pro
View file

@ -59,7 +59,7 @@ rs_gui_cmark {
DUMMYCMARKINPUT = FORCE
CMAKE_GENERATOR_OVERRIDE=""
win32-g++:CMAKE_GENERATOR_OVERRIDE="-G \"MSYS Makefiles\""
win32-g++|win32-clang-g++:CMAKE_GENERATOR_OVERRIDE="-G \"MSYS Makefiles\""
gencmarklib.name = Generating libcmark.
gencmarklib.input = DUMMYCMARKINPUT
gencmarklib.output = $$clean_path($${CMARK_BUILD_PATH}/src/libcmark.a)
@ -73,6 +73,7 @@ rs_gui_cmark {
mkdir -p $${CMARK_BUILD_PATH} && cd $${CMARK_BUILD_PATH} && \
cmake \
-DCMAKE_CXX_COMPILER=$$QMAKE_CXX \
\"-DCMAKE_CXX_FLAGS=$${QMAKE_CXXFLAGS}\" \
$${CMAKE_GENERATOR_OVERRIDE} \
-DCMAKE_INSTALL_PREFIX=. \
-B. \
@ -209,7 +210,7 @@ win32-x-g++ {
#################################### Windows #####################################
win32-g++ {
win32-g++|win32-clang-g++ {
CONFIG(debug, debug|release) {
# show console output
CONFIG += console