rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-01-19 04:52:12 +01:00
Code Issues Releases Activity

LP-30 removed references to OP and other minor cleanups

Browse Source
This commit is contained in:
Philippe Renon 2015-09-06 17:05:29 +02:00
parent 9658ba3500
commit ca1fa5fe3e
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -54,16 +54,16 @@
# This will: # This will:
# - clone the git repositories into the ./3rdparty directory # - clone the git repositories into the ./3rdparty directory
# - build osg in the build directory, building steps are : cmake, make, make install # - build osg in the build directory, building steps are : cmake, make, make install
# - intall osg (in the OP tools directory) # - intall osg in the build directory
# - create distribution files in the build directory # - create distribution files in the build directory
# - TODO: upload distribution files to the OP wiki download page # - TODO: upload distribution files to the wiki download page
# #
################################ ################################
# Todo # Todo
# - install osgearth in osg (a minor issue in the osgearth cmake file prevents it) # - install osgearth in osg (a minor issue in the osgearth cmake file prevents it)
# easy to fix then set INSTALL_TO_OSG_DIR=ON when running cmake on osgearth # easy to fix then set INSTALL_TO_OSG_DIR=ON when running cmake on osgearth
# - don't build osg deprecated code (if we don't use it...) # - don't build osg deprecated code (if we don't use it...)
# - add targets to publish distribution files to OP wiki. # - add targets to upload distribution files to wiki.
# - provide complete list of dependencies for osg and osgearth (current list is most probably incomplete as I already had some stuff installed) # - provide complete list of dependencies for osg and osgearth (current list is most probably incomplete as I already had some stuff installed)
# #
################################ ################################
@ -150,7 +150,7 @@ osg:
.PHONY: package_osg .PHONY: package_osg
package_osg: package_osg:
@$(ECHO) "Packaging $(call toprel, $(OSG_INSTALL_DIR)) into $(notdir $(OSG_INSTALL_DIR)).tar" @$(ECHO) "Packaging $(call toprel, $(OSG_INSTALL_DIR)) into $(notdir $(OSG_INSTALL_DIR)).tar"
#$(V1) $(CP) $(ROOT_DIR)/make/3rdparty/OpenPilotReadme.txt $(OSG_INSTALL_DIR)/ #$(V1) $(CP) $(ROOT_DIR)/make/3rdparty/LibrePilotReadme.txt $(OSG_INSTALL_DIR)/
$(V1) ( \ $(V1) ( \
$(CD) $(OSG_INSTALL_DIR)/.. && \ $(CD) $(OSG_INSTALL_DIR)/.. && \
$(TAR) cf $(notdir $(OSG_INSTALL_DIR)).tar $(notdir $(OSG_INSTALL_DIR)) && \ $(TAR) cf $(notdir $(OSG_INSTALL_DIR)).tar $(notdir $(OSG_INSTALL_DIR)) && \

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

@ -15,7 +15,8 @@
WORKING_DIR=$PWD WORKING_DIR=$PWD
ROOT_DIR=/d/Projects/OpenPilot # TODO this should not be hardwired
ROOT_DIR=/d/Projects/LibrePilot
DOWNLOAD_DIR=$ROOT_DIR/downloads/osgearth DOWNLOAD_DIR=$ROOT_DIR/downloads/osgearth
SOURCE_DIR=$ROOT_DIR/3rdparty/osgearth_dependencies SOURCE_DIR=$ROOT_DIR/3rdparty/osgearth_dependencies
@ -186,9 +187,6 @@ cd freetype-2.5.3
make make
make install make install
# hack for osg
#mv $BUILD_DIR/include/freetype2 $BUILD_DIR/include/freetype
fi fi
################################################################################ ################################################################################