rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-03-16 08:29:15 +01:00
Code Issues Releases Activity

LP-30 fixed linux 64 packaging issue

Browse Source
This commit is contained in:
Philippe Renon 2015-09-08 09:12:30 +02:00
parent ca1fa5fe3e
commit 9436bae7c8
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -225,6 +225,11 @@ ifeq ($(UNAME), Linux)
OSGEARTH_CMAKE_GENERATOR := "Unix Makefiles" OSGEARTH_CMAKE_GENERATOR := "Unix Makefiles"
# for some reason Qt is not added to the path in make/tools.mk # for some reason Qt is not added to the path in make/tools.mk
OSGEARTH_BUILD_PATH := $(QT_SDK_PREFIX)/bin:$(OSG_INSTALL_DIR)/bin:$(PATH) OSGEARTH_BUILD_PATH := $(QT_SDK_PREFIX)/bin:$(OSG_INSTALL_DIR)/bin:$(PATH)
ifeq ($(ARCH), x86_64)
OSGEARTH_LIB_PATH := $(OSG_INSTALL_DIR)/lib64
else
OSGEARTH_LIB_PATH := $(OSG_INSTALL_DIR)/lib
endif
else ifeq ($(UNAME), Darwin) else ifeq ($(UNAME), Darwin)
OSGEARTH_NAME := $(OSGEARTH_BASE_NAME)-clang_64 OSGEARTH_NAME := $(OSGEARTH_BASE_NAME)-clang_64
OSGEARTH_CMAKE_GENERATOR := "Unix Makefiles" OSGEARTH_CMAKE_GENERATOR := "Unix Makefiles"
@ -235,6 +240,7 @@ else ifeq ($(UNAME), Windows)
OSGEARTH_CMAKE_GENERATOR := "MinGW Makefiles" OSGEARTH_CMAKE_GENERATOR := "MinGW Makefiles"
# CMake is quite picky about its PATH and will complain if sh.exe is found in it # CMake is quite picky about its PATH and will complain if sh.exe is found in it
OSGEARTH_BUILD_PATH := "$(TOOLS_DIR)/bin;$(QT_SDK_PREFIX)/bin;$(MINGW_DIR)/bin;$(OSG_INSTALL_DIR)/bin" OSGEARTH_BUILD_PATH := "$(TOOLS_DIR)/bin;$(QT_SDK_PREFIX)/bin;$(MINGW_DIR)/bin;$(OSG_INSTALL_DIR)/bin"
OSGEARTH_LIB_PATH := $(OSG_INSTALL_DIR)/lib
endif endif
OSGEARTH_NAME := $(OSG_NAME_PREFIX)$(OSGEARTH_NAME)$(OSG_NAME_SUFIX) OSGEARTH_NAME := $(OSG_NAME_PREFIX)$(OSGEARTH_NAME)$(OSG_NAME_SUFIX)
@ -251,8 +257,8 @@ osgearth:
$(V1) $(MKDIR) -p $(OSGEARTH_BUILD_DIR) $(V1) $(MKDIR) -p $(OSGEARTH_BUILD_DIR)
$(V1) ( $(CD) $(OSGEARTH_BUILD_DIR) && \ $(V1) ( $(CD) $(OSGEARTH_BUILD_DIR) && \
PATH=$(OSGEARTH_BUILD_PATH) && \ PATH=$(OSGEARTH_BUILD_PATH) && \
LD_LIBRARY_PATH=$(OSG_INSTALL_DIR)/lib && \ LD_LIBRARY_PATH=$(OSGEARTH_LIB_PATH) && \
export DYLD_LIBRARY_PATH=$(OSG_INSTALL_DIR)/lib && \ export DYLD_LIBRARY_PATH=$(OSG_LIB_PATH)/lib && \
$(CMAKE) -G $(OSGEARTH_CMAKE_GENERATOR) -DCMAKE_BUILD_TYPE=$(OSGEARTH_BUILD_CONF) \ $(CMAKE) -G $(OSGEARTH_CMAKE_GENERATOR) -DCMAKE_BUILD_TYPE=$(OSGEARTH_BUILD_CONF) \
-DOSGEARTH_USE_QT=ON \ -DOSGEARTH_USE_QT=ON \
-DINSTALL_TO_OSG_DIR=OFF \ -DINSTALL_TO_OSG_DIR=OFF \