mirror of
https://bitbucket.org/librepilot/librepilot.git
synced 2024-12-11 19:24:10 +01:00
Merged in filnet/librepilot/tools (pull request #279)
disable osg and osgearth sdk install targets on windows
This commit is contained in:
commit
e730151a68
@ -587,16 +587,14 @@ endif
|
|||||||
.PHONY: mingw_version
|
.PHONY: mingw_version
|
||||||
mingw_version: gcc_version
|
mingw_version: gcc_version
|
||||||
|
|
||||||
else # Linux or Mac
|
|
||||||
|
|
||||||
all_sdk_version: gcc_version
|
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
.PHONY: gcc_version
|
.PHONY: gcc_version
|
||||||
gcc_version:
|
gcc_version:
|
||||||
-$(V1) gcc --version | head -n1
|
-$(V1) gcc --version | head -n1
|
||||||
|
|
||||||
|
all_sdk_version: gcc_version
|
||||||
|
|
||||||
##############################
|
##############################
|
||||||
#
|
#
|
||||||
# Python
|
# Python
|
||||||
@ -821,7 +819,11 @@ $(eval $(call TOOL_INSTALL_TEMPLATE,ccache,$(CCACHE_BUILD_DIR),$(CCACHE_URL),$(C
|
|||||||
#
|
#
|
||||||
##############################
|
##############################
|
||||||
|
|
||||||
$(eval $(call TOOL_INSTALL_TEMPLATE,osg,$(OSG_SDK_DIR),$(OSG_URL),,$(notdir $(OSG_URL))))
|
ifneq ($(UNAME), Windows)
|
||||||
|
|
||||||
|
$(eval $(call TOOL_INSTALL_TEMPLATE,osg,$(OSG_SDK_DIR),$(OSG_URL),,$(notdir $(OSG_URL))))
|
||||||
|
|
||||||
|
endif
|
||||||
|
|
||||||
ifeq ($(shell [ -d "$(OSG_SDK_DIR)" ] && $(ECHO) "exists"), exists)
|
ifeq ($(shell [ -d "$(OSG_SDK_DIR)" ] && $(ECHO) "exists"), exists)
|
||||||
export OSG_SDK_DIR := $(OSG_SDK_DIR)
|
export OSG_SDK_DIR := $(OSG_SDK_DIR)
|
||||||
@ -840,7 +842,11 @@ osg_version:
|
|||||||
#
|
#
|
||||||
##############################
|
##############################
|
||||||
|
|
||||||
$(eval $(call TOOL_INSTALL_TEMPLATE,osgearth,$(OSGEARTH_SDK_DIR),$(OSGEARTH_URL),,$(notdir $(OSGEARTH_URL))))
|
ifneq ($(UNAME), Windows)
|
||||||
|
|
||||||
|
$(eval $(call TOOL_INSTALL_TEMPLATE,osgearth,$(OSGEARTH_SDK_DIR),$(OSGEARTH_URL),,$(notdir $(OSGEARTH_URL))))
|
||||||
|
|
||||||
|
endif
|
||||||
|
|
||||||
ifeq ($(shell [ -d "$(OSGEARTH_SDK_DIR)" ] && $(ECHO) "exists"), exists)
|
ifeq ($(shell [ -d "$(OSGEARTH_SDK_DIR)" ] && $(ECHO) "exists"), exists)
|
||||||
export OSGEARTH_SDK_DIR := $(OSGEARTH_SDK_DIR)
|
export OSGEARTH_SDK_DIR := $(OSGEARTH_SDK_DIR)
|
||||||
|
Loading…
Reference in New Issue
Block a user