rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-20 10:54:14 +01:00
Code Issues Releases Activity

marble: port marble.mk to msys2

Browse Source
This commit is contained in:
Philippe Renon 2016-01-27 08:52:03 +01:00
parent a6b5a78229
commit 4981721c60
1 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
make/3rdparty/marble/marble.mk vendored
View File

@ -2,18 +2,6 @@
# Targets to build Marble
#
################################
# Linux prerequisites
################################
#
#
################################
# Windows prerequisites
################################
#
#
################################
# Building
################################
#
# $ make all_marble
#
@ -54,8 +42,6 @@ else ifeq ($(UNAME), Windows)
MARBLE_NAME := $(MARBLE_BASE_NAME)-$(QT_SDK_ARCH)
MARBLE_DATA_BASE_DIR := data
MARBLE_CMAKE_GENERATOR := "MinGW Makefiles"
# CMake is quite picky about its PATH and will complain if sh.exe is found in it
MARBLE_BUILD_PATH := "$(TOOLS_DIR)/bin;$(QT_SDK_PREFIX)/bin;$(MINGW_DIR)/bin;$$SYSTEMROOT/System32"
endif
MARBLE_NAME := $(MARBLE_NAME_PREFIX)$(MARBLE_NAME)$(MARBLE_NAME_SUFIX)
@ -72,7 +58,9 @@ marble:
@$(ECHO) "Building marble $(call toprel, $(MARBLE_SRC_DIR)) into $(call toprel, $(MARBLE_BUILD_DIR))"
$(V1) $(MKDIR) -p $(MARBLE_BUILD_DIR)
$(V1) ( $(CD) $(MARBLE_BUILD_DIR) && \
PATH=$(MARBLE_BUILD_PATH) && \
if [ -n "$(MARBLE_BUILD_PATH)" ]; then \
PATH=$(MARBLE_BUILD_PATH) ; \
fi ; \
$(CMAKE) -Wno-dev -G $(MARBLE_CMAKE_GENERATOR) -DCMAKE_BUILD_TYPE=$(MARBLE_BUILD_CONF) \
-DCMAKE_MAKE_PROGRAM=$(MAKE) \
-DQTONLY=1 -DQT5BUILD=1 -DWITH_DESIGNER_PLUGIN=0 \