Skip to content

Commit b1735d9

Browse files
danoli3danoli3
committed
Makefiles spaces to tabs
1 parent 6540f19 commit b1735d9

File tree

3 files changed

+60
-57
lines changed

3 files changed

+60
-57
lines changed

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

Lines changed: 56 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -113,18 +113,18 @@ OF_CORE_LIBRARY_LDFLAGS += $(addprefix -L,$(PLATFORM_LIBRARY_SEARCH_PATHS))
113113
# DEBUG INFO
114114
################################################################################
115115
ifdef MAKEFILE_DEBUG
116-
$(info =============================configure.core.flags.make========================)
117-
$(info ---OF_CORE_LIBS_LDFLAGS---)
118-
$(foreach v, $(OF_CORE_LIBS_LDFLAGS),$(info $(v)))
116+
$(info =============================configure.core.flags.make========================)
117+
$(info ---OF_CORE_LIBS_LDFLAGS---)
118+
$(foreach v, $(OF_CORE_LIBS_LDFLAGS),$(info $(v)))
119119

120-
$(info ---OF_CORE_LIBS---)
121-
$(foreach v, $(OF_CORE_LIBS),$(info $(v)))
120+
$(info ---OF_CORE_LIBS---)
121+
$(foreach v, $(OF_CORE_LIBS),$(info $(v)))
122122
endif
123123

124124
################################# ADDONS ######################################
125125

126126
ifdef MAKEFILE_DEBUG
127-
$(info ===================ADDONS================)
127+
$(info ===================ADDONS================)
128128
endif
129129

130130
# check to make sure OF_ROOT is defined
@@ -215,9 +215,9 @@ ifdef B_PROCESS_ADDONS
215215
PROJECT_ADDONS = $(filter-out $(INVALID_PROJECT_ADDONS),$(REQUESTED_PROJECT_ADDONS))
216216

217217
ifdef MAKEFILE_DEBUG
218-
$(info ---PROJECT_ADDONS---)
219-
$(foreach v, $(PROJECT_ADDONS),$(info $(v)))
220-
$(info --------------------)
218+
$(info ---PROJECT_ADDONS---)
219+
$(foreach v, $(PROJECT_ADDONS),$(info $(v)))
220+
$(info --------------------)
221221
endif
222222

223223
############################################################################
@@ -309,11 +309,11 @@ endif
309309
OF_PROJECT_SOURCE_PATHS = $(filter-out $(OF_PROJECT_EXCLUSIONS),$(ALL_OF_PROJECT_SOURCE_PATHS))
310310

311311
ifdef MAKEFILE_DEBUG
312-
$(info ---OF_PROJECT_SOURCE_PATHS---)
313-
$(foreach v, $(OF_PROJECT_SOURCE_PATHS),$(info $(v)))
312+
$(info ---OF_PROJECT_SOURCE_PATHS---)
313+
$(foreach v, $(OF_PROJECT_SOURCE_PATHS),$(info $(v)))
314314

315-
$(info ---OF_PROJECT_EXCLUSIONS---)
316-
$(foreach v, $(OF_PROJECT_EXCLUSIONS),$(info $(v)))
315+
$(info ---OF_PROJECT_EXCLUSIONS---)
316+
$(foreach v, $(OF_PROJECT_EXCLUSIONS),$(info $(v)))
317317
endif
318318

319319
# find all sources inside the project's source directory (recursively)
@@ -328,8 +328,8 @@ OF_PROJECT_INCLUDES_CFLAGS := $(addprefix -I,$(filter-out $(PROJECT_INCLUDE_EXCL
328328
OF_ADDON_INCLUDES_CFLAGS += $(addprefix -I,$(filter-out $(PROJECT_INCLUDE_EXCLUSIONS),$(PROJECT_ADDONS_INCLUDES)))
329329

330330
ifdef MAKEFILE_DEBUG
331-
$(info ---OF_PROJECT_INCLUDES_CFLAGS---)
332-
$(foreach v, $(OF_PROJECT_INCLUDES_CFLAGS),$(info $(v)))
331+
$(info ---OF_PROJECT_INCLUDES_CFLAGS---)
332+
$(foreach v, $(OF_PROJECT_INCLUDES_CFLAGS),$(info $(v)))
333333
endif
334334

335335
################################################################################
@@ -391,7 +391,7 @@ OF_PROJECT_LDFLAGS += $(addprefix -framework ,$(PROJECT_ADDONS_FRAMEWORKS))
391391

392392
################################################################################
393393
ifdef MAKEFILE_DEBUG
394-
$(info ===================compile.project.make=============================)
394+
$(info ===================compile.project.make=============================)
395395
endif
396396

397397
ifdef PROJECT_CXX
@@ -410,18 +410,18 @@ ifdef PLATFORM_CC
410410
CC ?= $(PLATFORM_CC)
411411
endif
412412

413-
ifdef ${ccache}
413+
ifdef ${ccache}
414414
$(info 💿 Using CCACHE -- config.project.mk )
415415
CXX := ${ccache} $(CXX)
416416
CC := ${ccache} $(CXX)
417-
endif
417+
endif
418418

419419
ifdef PROJECT_RESOURCE_COMPILER
420-
RESOURCE_COMPILER ?= $(PROJECT_RESOURCE_COMPILER)
420+
RESOURCE_COMPILER ?= $(PROJECT_RESOURCE_COMPILER)
421421
endif
422422

423423
ifdef PLATFORM_RESOURCE_COMPILER
424-
RESOURCE_COMPILER ?= $(PLATFORM_RESOURCE_COMPILER)
424+
RESOURCE_COMPILER ?= $(PLATFORM_RESOURCE_COMPILER)
425425
endif
426426

427427
# TODO: what is this for?
@@ -488,23 +488,23 @@ ifeq ($(findstring Debug,$(TARGET_NAME)),Debug)
488488
OPTIMIZATION_LDFLAGS = $(PROJECT_OPTIMIZATION_LDFLAGS_DEBUG)
489489
endif
490490

491-
# Executable Icon
492-
#################
493-
# if defined, use the project debug icon.
494-
# if no debug icon defined for the project, use the project release icon
495-
# if no icon defined for the project, use the OF default debug icon defined for the platform
496-
# leave ICON empty for default system icon
497-
ifdef PROJECT_DEBUG_ICON
498-
ICON = $(PROJECT_DEBUG_ICON)
499-
else
500-
ifdef PROJECT_RELEASE_ICON
501-
ICON = $(PROJECT_RELEASE_ICON)
502-
else
503-
ifdef PLATFORM_DEBUG_ICON
504-
ICON = $(PLATFORM_DEBUG_ICON)
505-
endif
506-
endif
507-
endif
491+
# Executable Icon
492+
#################
493+
# if defined, use the project debug icon.
494+
# if no debug icon defined for the project, use the project release icon
495+
# if no icon defined for the project, use the OF default debug icon defined for the platform
496+
# leave ICON empty for default system icon
497+
ifdef PROJECT_DEBUG_ICON
498+
ICON = $(PROJECT_DEBUG_ICON)
499+
else
500+
ifdef PROJECT_RELEASE_ICON
501+
ICON = $(PROJECT_RELEASE_ICON)
502+
else
503+
ifdef PLATFORM_DEBUG_ICON
504+
ICON = $(PLATFORM_DEBUG_ICON)
505+
endif
506+
endif
507+
endif
508508
endif
509509

510510
ifeq ($(findstring Release,$(TARGET_NAME)),Release)
@@ -526,18 +526,18 @@ ifeq ($(findstring Release,$(TARGET_NAME)),Release)
526526
OPTIMIZATION_LDFLAGS = $(PROJECT_OPTIMIZATION_LDFLAGS_RELEASE)
527527
endif
528528

529-
# Executable Icon
530-
#################
531-
# if defined, use the project release icon.
532-
# if no icon defined for the project, use the OF default release icon defined for the platform
533-
# leave ICON empty for default system icon
534-
ifdef PROJECT_RELEASE_ICON
535-
ICON = $(PROJECT_RELEASE_ICON)
536-
else
537-
ifdef PLATFORM_RELEASE_ICON
538-
ICON = $(PLATFORM_RELEASE_ICON)
539-
endif
540-
endif
529+
# Executable Icon
530+
#################
531+
# if defined, use the project release icon.
532+
# if no icon defined for the project, use the OF default release icon defined for the platform
533+
# leave ICON empty for default system icon
534+
ifdef PROJECT_RELEASE_ICON
535+
ICON = $(PROJECT_RELEASE_ICON)
536+
else
537+
ifdef PLATFORM_RELEASE_ICON
538+
ICON = $(PLATFORM_RELEASE_ICON)
539+
endif
540+
endif
541541
endif
542542

543543

@@ -553,12 +553,12 @@ endif
553553
# define the subdirectory for our target name
554554

555555
ifdef MAKEFILE_DEBUG
556-
$(info ---OF_PROJECT_SOURCE_FILES---)
557-
$(foreach v, $(OF_PROJECT_SOURCE_FILES),$(info $(v)))
556+
$(info ---OF_PROJECT_SOURCE_FILES---)
557+
$(foreach v, $(OF_PROJECT_SOURCE_FILES),$(info $(v)))
558558
endif
559559
ifdef MAKEFILE_DEBUG
560-
$(info ---OF_PROJECT_DEPENDENCY_FILES---)
561-
$(foreach v, $(OF_PROJECT_DEPENDENCY_FILES),$(info $(v)))
560+
$(info ---OF_PROJECT_DEPENDENCY_FILES---)
561+
$(foreach v, $(OF_PROJECT_DEPENDENCY_FILES),$(info $(v)))
562562
endif
563563

564564

@@ -571,7 +571,7 @@ OF_PROJECT_DEPS = $(patsubst %.o,%.d,$(OF_PROJECT_OBJS))
571571
# Compiled resources (icon, ...) - msys2 only?
572572
OF_PROJECT_RESOURCES =
573573
ifeq ($(findstring msys2,$(PLATFORM_LIB_SUBPATH)),msys2)
574-
OF_PROJECT_RESOURCES += $(addprefix $(OF_PROJECT_OBJ_OUTPUT_PATH), $(notdir $(patsubst %.ico, %.res, $(ICON))))
574+
OF_PROJECT_RESOURCES += $(addprefix $(OF_PROJECT_OBJ_OUTPUT_PATH), $(notdir $(patsubst %.ico, %.res, $(ICON))))
575575
endif
576576

577577
OF_PROJECT_DEPENDENCY_FILES = $(OF_PROJECT_DEPS) $(OF_PROJECT_ADDONS_DEPS)
@@ -580,6 +580,6 @@ OF_PROJECT_DEPENDENCY_FILES = $(OF_PROJECT_DEPS) $(OF_PROJECT_ADDONS_DEPS)
580580

581581

582582
ifdef MAKEFILE_DEBUG
583-
$(info ---OF_PROJECT_DEPENDENCY_FILES---)
584-
$(foreach v, $(OF_PROJECT_DEPENDENCY_FILES),$(info $(v)))
583+
$(info ---OF_PROJECT_DEPENDENCY_FILES---)
584+
$(foreach v, $(OF_PROJECT_DEPENDENCY_FILES),$(info $(v)))
585585
endif

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ ifdef MAKEFILE_DEBUG
224224
endif
225225

226226
ifeq ($(wildcard $(OF_LIBS_OF_COMPILED_PROJECT_PATH)/$(PLATFORM_LIB_SUBPATH)),)
227-
$(error This package doesn't support your platform, $(OF_LIBS_OF_COMPILED_PROJECT_PATH) / $(PLATFORM_LIB_SUBPATH) probably you downloaded the wrong package?)
227+
$(error This package doesn't support your platform, $(OF_LIBS_OF_COMPILED_PROJECT_PATH) probably you downloaded the wrong package?)
228228
endif
229229

230230
# generate a list of valid core platform variants from the files in the platform makefiles directory

‎scripts/ci/linux/64/build.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,13 @@ else
2727
cd libs/openFrameworksCompiled/project
2828
make -j2 DEBUG=1 MAKEFILE_DEBUG=1
2929
echo "##[endgroup]"
30+
echo -e "\033[1;32m**** Building OF core: COMPLETE ****\033[0m"
3031

3132
echo "##[group]**** Building emptyExample ****"
3233
cd $ROOT/scripts/templates/linux64
3334
make -j2 DEBUG=1 MAKEFILE_DEBUG=1
3435
echo "##[endgroup]"
36+
echo -e "\033[1;32m**** Building emptyExample: COMPLETE ****\033[0m"
3537

3638
echo "##[group]**** Building allAddonsExample ****"
3739
cd $ROOT
@@ -40,4 +42,5 @@ else
4042
cd examples/templates/allAddonsExample/
4143
make -j2 DEBUG=1 MAKEFILE_DEBUG=1
4244
echo "##[endgroup]"
45+
echo -e "\033[1;32m**** Building allAddonsExample: COMPLETE ****\033[0m"
4346
fi

0 commit comments

Comments
 (0)