Skip to content

Commit 16934e6

Browse files
committed
Fix Linux string issue
1 parent 34585e3 commit 16934e6

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -220,12 +220,10 @@ ifdef MAKEFILE_DEBUG
220220
$(info OF_SHARED_MAKEFILES_PATH=$(OF_SHARED_MAKEFILES_PATH))
221221
$(info OF_PLATFORM_MAKEFILES=$(OF_PLATFORM_MAKEFILES))
222222
$(info OF_CORE_LIB_PATH=$(OF_CORE_LIB_PATH))
223+
$(info PLATFORM_LIB_SUBPATH=$(PLATFORM_LIB_SUBPATH))
224+
$(info OF_LIBS_OF_COMPILED_PROJECT_PATH=$(OF_LIBS_OF_COMPILED_PROJECT_PATH))
223225
endif
224226

225-
226-
$(info PLATFORM_LIB_SUBPATH=$(PLATFORM_LIB_SUBPATH))
227-
$(info OF_LIBS_OF_COMPILED_PROJECT_PATH=$(OF_LIBS_OF_COMPILED_PROJECT_PATH))
228-
229227
ifeq ($(wildcard $(OF_LIBS_OF_COMPILED_PROJECT_PATH)/$(PLATFORM_LIB_SUBPATH)),)
230228
$(error This package doesn't support your platform, $(OF_LIBS_OF_COMPILED_PROJECT_PATH)/$(PLATFORM_LIB_SUBPATH) probably you downloaded the wrong package?)
231229
endif
@@ -240,7 +238,9 @@ ifeq ($(findstring $(PLATFORM_VARIANT),$(AVAILABLE_PLATFORM_VARIANTS)),)
240238
endif
241239

242240
# include the platform specific user and platform configuration files
243-
include $(OF_PLATFORM_MAKEFILES)/config.$(PLATFORM_LIB_SUBPATH).$(PLATFORM_VARIANT).mk
241+
PLATFORM_LIB_SUBPATH_FIXED := $(subst /,,$(PLATFORM_LIB_SUBPATH))
242+
include $(OF_PLATFORM_MAKEFILES)/config.$(PLATFORM_LIB_SUBPATH_FIXED).$(PLATFORM_VARIANT).mk
243+
244244

245245
ifdef ABI_PATH
246246
ABI_LIB_SUBPATH=$(PLATFORM_LIB_SUBPATH)/$(strip $(ABI_PATH))

scripts/ci/linux/64/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ else
2424
# this carries over to subsequent compilations of examples
2525
# echo "PLATFORM_CFLAGS += $CUSTOMFLAGS" >> libs/openFrameworksCompiled/project/linux/64/config.linux64.default.mk
2626
cd libs/openFrameworksCompiled/project
27-
make -j2 Debug
27+
MAKEFILE_DEBUG=1 make -j2 Debug
2828
echo "##[endgroup]"
2929
echo -e "\033[33m**** Building OF core: COMPLETE ****\033[0m"
3030

0 commit comments

Comments
 (0)