rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-01 09:24:10 +01:00
Code Issues Releases Activity

LP-30 use .patch extension instead of .diff for patch files

Browse Source
This commit is contained in:
Philippe Renon 2015-09-08 22:53:47 +02:00
parent 7b443715ae
commit 225097fbcb
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -66,7 +66,7 @@ MARBLE_SRC_DIR := $(ROOT_DIR)/3rdparty/marble
MARBLE_BUILD_DIR := $(BUILD_DIR)/3rdparty/$(MARBLE_NAME) MARBLE_BUILD_DIR := $(BUILD_DIR)/3rdparty/$(MARBLE_NAME)
MARBLE_INSTALL_DIR := $(BUILD_DIR)/3rdparty/install/$(MARBLE_NAME) MARBLE_INSTALL_DIR := $(BUILD_DIR)/3rdparty/install/$(MARBLE_NAME)
MARBLE_DATA_DIR := $(MARBLE_INSTALL_DIR)/$(MARBLE_DATA_BASE_DIR) MARBLE_DATA_DIR := $(MARBLE_INSTALL_DIR)/$(MARBLE_DATA_BASE_DIR)
MARBLE_PATCH_FILE := $(ROOT_DIR)/make/3rdparty/marble-$(MARBLE_VERSION)_patch.diff MARBLE_PATCH_FILE := $(ROOT_DIR)/make/3rdparty/marble-$(MARBLE_VERSION).patch
.PHONY: marble .PHONY: marble
marble: marble:

0
make/3rdparty/osgearth/gdal_GNUmakefile_fix.diff → make/3rdparty/osgearth/gdal_GNUmakefile_fix.patch vendored
View File

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

@ -123,7 +123,7 @@ OSG_NAME := $(OSG_NAME_PREFIX)$(OSG_NAME)$(OSG_NAME_SUFIX)
OSG_SRC_DIR := $(ROOT_DIR)/3rdparty/osg OSG_SRC_DIR := $(ROOT_DIR)/3rdparty/osg
OSG_BUILD_DIR := $(BUILD_DIR)/3rdparty/$(OSG_NAME) OSG_BUILD_DIR := $(BUILD_DIR)/3rdparty/$(OSG_NAME)
OSG_INSTALL_DIR := $(BUILD_DIR)/3rdparty/install/$(OSG_NAME) OSG_INSTALL_DIR := $(BUILD_DIR)/3rdparty/install/$(OSG_NAME)
OSG_PATCH_FILE := $(ROOT_DIR)/make/3rdparty/osg-$(OSG_VERSION)_patch.diff OSG_PATCH_FILE := $(ROOT_DIR)/make/3rdparty/osg-$(OSG_VERSION).patch
.PHONY: osg .PHONY: osg
osg: osg:
@ -249,7 +249,7 @@ OSGEARTH_BUILD_DIR := $(BUILD_DIR)/3rdparty/$(OSGEARTH_NAME)
# osgearth will be installed into osg (there is an offical option to do that but it seems broken on mingw) # osgearth will be installed into osg (there is an offical option to do that but it seems broken on mingw)
#OSGEARTH_INSTALL_DIR := $(BUILD_DIR)/3rdparty/install/$(OSGEARTH_NAME) #OSGEARTH_INSTALL_DIR := $(BUILD_DIR)/3rdparty/install/$(OSGEARTH_NAME)
OSGEARTH_INSTALL_DIR := $(OSG_INSTALL_DIR) OSGEARTH_INSTALL_DIR := $(OSG_INSTALL_DIR)
OSGEARTH_PATCH_FILE := $(ROOT_DIR)/make/3rdparty/osgearth-$(OSGEARTH_VERSION)_patch.diff OSGEARTH_PATCH_FILE := $(ROOT_DIR)/make/3rdparty/osgearth-$(OSGEARTH_VERSION).patch
.PHONY: osgearth .PHONY: osgearth
osgearth: osgearth:

2
make/3rdparty/osgearth/osgearth_dependencies_win.sh vendored
View File

@ -294,7 +294,7 @@ tar xzf $DOWNLOAD_DIR/gdal-1.10.1.tar.gz -C .
cd gdal-1.10.1 cd gdal-1.10.1
# fix GNUmakefile as described here http://trac.osgeo.org/gdal/wiki/BuildingWithMinGW # fix GNUmakefile as described here http://trac.osgeo.org/gdal/wiki/BuildingWithMinGW
patch < $WORKING_DIR/gdal_GNUmakefile_fix.diff patch < $WORKING_DIR/gdal_GNUmakefile_fix.patch
./configure --prefix=$BUILD_DIR --build=$HOST \ ./configure --prefix=$BUILD_DIR --build=$HOST \
--without-python --without-libtool \ --without-python --without-libtool \