Skip to content

Commit

Permalink
fix tabs and spaces with rpi makefiles. change permissions for instal…
Browse files Browse the repository at this point in the history
…l_dependcies.sh (#6455)
  • Loading branch information
ofTheo authored and arturoc committed Nov 16, 2019
1 parent 261af06 commit 20cb26d
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 23 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -50,14 +50,14 @@ USE_PI_LEGACY = 1
VER_ID = 0

#if we have this file lets see if we are Stretch or Newer
#then grab the Debian version ( 9 = Stretch, 10 = Buster )
ifneq (,$(wildcard $(RPI_ROOT)/etc/os-release))
#grab the Debian version ( 9 = Stretch, 10 = Buster )
VER_ID = $(shell grep -oP '(?<=^VERSION_ID=).+' $(RPI_ROOT)/etc/os-release | tr -d '"')
VER_ID = $(shell grep -oP '(?<=^VERSION_ID=).+' $(RPI_ROOT)/etc/os-release | tr -d '"')
endif

#check if we are newer than 8 and use the new system
ifeq ($(shell expr $(VER_ID) \>= 9), 1)
USE_PI_LEGACY = 0
USE_PI_LEGACY = 0
endif

$(info VER ID IS $(VER_ID))
Expand All @@ -66,13 +66,13 @@ $(info VER ID IS $(VER_ID))
PLATFORM_DEFINES += TARGET_RASPBERRY_PI

ifeq ($(USE_PI_LEGACY), 1)
PLATFORM_DEFINES += TARGET_RASPBERRY_PI_LEGACY
$(info using legacy build)
PLATFORM_DEFINES += TARGET_RASPBERRY_PI_LEGACY
$(info using legacy build)
else
# comment this for older EGL windowing. Has no effect if USE_PI_LEGACY is enabled
# GLFW seems to provide a more robust window on newer Raspbian releases
USE_GLFW_WINDOW = 1
$(info using newer build and GLFW window)
# comment this for older EGL windowing. Has no effect if USE_PI_LEGACY is enabled
# GLFW seems to provide a more robust window on newer Raspbian releases
USE_GLFW_WINDOW = 1
$(info using newer build and GLFW window)
endif

ifdef USE_GLFW_WINDOW
Expand Down Expand Up @@ -151,8 +151,7 @@ PLATFORM_CFLAGS += -pipe
#
# Note: Leave a leading space when adding list items with the += operator
################################################################################

#rpi4

ifdef USE_GLFW_WINDOW
PLATFORM_PKG_CONFIG_LIBRARIES += gl
PLATFORM_PKG_CONFIG_LIBRARIES += glu
Expand Down Expand Up @@ -234,7 +233,6 @@ PLATFORM_LIBRARY_SEARCH_PATHS += $(RPI_ROOT)/opt/vc/lib
# Note: Leave a leading space when adding list items with the += operator
################################################################################

#rpi4
ifndef USE_GLFW_WINDOW
PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/openFrameworks/app/ofAppGLFWWindow.cpp
else
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,13 @@ VER_ID = 0

#if we have this file lets see if we are Stretch or Newer
ifneq (,$(wildcard $(RPI_ROOT)/etc/os-release))
#grab the Debian version ( 9 = Stretch, 10 = Buster )
VER_ID = $(shell grep -oP '(?<=^VERSION_ID=).+' $(RPI_ROOT)/etc/os-release | tr -d '"')
#grab the Debian version ( 9 = Stretch, 10 = Buster )
VER_ID = $(shell grep -oP '(?<=^VERSION_ID=).+' $(RPI_ROOT)/etc/os-release | tr -d '"')
endif

#check if we are newer than 8 and use the new system
ifeq ($(shell expr $(VER_ID) \>= 9), 1)
USE_PI_LEGACY = 0
USE_PI_LEGACY = 0
endif

$(info VER ID IS $(VER_ID))
Expand All @@ -66,13 +66,13 @@ $(info VER ID IS $(VER_ID))
PLATFORM_DEFINES += TARGET_RASPBERRY_PI

ifeq ($(USE_PI_LEGACY), 1)
PLATFORM_DEFINES += TARGET_RASPBERRY_PI_LEGACY
$(info using legacy build)
PLATFORM_DEFINES += TARGET_RASPBERRY_PI_LEGACY
$(info using legacy build)
else
# comment this for older EGL windowing. Has no effect if USE_PI_LEGACY is enabled
# GLFW seems to provide a more robust window on newer Raspbian releases
USE_GLFW_WINDOW = 1
$(info using newer build and GLFW window)
# comment this for older EGL windowing. Has no effect if USE_PI_LEGACY is enabled
# GLFW seems to provide a more robust window on newer Raspbian releases
USE_GLFW_WINDOW = 1
$(info using newer build and GLFW window)
endif

ifdef USE_GLFW_WINDOW
Expand Down Expand Up @@ -153,7 +153,6 @@ PLATFORM_CFLAGS += -pipe
# Note: Leave a leading space when adding list items with the += operator
################################################################################

#rpi4
ifdef USE_GLFW_WINDOW
PLATFORM_PKG_CONFIG_LIBRARIES += gl
PLATFORM_PKG_CONFIG_LIBRARIES += glu
Expand Down Expand Up @@ -238,7 +237,6 @@ PLATFORM_LIBRARY_SEARCH_PATHS += $(RPI_ROOT)/opt/vc/lib
# Note: Leave a leading space when adding list items with the += operator
################################################################################

#rpi4
ifndef USE_GLFW_WINDOW
PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/openFrameworks/app/ofAppGLFWWindow.cpp
else
Expand Down
Empty file modified scripts/linux/debian/install_dependencies.sh
100644 → 100755
Empty file.

0 comments on commit 20cb26d

Please sign in to comment.