Skip to content

Commit ec58570

Browse files
committed
Reset file
1 parent 64267e0 commit ec58570

File tree

2 files changed

+49
-50
lines changed

2 files changed

+49
-50
lines changed

libs/openFrameworksCompiled/project/linux/64/config.linux64.default.mk

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
include $(OF_SHARED_MAKEFILES_PATH)/config.linux.common.mk
2929

3030
ifneq ($(shell command -v ld.gold),)
31-
PLATFORM_LDFLAGS += -fuse-ld=gold
32-
$(info Using Gold linker.)
31+
PLATFORM_LDFLAGS += -fuse-ld=gold
32+
$(info Using Gold linker.)
3333
else
34-
$(info Gold linker not found. Using default linker.)
34+
$(info Gold linker not found. Using default linker.)
3535
endif

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

Lines changed: 46 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ PLATFORM_OS ?= $(shell uname -s)
3131
HOST_OS=$(shell uname -s)
3232

3333
ifdef MAKEFILE_DEBUG
34-
$(info HOST_OS=${HOST_OS})
34+
$(info HOST_OS=${HOST_OS})
3535
endif
3636

3737
ifneq (,$(findstring MSYS_NT,$(HOST_OS)))
@@ -70,13 +70,13 @@ endif
7070

7171

7272
ifdef MAKEFILE_DEBUG
73-
$(info PLATFORM_ARCH=$(PLATFORM_ARCH))
74-
$(info PLATFORM_OS=$(PLATFORM_OS))
75-
$(info HOST_ARCH=$(HOST_ARCH))
76-
$(info HOST_OS=$(HOST_OS))
77-
$(info CROSS_COMPILING=$(CROSS_COMPILING))
78-
$(info PLATFORM_VARIANT=$(PLATFORM_VARIANT))
79-
$(info IS_RASPBIAN=$(IS_RASPBIAN))
73+
$(info PLATFORM_ARCH=$(PLATFORM_ARCH))
74+
$(info PLATFORM_OS=$(PLATFORM_OS))
75+
$(info HOST_ARCH=$(HOST_ARCH))
76+
$(info HOST_OS=$(HOST_OS))
77+
$(info CROSS_COMPILING=$(CROSS_COMPILING))
78+
$(info PLATFORM_VARIANT=$(PLATFORM_VARIANT))
79+
$(info IS_RASPBIAN=$(IS_RASPBIAN))
8080
endif
8181

8282
# if not defined, construct the default PLATFORM_LIB_SUBPATH
@@ -142,11 +142,11 @@ endif
142142

143143
# if desired, print the variables
144144
ifdef MAKEFILE_DEBUG
145-
$(info =================== config.mk platform detection ================)
146-
$(info PLATFORM_ARCH=$(PLATFORM_ARCH))
147-
$(info PLATFORM_OS=$(PLATFORM_OS))
148-
$(info PLATFORM_VARIANT=$(PLATFORM_VARIANT))
149-
$(info PLATFORM_LIB_SUBPATH=$(PLATFORM_LIB_SUBPATH))
145+
$(info =================== config.mk platform detection ================)
146+
$(info PLATFORM_ARCH=$(PLATFORM_ARCH))
147+
$(info PLATFORM_OS=$(PLATFORM_OS))
148+
$(info PLATFORM_VARIANT=$(PLATFORM_VARIANT))
149+
$(info PLATFORM_LIB_SUBPATH=$(PLATFORM_LIB_SUBPATH))
150150
endif
151151

152152

@@ -209,32 +209,31 @@ endif
209209
################################################################################
210210
# print debug information if needed
211211
ifdef MAKEFILE_DEBUG
212-
$(info =================== config.mk paths =============================)
213-
$(info OF_ADDONS_PATH=$(OF_ADDONS_PATH))
214-
$(info OF_EXAMPLES_PATH=$(OF_EXAMPLES_PATH))
215-
$(info OF_APPS_PATH=$(OF_APPS_PATH))
216-
$(info OF_LIBS_PATH=$(OF_LIBS_PATH))
217-
$(info OF_LIBS_OPENFRAMEWORKS_PATH=$(OF_LIBS_OPENFRAMEWORKS_PATH))
218-
$(info OF_LIBS_OF_COMPILED_PATH=$(OF_LIBS_OF_COMPILED_PATH))
219-
$(info OF_LIBS_OF_COMPILED_PROJECT_PATH=$(OF_LIBS_OF_COMPILED_PROJECT_PATH))
220-
$(info OF_SHARED_MAKEFILES_PATH=$(OF_SHARED_MAKEFILES_PATH))
221-
$(info OF_PLATFORM_MAKEFILES=$(OF_PLATFORM_MAKEFILES))
222-
$(info OF_CORE_LIB_PATH=$(OF_CORE_LIB_PATH))
223-
$(info PLATFORM_VARIANT=$(PLATFORM_VARIANT))
212+
$(info =================== config.mk paths =============================)
213+
$(info OF_ADDONS_PATH=$(OF_ADDONS_PATH))
214+
$(info OF_EXAMPLES_PATH=$(OF_EXAMPLES_PATH))
215+
$(info OF_APPS_PATH=$(OF_APPS_PATH))
216+
$(info OF_LIBS_PATH=$(OF_LIBS_PATH))
217+
$(info OF_LIBS_OPENFRAMEWORKS_PATH=$(OF_LIBS_OPENFRAMEWORKS_PATH))
218+
$(info OF_LIBS_OF_COMPILED_PATH=$(OF_LIBS_OF_COMPILED_PATH))
219+
$(info OF_LIBS_OF_COMPILED_PROJECT_PATH=$(OF_LIBS_OF_COMPILED_PROJECT_PATH))
220+
$(info OF_SHARED_MAKEFILES_PATH=$(OF_SHARED_MAKEFILES_PATH))
221+
$(info OF_PLATFORM_MAKEFILES=$(OF_PLATFORM_MAKEFILES))
222+
$(info OF_CORE_LIB_PATH=$(OF_CORE_LIB_PATH))
224223
endif
225224

225+
226+
$(info PLATFORM_LIB_SUBPATH=$(PLATFORM_LIB_SUBPATH))
227+
$(info OF_LIBS_OF_COMPILED_PROJECT_PATH=$(OF_LIBS_OF_COMPILED_PROJECT_PATH))
228+
226229
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) probably you downloaded the wrong package?)
230+
$(error This package doesn't support your platform, $(OF_LIBS_OF_COMPILED_PROJECT_PATH)/$(PLATFORM_LIB_SUBPATH) probably you downloaded the wrong package?)
228231
endif
229232

230233
# generate a list of valid core platform variants from the files in the platform makefiles directory
231234
AVAILABLE_PLATFORM_VARIANTS=$(shell $(FIND) $(OF_PLATFORM_MAKEFILES)/config.*.mk -maxdepth 1 -type f | sed -E 's/.*\.([^\.]*)\.mk/\1/' )
232235
AVAILABLE_PLATFORM_VARIANTS+=default
233236

234-
ifdef MAKEFILE_DEBUG
235-
$(info AVAILABLE_PLATFORM_VARIANTS=$(AVAILABLE_PLATFORM_VARIANTS))
236-
endif
237-
238237
# check to see if we have a file for the desired variant. if not, quit and list the variants.
239238
ifeq ($(findstring $(PLATFORM_VARIANT),$(AVAILABLE_PLATFORM_VARIANTS)),)
240239
$(error Platform Variant "$(PLATFORM_VARIANT)" is not valid. Valid variants include [$(strip $(AVAILABLE_PLATFORM_VARIANTS))])
@@ -312,14 +311,14 @@ CORE_PKG_CONFIG_LIBRARIES += $(PROJECT_PKG_CONFIG_LIBRARIES)
312311
ifneq ($(strip $(CORE_PKG_CONFIG_LIBRARIES)),)
313312
ifneq ($(strip $(PKG_CONFIG_LIBDIR)),)
314313
ifdef MAKEFILE_DEBUG
315-
$(info checking pkg-config libraries: $(CORE_PKG_CONFIG_LIBRARIES))
316-
$(info with PKG_CONFIG_LIBDIR=$(PKG_CONFIG_LIBDIR))
314+
$(info checking pkg-config libraries: $(CORE_PKG_CONFIG_LIBRARIES))
315+
$(info with PKG_CONFIG_LIBDIR=$(PKG_CONFIG_LIBDIR))
317316
endif
318317
FAILED_PKG=$(shell export PKG_CONFIG_LIBDIR=$(PKG_CONFIG_LIBDIR); for pkg in $(CORE_PKG_CONFIG_LIBRARIES); do $(PLATFORM_PKG_CONFIG) $$pkg --cflags > /dev/null; if [ $$? -ne 0 ]; then echo $$pkg; return; fi; done; echo 0)
319318
else
320319
ifdef MAKEFILE_DEBUG
321-
$(info checking pkg-config libraries: $(CORE_PKG_CONFIG_LIBRARIES))
322-
$(info with PKG_CONFIG_LIBDIR=$(PKG_CONFIG_LIBDIR))
320+
$(info checking pkg-config libraries: $(CORE_PKG_CONFIG_LIBRARIES))
321+
$(info with PKG_CONFIG_LIBDIR=$(PKG_CONFIG_LIBDIR))
323322
endif
324323
FAILED_PKG=$(shell for pkg in $(CORE_PKG_CONFIG_LIBRARIES); do $(PLATFORM_PKG_CONFIG) $$pkg --cflags > /dev/null; if [ $$? -ne 0 ]; then echo $$pkg; return; fi; done; echo 0)
325324
endif
@@ -371,22 +370,22 @@ OF_CORE_HEADER_FILES=$(filter-out $(CORE_EXCLUSIONS),$(shell $(FIND) $(OF_CORE_S
371370
# DEBUG INFO
372371
################################################################################
373372
ifdef MAKEFILE_DEBUG
374-
$(info ========================= config.mk flags ========================)
375-
$(info ---OF_CORE_DEFINES_CFLAGS---)
376-
$(foreach v, $(OF_CORE_DEFINES_CFLAGS),$(info $(v)))
373+
$(info ========================= config.mk flags ========================)
374+
$(info ---OF_CORE_DEFINES_CFLAGS---)
375+
$(foreach v, $(OF_CORE_DEFINES_CFLAGS),$(info $(v)))
377376

378-
$(info ---OF_CORE_INCLUDES_CFLAGS---)
379-
$(foreach v, $(OF_CORE_INCLUDES_CFLAGS),$(info $(v)))
377+
$(info ---OF_CORE_INCLUDES_CFLAGS---)
378+
$(foreach v, $(OF_CORE_INCLUDES_CFLAGS),$(info $(v)))
380379

381-
$(info ---OF_CORE_FRAMEWORKS_CFLAGS---)
382-
$(foreach v, $(OF_CORE_FRAMEWORKS_CFLAGS),$(info $(v)))
380+
$(info ---OF_CORE_FRAMEWORKS_CFLAGS---)
381+
$(foreach v, $(OF_CORE_FRAMEWORKS_CFLAGS),$(info $(v)))
383382

384-
$(info ---OF_CORE_SOURCE_FILES---)
385-
$(foreach v, $(OF_CORE_SOURCE_FILES),$(info $(v)))
383+
$(info ---OF_CORE_SOURCE_FILES---)
384+
$(foreach v, $(OF_CORE_SOURCE_FILES),$(info $(v)))
386385

387-
$(info ---OF_CORE_HEADER_FILES---)
388-
$(foreach v, $(OF_CORE_HEADER_FILES),$(info $(v)))
386+
$(info ---OF_CORE_HEADER_FILES---)
387+
$(foreach v, $(OF_CORE_HEADER_FILES),$(info $(v)))
389388

390-
$(info ---PLATFORM_CORE_EXCLUSIONS---)
391-
$(foreach v, $(PLATFORM_CORE_EXCLUSIONS),$(info $(v)))
389+
$(info ---PLATFORM_CORE_EXCLUSIONS---)
390+
$(foreach v, $(PLATFORM_CORE_EXCLUSIONS),$(info $(v)))
392391
endif

0 commit comments

Comments
 (0)