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

windows: make sure to use mingw32-make when invoking cmake to build third party libraries

Browse Source
This commit is contained in:
Philippe Renon 2016-01-27 08:46:16 +01:00
parent da884f5432
commit e7629dcedf
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -77,6 +77,7 @@ marble:
$(V1) ( $(CD) $(MARBLE_BUILD_DIR) && \
PATH=$(MARBLE_BUILD_PATH) && \
$(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 \
-DCMAKE_INSTALL_PREFIX=$(MARBLE_INSTALL_DIR) $(MARBLE_SRC_DIR) && \
$(MAKE) && \

6
make/3rdparty/osgearth/osgearth.mk vendored
View File

@ -63,7 +63,6 @@ else ifeq ($(UNAME), Darwin)
else ifeq ($(UNAME), Windows)
OSG_NAME := $(OSG_BASE_NAME)-$(QT_SDK_ARCH)
OSG_CMAKE_GENERATOR := "MinGW Makefiles"
OSG_CMAKE_MAKE_PROGRAM := /mingw32/bin/mingw32-make
endif
OSG_NAME := $(OSG_NAME_PREFIX)$(OSG_NAME)$(OSG_NAME_SUFIX)
@ -81,7 +80,7 @@ osg:
PATH=$(OSG_BUILD_PATH) ; \
fi ; \
$(CMAKE) -G $(OSG_CMAKE_GENERATOR) -DCMAKE_BUILD_TYPE=$(OSG_BUILD_CONF) \
-DCMAKE_MAKE_PROGRAM=$(OSG_CMAKE_MAKE_PROGRAM) \
-DCMAKE_MAKE_PROGRAM=$(MAKE) \
-DOSG_USE_QT=ON \
-DBUILD_OSG_APPLICATIONS=ON \
-DBUILD_OSG_EXAMPLES=OFF \
@ -212,7 +211,6 @@ else ifeq ($(UNAME), Darwin)
else ifeq ($(UNAME), Windows)
OSGEARTH_NAME := $(OSGEARTH_BASE_NAME)-$(QT_SDK_ARCH)
OSGEARTH_CMAKE_GENERATOR := "MinGW Makefiles"
OSGEARTH_CMAKE_MAKE_PROGRAM := /mingw32/bin/mingw32-make
OSGEARTH_LIB_PATH := $(OSG_INSTALL_DIR)/lib
endif
@ -234,7 +232,7 @@ osgearth:
export DYLD_LIBRARY_PATH=$(OSGEARTH_LIB_PATH) && \
unset OSG_NOTIFY_LEVEL && \
$(CMAKE) -G $(OSGEARTH_CMAKE_GENERATOR) -DCMAKE_BUILD_TYPE=$(OSGEARTH_BUILD_CONF) \
-DCMAKE_MAKE_PROGRAM=$(OSGEARTH_CMAKE_MAKE_PROGRAM) \
-DCMAKE_MAKE_PROGRAM=$(MAKE) \
-DOSGEARTH_USE_QT=ON \
-DINSTALL_TO_OSG_DIR=OFF \
-DOSG_DIR=$(OSG_INSTALL_DIR) \

5
make/tools.mk
View File

@ -218,6 +218,11 @@ ifneq ($(shell $(SEVENZIP) --version >/dev/null 2>&1 && $(ECHO) "found"), found)
SEVENZIP = $(TOOLS_DIR)/bin/7za.exe
endif
endif
ifneq ($(UNAME), Windows)
MAKE := make
else
MAKE := mingw32-make
endif
# Echo in recipes is a bit tricky in a Windows Git Bash window in some cases.
# It does not work if make started under msysGit installed into a path with spaces.