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

windows: remove obsolete sdl_install and openssl_install make targets (now provided by msys2)

Browse Source
This commit is contained in:
Philippe Renon 2016-01-22 22:17:53 +01:00
parent d222361663
commit e42539347b
3 changed files with 0 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -603,9 +603,7 @@ help:
@$(ECHO) " arm_sdk_install - Install the GNU ARM gcc toolchain"
@$(ECHO) " qt_sdk_install - Install the QT development tools"
@$(ECHO) " nsis_install - Install the NSIS Unicode (Windows only)"
@$(ECHO) " sdl_install - Install the SDL library (Windows only)"
@$(ECHO) " mesawin_install - Install the OpenGL32 DLL (Windows only)"
@$(ECHO) " openssl_install - Install the OpenSSL libraries (Windows only)"
@$(ECHO) " uncrustify_install - Install the Uncrustify source code beautifier"
@$(ECHO) " doxygen_install - Install the Doxygen documentation generator"
@$(ECHO) " gtest_install - Install the GoogleTest framework"

7
ground/gcs/gcs.pri
View File

@ -171,12 +171,6 @@ macx {
!isEqual(GCS_SOURCE_TREE, $$GCS_BUILD_TREE):copydata = 1
win32 {
SDL_DIR = $$(SDL_DIR)
isEmpty(SDL_DIR):SDL_DIR = $${TOOLS_DIR}/SDL-1.2.15
OPENSSL_DIR = $$(OPENSSL_DIR)
isEmpty(OPENSSL_DIR):OPENSSL_DIR = $${TOOLS_DIR}/openssl-1.0.1e-win32
MESAWIN_DIR = $$(MESAWIN_DIR)
isEmpty(MESAWIN_DIR):MESAWIN_DIR = $${TOOLS_DIR}/mesawin
@ -259,4 +253,3 @@ macx {
# use ccache when available
QMAKE_CC = $$(CCACHE) $$QMAKE_CC
QMAKE_CXX = $$(CCACHE) $$QMAKE_CXX

55
make/tools.mk
View File

@ -11,8 +11,6 @@
# arm_sdk_install
# qt_sdk_install
# nsis_install (Windows only)
# sdl_install (Windows only)
# openssl_install (Windows only)
# mesawin_install (Windows only)
# uncrustify_install
# doxygen_install
@ -117,8 +115,6 @@ else ifeq ($(UNAME), Windows)
QT_SDK_MD5_URL := http://download.qt.io/official_releases/qt/5.5/5.5.1/qt-opensource-windows-x86-mingw492-5.5.1.exe.md5
QT_SDK_ARCH := mingw492_32
NSIS_URL := http://librepilot.github.io/tools/nsis-2.46-unicode.tar.bz2
SDL_URL := http://librepilot.github.io/tools/SDL-devel-1.2.15-mingw32.tar.gz
OPENSSL_URL := http://librepilot.github.io/tools/openssl-1.0.1e-win32.tar.bz2
UNCRUSTIFY_URL := http://librepilot.github.io/tools/uncrustify-0.60-windows.tar.bz2
DOXYGEN_URL := http://librepilot.github.io/tools/doxygen-1.8.3.1-windows.tar.bz2
MESAWIN_URL := http://librepilot.github.io/tools/mesawin.tar.gz
@ -153,9 +149,6 @@ else ifeq ($(UNAME), Windows)
# When changing PYTHON_DIR, you must also update it in ground/gcs/src/python.pri
PYTHON_DIR := $(QT_SDK_DIR)/Tools/$(QT_SDK_ARCH)/opt/bin
NSIS_DIR := $(TOOLS_DIR)/nsis-2.46-unicode
# When changing SDL_DIR or OPENSSL_DIR, you must also update them in ground/gcs/gcs.pri
SDL_DIR := $(TOOLS_DIR)/SDL-1.2.15
OPENSSL_DIR := $(TOOLS_DIR)/openssl-1.0.1e-win32
MESAWIN_DIR := $(TOOLS_DIR)/mesawin
OSG_SDK_DIR := $(OSG_TOOLS_DIR)/osg-3.4-mingw492_32-qt-5.5.1
OSGEARTH_SDK_DIR := $(OSG_TOOLS_DIR)/osgearth-2.7-mingw492_32-qt-5.5.1
@ -641,29 +634,6 @@ nsis_version:
endif
##############################
#
# SDL (Windows only)
#
##############################
ifeq ($(UNAME), Windows)
$(eval $(call TOOL_INSTALL_TEMPLATE,sdl,$(SDL_DIR),$(SDL_URL),,$(notdir $(SDL_URL))))
ifeq ($(shell [ -d "$(SDL_DIR)" ] && $(ECHO) "exists"), exists)
export SDL_DIR := $(SDL_DIR)
else
# not installed, hope it's in the path...
$(info $(EMPTY) WARNING $(call toprel, $(SDL_DIR)) not found (make sdl_install), using system PATH)
endif
.PHONY: sdl_version
sdl_version:
-$(V1) $(ECHO) "SDL 1.2.15"
endif
##################################
#
# Mesa OpenGL DLL (Windows only)
@ -687,31 +657,6 @@ mesawin_version:
endif
##############################
#
# OpenSSL (Windows only)
#
##############################
ifeq ($(UNAME), Windows)
$(eval $(call TOOL_INSTALL_TEMPLATE,openssl,$(OPENSSL_DIR),$(OPENSSL_URL),,$(notdir $(OPENSSL_URL))))
ifeq ($(shell [ -d "$(OPENSSL_DIR)" ] && $(ECHO) "exists"), exists)
export OPENSSL := $(OPENSSL_DIR)/bin/openssl
export OPENSSL_CONF := $(OPENSSL_DIR)/bin/openssl.cfg
export OPENSSL_DIR
else
# not installed, hope it's in the path...
# $(info $(EMPTY) WARNING $(call toprel, $(OPENSSL_DIR)) not found (make openssl_install), using system PATH)
endif
.PHONY: openssl_version
openssl_version:
-$(V1) $(ECHO) "OpenSSL `$(OPENSSL) version`"
endif
##############################
#
# Uncrustify