subpaths

Author: danoli3

libs/openFrameworksCompiled/project/makefileCommon/config.shared.mk

@@ -90,60 +90,58 @@ ifdef MAKEFILE_DEBUG
 	$(info JETSON_DETECTED=$(JETSON_DETECTED))
 endif
 
-# if not defined, construct the default PLATFORM_LIB_SUBPATH
-ifndef PLATFORM_LIB_SUBPATH
-	# determine from the arch
-	ifeq ($(PLATFORM_OS),Linux)
-		ifeq ($(RPI_DETECTED),yes)
-			else ifeq ($(PLATFORM_ARCH),armv6l)
-				PLATFORM_LIB_SUBPATH=linux/armv6l
-			else ifeq ($(PLATFORM_ARCH),armv7l)
-				PLATFORM_LIB_SUBPATH=linux/armv7l
-			else ifeq ($(PLATFORM_ARCH),armv8l)
-				PLATFORM_LIB_SUBPATH=linux/armv8l
-			else ifeq ($(PLATFORM_ARCH),aarch64)
-				PLATFORM_LIB_SUBPATH=linux/aarch64
-		else ifeq ($(JETSON_DETECTED),yes)
-			PLATFORM_LIB_SUBPATH=linux/jetson
+# determine from the arch
+ifeq ($(PLATFORM_OS),Linux)
+	ifeq ($(RPI_DETECTED),yes)
+		else ifeq ($(PLATFORM_ARCH),armv6l)
+			PLATFORM_LIB_SUBPATH=linux/armv6l
+		else ifeq ($(PLATFORM_ARCH),armv7l)
+			PLATFORM_LIB_SUBPATH=linux/armv7l
+		else ifeq ($(PLATFORM_ARCH),armv8l)
+			PLATFORM_LIB_SUBPATH=linux/armv8l
+		else ifeq ($(PLATFORM_ARCH),aarch64)
+			PLATFORM_LIB_SUBPATH=linux/aarch64
+	else ifeq ($(JETSON_DETECTED),yes)
+		PLATFORM_LIB_SUBPATH=linux/jetson
+	else
+		ifeq ($(PLATFORM_ARCH),x86_64)
+			PLATFORM_LIB_SUBPATH=linux/64
+		else ifeq ($(PLATFORM_ARCH),64)
+			PLATFORM_LIB_SUBPATH=linux/64
+		else ifeq ($(PLATFORM_ARCH),arm64)
+			PLATFORM_LIB_SUBPATH=linux/arm64
+		else ifeq ($(PLATFORM_ARCH),aarch64)
+			PLATFORM_LIB_SUBPATH=linux/arm64
 		else
-			ifeq ($(PLATFORM_ARCH),x86_64)
-				PLATFORM_LIB_SUBPATH=linux/64
-			else ifeq ($(PLATFORM_ARCH),64)
-				PLATFORM_LIB_SUBPATH=linux/64
-			else ifeq ($(PLATFORM_ARCH),arm64)
-				PLATFORM_LIB_SUBPATH=linux/arm64
-			else ifeq ($(PLATFORM_ARCH),aarch64)
-				PLATFORM_LIB_SUBPATH=linux/arm64
-			else
-				PLATFORM_LIB_SUBPATH=linux
-				$(error This makefile does not support your architecture $(PLATFORM_ARCH))
-			endif
+			PLATFORM_LIB_SUBPATH=linux
+			$(error This makefile does not support your architecture $(PLATFORM_ARCH))
 		endif
-		SHARED_LIB_EXTENSION=so
-	else ifneq (,$(findstring MINGW32_NT,$(PLATFORM_OS)))
-		PLATFORM_LIB_SUBPATH=msys2
-		SHARED_LIB_EXTENSION=dll
-	else ifneq (,$(findstring MSYS_NT,$(PLATFORM_OS)))
-		PLATFORM_LIB_SUBPATH=msys2
-		SHARED_LIB_EXTENSION=dll
-	else ifneq (,$(findstring MINGW64_NT,$(PLATFORM_OS)))
-		PLATFORM_LIB_SUBPATH=msys2
-		SHARED_LIB_EXTENSION=dll
-	else ifeq ($(PLATFORM_OS),Android)
-		PLATFORM_LIB_SUBPATH=android
-		SHARED_LIB_EXTENSION=so
-	else ifeq ($(PLATFORM_OS),Darwin)
-		PLATFORM_LIB_SUBPATH=osx
-		SHARED_LIB_EXTENSION=dylib
-	else ifeq ($(PLATFORM_OS),emscripten)
-		PLATFORM_LIB_SUBPATH=emscripten
-		SHARED_LIB_EXTENSION=so
-	else
-		$(error This makefile does not support your operating system)
 	endif
+	SHARED_LIB_EXTENSION=so
+else ifneq (,$(findstring MINGW32_NT,$(PLATFORM_OS)))
+	PLATFORM_LIB_SUBPATH=msys2
+	SHARED_LIB_EXTENSION=dll
+else ifneq (,$(findstring MSYS_NT,$(PLATFORM_OS)))
+	PLATFORM_LIB_SUBPATH=msys2
+	SHARED_LIB_EXTENSION=dll
+else ifneq (,$(findstring MINGW64_NT,$(PLATFORM_OS)))
+	PLATFORM_LIB_SUBPATH=msys2
+	SHARED_LIB_EXTENSION=dll
+else ifeq ($(PLATFORM_OS),Android)
+	PLATFORM_LIB_SUBPATH=android
+	SHARED_LIB_EXTENSION=so
+else ifeq ($(PLATFORM_OS),Darwin)
+	PLATFORM_LIB_SUBPATH=osx
+	SHARED_LIB_EXTENSION=dylib
+else ifeq ($(PLATFORM_OS),emscripten)
+	PLATFORM_LIB_SUBPATH=emscripten
+	SHARED_LIB_EXTENSION=so
+else
+	$(error This makefile does not support your operating system)
 endif
 
 
+
 # TODO: add appropriate list of platform suffixes
 # these variables will actually be used during compilation
 # http://en.wikipedia.org/wiki/Library_(computing)#File_naming