Permalink
Browse files

Continued makefile updates.

  • Loading branch information...
1 parent 41c7a61 commit a034320650a279a7df00508b7505fd3b08337584 @bakercp committed Apr 3, 2013
@@ -1,6 +1,6 @@
################################################################################
# OPENFRAMEWORKS MAKEFILE
-# The openFrameworks makefile system is designed for ease of use, and
+# The openFrameworks makefile system is designed for ease of use and
# particularly for straight-forward platform-based configurations.
#
# Read the documentation or simply execute :
@@ -11,10 +11,11 @@
#
################################################################################
+MAKEFILE_DEBUG=1
+
# define the OF_SHARED_MAKEFILES location
OF_SHARED_MAKEFILES_PATH=./makefileCommon
-
# include the global configuration file
include $(OF_SHARED_MAKEFILES_PATH)/config.shared.mk
include $(OF_SHARED_MAKEFILES_PATH)/compile.core.mk
@@ -246,6 +246,7 @@ PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/rtAudio/%
PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/poco/lib/%
PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/openssl/lib/%
+# TODO: move these into the core ? this should only be platform related core
# android project folders
PROJECT_EXCLUSIONS += ./gen
PROJECT_EXCLUSIONS += ./gen/%
@@ -258,8 +259,6 @@ PROJECT_EXCLUSIONS += ./assets
PROJECT_EXCLUSIONS += ./assets/%
PROJECT_EXCLUSIONS += ./libs
-
-
################################################################################
# PLATFORM HEADER SEARCH PATHS
# These are header search paths that are platform specific and are specified
@@ -271,26 +270,26 @@ PROJECT_EXCLUSIONS += ./libs
# Note: Leave a leading space when adding list items with the += operator
################################################################################
-PLATFORM_HEADER_SEARCH_PATHS =
-PLATFORM_HEADER_SEARCH_PATHS += "$(NDK_ROOT)/platforms/$(NDK_PLATFORM)/arch-arm/usr/include/"
-PLATFORM_HEADER_SEARCH_PATHS += "$(NDK_ROOT)/sources/cxx-stl/gnu-libstdc++/include"
-PLATFORM_HEADER_SEARCH_PATHS += "$(NDK_ROOT)/sources/cxx-stl/gnu-libstdc++/$(GCC_VERSION)/include"
-PLATFORM_HEADER_SEARCH_PATHS += "$(NDK_ROOT)/sources/cxx-stl/gnu-libstdc++/libs/$(ABI_PATH)/include"
-PLATFORM_HEADER_SEARCH_PATHS += "$(NDK_ROOT)/sources/cxx-stl/gnu-libstdc++/$(GCC_VERSION)/libs/$(ABI_PATH)/include"
-PLATFORM_HEADER_SEARCH_PATHS += "$(NDK_ROOT)/sources/crystax/include/"
-PLATFORM_HEADER_SEARCH_PATHS += "$(OF_ROOT)/libs/glu/include_android"
-PLATFORM_HEADER_SEARCH_PATHS += "$(OF_ROOT)/addons/ofxAndroid/src"
+PLATFORM_HEADERS_SEARCH_PATHS =
+PLATFORM_HEADERS_SEARCH_PATHS += "$(NDK_ROOT)/platforms/$(NDK_PLATFORM)/arch-arm/usr/include/"
+PLATFORM_HEADERS_SEARCH_PATHS += "$(NDK_ROOT)/sources/cxx-stl/gnu-libstdc++/include"
+PLATFORM_HEADERS_SEARCH_PATHS += "$(NDK_ROOT)/sources/cxx-stl/gnu-libstdc++/$(GCC_VERSION)/include"
+PLATFORM_HEADERS_SEARCH_PATHS += "$(NDK_ROOT)/sources/cxx-stl/gnu-libstdc++/libs/$(ABI_PATH)/include"
+PLATFORM_HEADERS_SEARCH_PATHS += "$(NDK_ROOT)/sources/cxx-stl/gnu-libstdc++/$(GCC_VERSION)/libs/$(ABI_PATH)/include"
+PLATFORM_HEADERS_SEARCH_PATHS += "$(NDK_ROOT)/sources/crystax/include/"
+PLATFORM_HEADERS_SEARCH_PATHS += "$(OF_ROOT)/libs/glu/include_android"
+PLATFORM_HEADERS_SEARCH_PATHS += "$(OF_ROOT)/addons/ofxAndroid/src"
################################################################################
# PLATFORM LIBRARIES
# These are library names/paths that are platform specific and are specified
# using names or paths. The library flag (i.e. -l) is prefixed automatically.
#
-# PLATFORM_LIBRARIES are libraries that can be found in the library search
+# PLATFORM_LIBS are libraries that can be found in the library search
# paths.
-# PLATFORM_STATIC_LIBRARIES is a list of required static libraries.
-# PLATFORM_SHARED_LIBRARIES is a list of required shared libraries.
-# PLATFORM_PKG_CONFIG_LIBRARIES is a list of required libraries that are
+# PLATFORM_STATIC_LIBS is a list of required static libraries.
+# PLATFORM_SHARED_LIBS is a list of required shared libraries.
+# PLATFORM_PKG_CONFIG_LIBS is a list of required libraries that are
# under system control and are easily accesible via the package
# configuration utility (i.e. pkg-config)
#
@@ -300,34 +299,34 @@ PLATFORM_HEADER_SEARCH_PATHS += "$(OF_ROOT)/addons/ofxAndroid/src"
# Note: Leave a leading space when adding list items with the += operator
################################################################################
-PLATFORM_LIBRARIES =
-PLATFORM_LIBRARIES += supc++
-PLATFORM_LIBRARIES += z
-PLATFORM_LIBRARIES += GLESv1_CM
-#PLATFORM_LIBRARIES += GLESv2
-PLATFORM_LIBRARIES += log
-PLATFORM_LIBRARIES += dl
-PLATFORM_LIBRARIES += m
-PLATFORM_LIBRARIES += c
-PLATFORM_LIBRARIES += gcc
+PLATFORM_LIBS =
+PLATFORM_LIBS += supc++
+PLATFORM_LIBS += z
+PLATFORM_LIBS += GLESv1_CM
+#PLATFORM_LIBS += GLESv2
+PLATFORM_LIBS += log
+PLATFORM_LIBS += dl
+PLATFORM_LIBS += m
+PLATFORM_LIBS += c
+PLATFORM_LIBS += gcc
#static libraries (fully qualified paths)
-PLATFORM_STATIC_LIBRARIES =
-PLATFORM_STATIC_LIBRARIES += $(OF_LIBS_PATH)/poco/lib/$(ABI_LIB_SUBPATH)/libPocoNetSSL.a
-PLATFORM_STATIC_LIBRARIES += $(OF_LIBS_PATH)/poco/lib/$(ABI_LIB_SUBPATH)/libPocoNet.a
-PLATFORM_STATIC_LIBRARIES += $(OF_LIBS_PATH)/poco/lib/$(ABI_LIB_SUBPATH)/libPocoCrypto.a
-PLATFORM_STATIC_LIBRARIES += $(OF_LIBS_PATH)/poco/lib/$(ABI_LIB_SUBPATH)/libPocoUtil.a
-PLATFORM_STATIC_LIBRARIES += $(OF_LIBS_PATH)/poco/lib/$(ABI_LIB_SUBPATH)/libPocoXML.a
-PLATFORM_STATIC_LIBRARIES += $(OF_LIBS_PATH)/poco/lib/$(ABI_LIB_SUBPATH)/libPocoFoundation.a
-PLATFORM_STATIC_LIBRARIES += $(OF_LIBS_PATH)/openssl/lib/$(ABI_LIB_SUBPATH)/libssl.a
-PLATFORM_STATIC_LIBRARIES += $(OF_LIBS_PATH)/openssl/lib/$(ABI_LIB_SUBPATH)/libcrypto.a
-PLATFORM_STATIC_LIBRARIES += $(NDK_ROOT)/sources/cxx-stl/gnu-libstdc++/$(GCC_VERSION)/libs/$(ABI_PATH)/libgnustl_static.a
+PLATFORM_STATIC_LIBS =
+PLATFORM_STATIC_LIBS += $(OF_LIBS_PATH)/poco/lib/$(ABI_LIB_SUBPATH)/libPocoNetSSL.a
+PLATFORM_STATIC_LIBS += $(OF_LIBS_PATH)/poco/lib/$(ABI_LIB_SUBPATH)/libPocoNet.a
+PLATFORM_STATIC_LIBS += $(OF_LIBS_PATH)/poco/lib/$(ABI_LIB_SUBPATH)/libPocoCrypto.a
+PLATFORM_STATIC_LIBS += $(OF_LIBS_PATH)/poco/lib/$(ABI_LIB_SUBPATH)/libPocoUtil.a
+PLATFORM_STATIC_LIBS += $(OF_LIBS_PATH)/poco/lib/$(ABI_LIB_SUBPATH)/libPocoXML.a
+PLATFORM_STATIC_LIBS += $(OF_LIBS_PATH)/poco/lib/$(ABI_LIB_SUBPATH)/libPocoFoundation.a
+PLATFORM_STATIC_LIBS += $(OF_LIBS_PATH)/openssl/lib/$(ABI_LIB_SUBPATH)/libssl.a
+PLATFORM_STATIC_LIBS += $(OF_LIBS_PATH)/openssl/lib/$(ABI_LIB_SUBPATH)/libcrypto.a
+PLATFORM_STATIC_LIBS += $(NDK_ROOT)/sources/cxx-stl/gnu-libstdc++/$(GCC_VERSION)/libs/$(ABI_PATH)/libgnustl_static.a
# shared libraries
-PLATFORM_SHARED_LIBRARIES =
+PLATFORM_SHARED_LIBS =
#openframeworks core third party
-PLATFORM_PKG_CONFIG_LIBRARIES =
+PLATFORM_PKG_CONFIG_LIBS =
# conditionally add mpg123
#ifeq ($(HAS_SYSTEM_MPG123),0)
@@ -347,7 +346,7 @@ PLATFORM_PKG_CONFIG_LIBRARIES =
# Note: Leave a leading space when adding list items with the += operator
################################################################################
-PLATFORM_LIBRARY_SEARCH_PATHS =
+PLATFORM_LIBS_SEARCH_PATHS =
################################################################################
# PLATFORM FRAMEWORKS
@@ -392,7 +391,6 @@ PLATFORM_CC=$(NDK_ROOT)/toolchains/$(TOOLCHAIN)/prebuilt/$(HOST_PLATFORM)/bin/$(
PLATFORM_CXX=$(NDK_ROOT)/toolchains/$(TOOLCHAIN)/prebuilt/$(HOST_PLATFORM)/bin/$(ANDROID_PREFIX)g++
PLATFORM_AR=$(NDK_ROOT)/toolchains/$(TOOLCHAIN)/prebuilt/$(HOST_PLATFORM)/bin/$(ANDROID_PREFIX)ar
-
afterplatform:$(RESFILE)
@if [ -f obj/$(BIN_NAME) ]; then rm obj/$(BIN_NAME); fi
@@ -120,12 +120,12 @@ PLATFORM_CFLAGS += -pipe
################################################################################
# raspberry pi specific
-PLATFORM_LIBRARIES += GLESv2
-PLATFORM_LIBRARIES += EGL
-PLATFORM_LIBRARIES += openmaxil
-PLATFORM_LIBRARIES += bcm_host
-PLATFORM_LIBRARIES += vcos
-PLATFORM_LIBRARIES += vchiq_arm
+PLATFORM_LIBS += GLESv2
+PLATFORM_LIBS += EGL
+PLATFORM_LIBS += openmaxil
+PLATFORM_LIBS += bcm_host
+PLATFORM_LIBS += vcos
+PLATFORM_LIBS += vchiq_arm
################################################################################
@@ -140,10 +140,10 @@ PLATFORM_LIBRARIES += vchiq_arm
################################################################################
# Broadcom hardware interface library
-PLATFORM_HEADER_SEARCH_PATHS += /opt/vc/include
-#PLATFORM_HEADER_SEARCH_PATHS+=/opt/vc/include/IL
-PLATFORM_HEADER_SEARCH_PATHS += /opt/vc/include/interface/vcos/pthreads
-PLATFORM_HEADER_SEARCH_PATHS += /opt/vc/include/interface/vmcs_host/linux
+PLATFORM_HEADERS_SEARCH_PATHS += /opt/vc/include
+#PLATFORM_HEADERS_SEARCH_PATHS+=/opt/vc/include/IL
+PLATFORM_HEADERS_SEARCH_PATHS += /opt/vc/include/interface/vcos/pthreads
+PLATFORM_HEADERS_SEARCH_PATHS += /opt/vc/include/interface/vmcs_host/linux
##########################################################################################
@@ -155,7 +155,7 @@ PLATFORM_HEADER_SEARCH_PATHS += /opt/vc/include/interface/vmcs_host/linux
# Note: Leave a leading space when adding list items with the += operator
##########################################################################################
-PLATFORM_LIBRARY_SEARCH_PATHS += /opt/vc/lib
+PLATFORM_LIBS_SEARCH_PATHS += /opt/vc/lib
@@ -9,6 +9,7 @@ ifdef PLATFORM_CXX
CXX = $(PLATFORM_CXX)
endif
+# PROJECT_CXX takes precedence over PLATFORM_CXX
ifdef PROJECT_CXX
CXX = $(PROJECT_CXX)
endif
@@ -17,6 +18,7 @@ ifdef PLATFORM_CC
CC = $(PLATFORM_CC)
endif
+# PROJECT_CC takes precedence over PLATFORM_CC
ifdef PROJECT_CC
CC = $(PROJECT_CC)
endif
@@ -25,6 +27,7 @@ ifdef PLATFORM_AR
AR = $(PLATFORM_AR)
endif
+# PROJECT_AR takes precedence over PLATFORM_AR
ifdef PROJECT_AR
AR = $(PROJECT_AR)
endif
@@ -160,14 +163,30 @@ endif
# OF_CORE_SOURCE_FILES $(patsubst $(OF_ROOT)/%.cpp,%.d,$(OF_CORE_SOURCE_FILES))
# 2. Add the OF_CORE_OBJ_OUPUT_PATH as a prefix
# $(addprefix $(OF_CORE_OBJ_OUPUT_PATH), ...)
-OF_CORE_DEPENDENCY_FILES = $(addprefix $(OF_CORE_OBJ_OUPUT_PATH),$(patsubst $(OF_ROOT)/%.cpp,%.d,$(patsubst $(OF_ROOT)/%.mm,%.d,$(patsubst $(OF_ROOT)/%.m,%.d,$(OF_CORE_SOURCE_FILES)))))
+OF_CORE_DEPENDENCY_FILES = $(addprefix $(OF_CORE_OBJ_OUPUT_PATH),\
+ $(patsubst $(OF_ROOT)/%.cpp,%.d,\
+ $(patsubst $(OF_ROOT)/%.mm,%.d,\
+ $(patsubst $(OF_ROOT)/%.m,%.d,\
+ $(OF_CORE_SOURCE_FILES)\
+ )\
+ )\
+ )\
+ )
# create a named list of object files
# 1. create a list of object files based on the current list of
# OF_CORE_SOURCE_FILES $(patsubst $(OF_ROOT)/%.cpp,%.o,$(OF_CORE_SOURCE_FILES)
# 2. Add the OF_CORE_OBJ_OUPUT_PATH as a prefix
# $(addprefix $(OF_CORE_OBJ_OUPUT_PATH), ...)
-OF_CORE_OBJ_FILES = $(addprefix $(OF_CORE_OBJ_OUPUT_PATH),$(patsubst $(OF_ROOT)/%.cpp,%.o,$(patsubst $(OF_ROOT)/%.mm,%.o,$(patsubst $(OF_ROOT)/%.m,%.o,$(OF_CORE_SOURCE_FILES)))))
+OF_CORE_OBJ_FILES = $(addprefix $(OF_CORE_OBJ_OUPUT_PATH),\
+ $(patsubst $(OF_ROOT)/%.cpp,%.o,\
+ $(patsubst $(OF_ROOT)/%.mm,%.o,\
+ $(patsubst $(OF_ROOT)/%.m,%.o,\
+ $(OF_CORE_SOURCE_FILES)\
+ )\
+ )\
+ )\
+ )
################################################################################
@@ -249,7 +268,6 @@ $(TARGET) : $(OF_CORE_OBJ_FILES)
#.PHONY: clean CleanDebug CleanRelease
-
clean:
$(MAKE) CleanRelease
$(MAKE) CleanDebug
@@ -273,9 +291,10 @@ endif
after: $(TARGET)
@echo "Done!"
-
+
help:
+# TODO: update this help file
@echo
@echo openFrameworks compiled library makefile
@echo
@@ -117,7 +117,6 @@ ifeq ($(findstring ABI,$(MAKECMDGOALS)),ABI)
-include $(OF_PROJECT_DEPENDENCY_FILES)
endif
-
.PHONY: all Debug Release after clean CleanDebug CleanRelease help
@@ -153,7 +152,7 @@ endif
ifneq ($(strip $(PROJECT_ADDONS_DATA)),)
@$(MAKE) copyaddonsdata PROJECT_ADDONS_DATA=$(PROJECT_ADDONS_DATA)
endif
- @$(MAKE) --no-print-directory afterplatform BIN_NAME=$(BIN_NAME) ABIS_TO_COMPILE="$(ABIS_TO_COMPILE_DEBUG)" RUN_TARGET=$(RUN_TARGET) TARGET=$(TARGET)
+ @$(MAKE) --no-print-directory afterplatform BIN_NAME=$(BIN_NAME) ABIS_TO_COMPILE="$(ABIS_TO_COMPILE_DEBUG)" RUN_TARGET=$(RUN_TARGET) TARGET=$(TARGET) OF_PROJECT_FRAMEWORKS_EXPORTS=$(OF_PROJECT_FRAMEWORKS_EXPORTS)
ReleaseABI: $(TARGET)
@@ -182,10 +181,19 @@ ifeq ($(PLATFORM_RUN_COMMAND),)
else
@$(PLATFORM_RUN_COMMAND) $(BIN_NAME)
endif
-
#This rule does the compilation
#$(OBJS): $(SOURCES)
+$(OF_PROJECT_OBJ_OUPUT_PATH)%.o: $(PROJECT_ROOT)/%.m
+ @echo "Compiling" $<
+ mkdir -p $(@D)
+ $(CXX) -c $(OPTIMIZATION_CFLAGS) $(CFLAGS) -MMD -MP -MF $(OF_PROJECT_OBJ_OUPUT_PATH)$*.d -MT $(OF_PROJECT_OBJ_OUPUT_PATH)$*.o -o $@ -c $<
+
+$(OF_PROJECT_OBJ_OUPUT_PATH)%.o: $(PROJECT_ROOT)/%.mm
+ @echo "Compiling" $<
+ mkdir -p $(@D)
+ $(CXX) -c $(OPTIMIZATION_CFLAGS) $(CFLAGS) -MMD -MP -MF $(OF_PROJECT_OBJ_OUPUT_PATH)$*.d -MT $(OF_PROJECT_OBJ_OUPUT_PATH)$*.o -o $@ -c $<
+
$(OF_PROJECT_OBJ_OUPUT_PATH)%.o: $(PROJECT_ROOT)/%.cpp
@echo "Compiling" $<
mkdir -p $(@D)
@@ -216,6 +224,16 @@ $(OF_PROJECT_OBJ_OUPUT_PATH)%.o: $(PROJECT_EXTERNAL_SOURCE_PATHS)/%.cpp
mkdir -p $(@D)
$(CXX) -c $(OPTIMIZATION_CFLAGS) $(CFLAGS) -MMD -MP -MF $(OF_PROJECT_OBJ_OUPUT_PATH)$*.d -MT $(OF_PROJECT_OBJ_OUPUT_PATH)$*.o -o $@ -c $<
+$(OF_PROJECT_OBJ_OUPUT_PATH)%.o: $(PROJECT_EXTERNAL_SOURCE_PATHS)/%.m
+ @echo "Compiling" $<
+ mkdir -p $(@D)
+ $(CC) -c $(OPTIMIZATION_CFLAGS) $(CFLAGS) -MMD -MP -MF $(OF_PROJECT_OBJ_OUPUT_PATH)$*.d -MT $(OF_PROJECT_OBJ_OUPUT_PATH)$*.o -o $@ -c $<
+
+$(OF_PROJECT_OBJ_OUPUT_PATH)%.o: $(PROJECT_EXTERNAL_SOURCE_PATHS)/%.mm
+ @echo "Compiling" $<
+ mkdir -p $(@D)
+ $(CXX) -c $(OPTIMIZATION_CFLAGS) $(CFLAGS) -MMD -MP -MF $(OF_PROJECT_OBJ_OUPUT_PATH)$*.d -MT $(OF_PROJECT_OBJ_OUPUT_PATH)$*.o -o $@ -c $<
+
$(OF_PROJECT_OBJ_OUPUT_PATH)%.o: $(PROJECT_EXTERNAL_SOURCE_PATHS)/%.cxx
@echo "Compiling" $<
mkdir -p $(@D)
@@ -241,6 +259,16 @@ $(OF_ROOT)/addons/$(OF_PROJECT_OBJ_OUPUT_PATH)/%.o: $(OF_ROOT)/addons/%.cpp
mkdir -p $(@D)
$(CXX) -c $(OPTIMIZATION_CFLAGS) $(CFLAGS) -MMD -MP -MF $(OF_ROOT)/addons/$(OF_PROJECT_OBJ_OUPUT_PATH)/$*.d -MT $(OF_ROOT)/addons/$(OF_PROJECT_OBJ_OUPUT_PATH)/$*.o -o $@ -c $<
+$(OF_ROOT)/addons/$(OF_PROJECT_OBJ_OUPUT_PATH)/%.o: $(OF_ROOT)/addons/%.m
+ @echo "Compiling" $<
+ mkdir -p $(@D)
+ $(CC) -c $(OPTIMIZATION_CFLAGS) $(CFLAGS) -MMD -MP -MF $(OF_ROOT)/addons/$(OF_PROJECT_OBJ_OUPUT_PATH)/$*.d -MT $(OF_ROOT)/addons/$(OF_PROJECT_OBJ_OUPUT_PATH)/$*.o -o $@ -c $<
+
+$(OF_ROOT)/addons/$(OF_PROJECT_OBJ_OUPUT_PATH)/%.o: $(OF_ROOT)/addons/%.mm
+ @echo "Compiling" $<
+ mkdir -p $(@D)
+ $(CXX) -c $(OPTIMIZATION_CFLAGS) $(CFLAGS) -MMD -MP -MF $(OF_ROOT)/addons/$(OF_PROJECT_OBJ_OUPUT_PATH)/$*.d -MT $(OF_ROOT)/addons/$(OF_PROJECT_OBJ_OUPUT_PATH)/$*.o -o $@ -c $<
+
$(OF_ROOT)/addons/$(OF_PROJECT_OBJ_OUPUT_PATH)/%.o: $(OF_ROOT)/addons/%.cxx
@echo "Compiling" $<
mkdir -p $(@D)
@@ -254,19 +282,18 @@ $(OF_ROOT)/addons/$(OF_PROJECT_OBJ_OUPUT_PATH)/%.o: $(OF_ROOT)/addons/%.cc
$(OF_ROOT)/addons/$(OF_PROJECT_OBJ_OUPUT_PATH)/%.o: $(OF_ROOT)/addons/%.c
@echo "Compiling" $<
mkdir -p $(@D)
- $(CC) -c $(OPTIMIZATION_CFLAGS) $(CFLAGS) -MMD -MP -MF $(OF_ROOT)/addons/$(OF_PROJECT_OBJ_OUPUT_PATH)/$*.d -MT $(OF_ROOT)/addons/o$(OF_PROJECT_OBJ_OUPUT_PATH)/$*.o -o $@ -c $<
+ $(CC) -c $(OPTIMIZATION_CFLAGS) $(CFLAGS) -MMD -MP -MF $(OF_ROOT)/addons/$(OF_PROJECT_OBJ_OUPUT_PATH)/$*.d -MT $(OF_ROOT)/addons/$(OF_PROJECT_OBJ_OUPUT_PATH)/$*.o -o $@ -c $<
$(OF_ROOT)/addons/$(OF_PROJECT_OBJ_OUPUT_PATH)/%.o: $(OF_ROOT)/addons/%.S
@echo "Compiling" $<
mkdir -p $(@D)
- $(CC) -c $(OPTIMIZATION_CFLAGS) $(CFLAGS) -MMD -MP -MF $(OF_ROOT)/addons/$(OF_PROJECT_OBJ_OUPUT_PATH)/$*.d -MT $(OF_ROOT)/addons/o$(OF_PROJECT_OBJ_OUPUT_PATH)/$*.o -o $@ -c $<
+ $(CC) -c $(OPTIMIZATION_CFLAGS) $(CFLAGS) -MMD -MP -MF $(OF_ROOT)/addons/$(OF_PROJECT_OBJ_OUPUT_PATH)/$*.d -MT $(OF_ROOT)/addons/$(OF_PROJECT_OBJ_OUPUT_PATH)/$*.o -o $@ -c $<
$(TARGET): $(OF_PROJECT_OBJS) $(OF_PROJECT_ADDONS_OBJS) $(OF_PROJECT_LIBS) $(TARGET_LIBS)
@echo 'Linking $(TARGET) for $(ABI_LIB_SUBPATH)'
mkdir -p $(@D)
$(CXX) -o $@ $(OF_PROJECT_OBJS) $(OF_PROJECT_ADDONS_OBJS) $(LDFLAGS) $(TARGET_LIBS) $(OF_PROJECT_LIBS) $(OF_CORE_LIBS)
-
clean:
@$(MAKE) --no-print-directory CleanDebug
@$(MAKE) --no-print-directory CleanRelease
@@ -309,6 +336,7 @@ copyaddonsdata:
@mkdir -p bin/data
@cp -rf $(PROJECT_ADDONS_DATA) bin/data/
+# TODO: fix this help to make it more accurate.
help:
@echo
@echo openFrameworks universal makefile
@@ -325,10 +353,10 @@ help:
@echo "make help: this help message"
@echo
@echo
- @echo this should work with any OF app, just copy any example
+ @echo This should work with any OF app. Just copy any example,
@echo change the name of the folder and it should compile
@echo "only .cpp support, don't use .c files"
- @echo it will look for files in any folder inside the application
+ @echo It will look for files in any folder inside the application
@echo folder except that in the EXCLUDE_FROM_SOURCE variable.
@echo "it doesn't autodetect include paths yet"
@echo "add the include paths editing the var USER_CFLAGS"
@@ -339,8 +367,7 @@ help:
@echo in this directory and add the names of the addons you want to
@echo include
@echo
-
-
+
#legacy targets
AndroidRelease:
$(MAKE) Release PLATFORM_OS=Android
Oops, something went wrong.

0 comments on commit a034320

Please sign in to comment.