Make - use relative paths (#7519)

#changelog #make
openframeworks · May 11, 2024 · c705b4e · c705b4e
1 parent 202aa24
commit c705b4e
Show file tree

Hide file tree

Showing 15 changed files with 19 additions and 18 deletions.
diff --git a/libs/openFrameworksCompiled/project/makefileCommon/compile.project.mk b/libs/openFrameworksCompiled/project/makefileCommon/compile.project.mk
@@ -5,7 +5,7 @@ OF_SHARED_MAKEFILES_PATH=$(OF_ROOT)/libs/openFrameworksCompiled/project/makefile
 
 # if APPNAME is not defined, set it to the project dir name
 ifndef APPNAME
-	APPNAME = $(shell basename `pwd`)
+	APPNAME = $(shell basename "`pwd`")
 endif
 
 include $(OF_SHARED_MAKEFILES_PATH)/config.shared.mk
@@ -301,7 +301,8 @@ $(OF_PROJECT_OBJ_OUTPUT_PATH)%.o: $(PROJECT_EXTERNAL_SOURCE_PATHS)/%.S $(OF_PROJ
 
 
 #Rules to compile the addons sources when the addon path is specified explicitly
-PROJECT_ADDONS_OBJ_PATH=$(realpath .)/$(OF_PROJECT_OBJ_OUTPUT_PATH)addons/
+# PROJECT_ADDONS_OBJ_PATH=$(realpath .)/$(OF_PROJECT_OBJ_OUTPUT_PATH)addons/
+PROJECT_ADDONS_OBJ_PATH=./$(OF_PROJECT_OBJ_OUTPUT_PATH)addons/
 $(PROJECT_ADDONS_OBJ_PATH)%.o: %.cpp $(OF_PROJECT_OBJ_OUTPUT_PATH).compiler_flags
 ifdef PROJECT_ADDON_PATHS
 	@echo "Compiling" $<

diff --git a/libs/openFrameworksCompiled/project/makefileCommon/config.addons.mk b/libs/openFrameworksCompiled/project/makefileCommon/config.addons.mk
@@ -70,12 +70,12 @@ endef
 # 6: if PROCESS_NEXT eval the line to put the variable in the makefile space
 define parse_addon
 	$(if $(wildcard $(PROJECT_ROOT)/$1), \
-		$(eval addon=$(realpath $(addprefix $(PROJECT_ROOT)/, $1))) \
+		$(eval addon=$(addprefix $(PROJECT_ROOT)/, $1)) \
 		$(eval addon_obj_path=$(PROJECT_ROOT)) \
 		$(eval ADDON_PATHS+= $(dir $(addon))) \
 		$(eval obj_prefix=$(OF_PROJECT_OBJ_OUTPUT_PATH)addons/) \
 	, \
-		$(eval addon=$(realpath $(addprefix $(OF_ADDONS_PATH)/, $1))) \
+		$(eval addon=$(addprefix $(OF_ADDONS_PATH)/, $1)) \
 		$(eval addon_obj_path=$(OF_ADDONS_PATH)) \
 		$(eval obj_prefix=$(OF_PROJECT_OBJ_OUTPUT_PATH)) \
 	) \

diff --git a/libs/openFrameworksCompiled/project/makefileCommon/config.project.mk b/libs/openFrameworksCompiled/project/makefileCommon/config.project.mk
@@ -3,11 +3,11 @@
 # lists of source files, search paths, libraries, etc.
 #
 ifndef OF_ROOT
-	OF_ROOT= $(realpath ../../..)
+	OF_ROOT= ../../..
 endif
 
 ifndef PROJECT_ROOT
-	PROJECT_ROOT= $(realpath .)
+	PROJECT_ROOT= .
 endif
 
 

diff --git a/libs/openFrameworksCompiled/project/makefileCommon/config.shared.mk b/libs/openFrameworksCompiled/project/makefileCommon/config.shared.mk
@@ -19,7 +19,7 @@
 
 
 SHELL ?= /bin/sh
-OF_ROOT ?=  $(realpath ../../..)
+OF_ROOT ?= ../../..
 PLATFORM_VARIANT ?= default
 
 # ifeq ($(CC),$(EMSCRIPTEN)/emcc)

diff --git a/scripts/qtcreator/templates/wizards/openFrameworks/Makefile b/scripts/qtcreator/templates/wizards/openFrameworks/Makefile
@@ -6,7 +6,7 @@ endif
 
 # make sure the the OF_ROOT location is defined
 ifndef OF_ROOT
-	OF_ROOT=$(realpath ../../..)
+	OF_ROOT=../../..
 endif
 
 # call the project makefile!

diff --git a/scripts/qtcreator/templates/wizards/openFrameworksUpdate/Makefile b/scripts/qtcreator/templates/wizards/openFrameworksUpdate/Makefile
@@ -6,7 +6,7 @@ endif
 
 # make sure the the OF_ROOT location is defined
 ifndef OF_ROOT
-	OF_ROOT=$(realpath ../../..)
+	OF_ROOT=../../..
 endif
 
 # call the project makefile!

diff --git a/scripts/templates/emscripten/Makefile b/scripts/templates/emscripten/Makefile
@@ -6,7 +6,7 @@ endif
 
 # make sure the the OF_ROOT location is defined
 ifndef OF_ROOT
-	OF_ROOT=$(realpath ../../..)
+	OF_ROOT=../../..
 endif
 
 # call the project makefile!

diff --git a/scripts/templates/linux/Makefile b/scripts/templates/linux/Makefile
@@ -6,7 +6,7 @@ endif
 
 # make sure the the OF_ROOT location is defined
 ifndef OF_ROOT
-	OF_ROOT=$(realpath ../../..)
+	OF_ROOT=../../..
 endif
 
 # call the project makefile!

diff --git a/scripts/templates/linux64/Makefile b/scripts/templates/linux64/Makefile
@@ -6,7 +6,7 @@ endif
 
 # make sure the the OF_ROOT location is defined
 ifndef OF_ROOT
-	OF_ROOT=$(realpath ../../..)
+	OF_ROOT=../../..
 endif
 
 # call the project makefile!

diff --git a/scripts/templates/linuxaarch64/Makefile b/scripts/templates/linuxaarch64/Makefile
@@ -6,7 +6,7 @@ endif
 
 # make sure the the OF_ROOT location is defined
 ifndef OF_ROOT
-	OF_ROOT=$(realpath ../../..)
+	OF_ROOT=../../..
 endif
 
 # call the project makefile!

diff --git a/scripts/templates/linuxarmv6l/Makefile b/scripts/templates/linuxarmv6l/Makefile
@@ -6,7 +6,7 @@ endif
 
 # make sure the the OF_ROOT location is defined
 ifndef OF_ROOT
-	OF_ROOT=$(realpath ../../..)
+	OF_ROOT=../../..
 endif
 
 # call the project makefile!

diff --git a/scripts/templates/linuxarmv7l/Makefile b/scripts/templates/linuxarmv7l/Makefile
@@ -6,7 +6,7 @@ endif
 
 # make sure the the OF_ROOT location is defined
 ifndef OF_ROOT
-	OF_ROOT=$(realpath ../../..)
+	OF_ROOT=../../..
 endif
 
 # call the project makefile!

diff --git a/scripts/templates/msys2/Makefile b/scripts/templates/msys2/Makefile
@@ -6,7 +6,7 @@ endif
 
 # make sure the the OF_ROOT location is defined
 ifndef OF_ROOT
-	OF_ROOT=$(realpath ../../..)
+	OF_ROOT=../../..
 endif
 
 # call the project makefile!

diff --git a/scripts/templates/osx/Makefile b/scripts/templates/osx/Makefile
@@ -6,7 +6,7 @@ endif
 
 # make sure the the OF_ROOT location is defined
 ifndef OF_ROOT
-	OF_ROOT=$(realpath ../../..)
+	OF_ROOT=../../..
 endif
 
 # call the project makefile!

diff --git a/scripts/templates/vscode/Makefile b/scripts/templates/vscode/Makefile
@@ -6,7 +6,7 @@ endif
 
 # make sure the the OF_ROOT location is defined
 ifndef OF_ROOT
-	OF_ROOT=$(realpath ../../..)
+	OF_ROOT=../../..
 endif
 
 # call the project makefile!