janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-15 03:53:32 +01:00
Code Activity

defs-cpp.mk: Some indentation cleanup

Browse source 
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2019-03-03 09:03:13 +00:00
commit 2c749020d1
1 changed files with 188 additions and 189 deletions
Download patch file Download diff file Expand all files Collapse all files

377
make/defs-cpp.mk
View file

@ -4,9 +4,9 @@ CREATE_DEVEL ?= true
COMPILER_SUITE ?= gcc COMPILER_SUITE ?= gcc
ifeq ($(ARCH),$(ARCH_32)) ifeq ($(ARCH),$(ARCH_32))
PROJECT_CFLAGS += -m32 PROJECT_CFLAGS += -m32
PROJECT_CPPFLAGS += -m32 PROJECT_CPPFLAGS += -m32
PROJECT_LDFLAGS += -m32 PROJECT_LDFLAGS += -m32
endif endif
ifeq ($(ARCH),armv7hl) ifeq ($(ARCH),armv7hl)
@ -49,13 +49,13 @@ BUILD_LDFLAGS += -Wall
LOG_QUAL_PREFIX ?= $(LOGID): LOG_QUAL_PREFIX ?= $(LOGID):
ifneq ($(LOG_QUAL_PREFIX),) ifneq ($(LOG_QUAL_PREFIX),)
PROJECT_CFLAGS += -DKEEP_FILES_OPEN -DLOG_QUAL_PREFIX=\"$(LOG_QUAL_PREFIX)\" PROJECT_CFLAGS += -DKEEP_FILES_OPEN -DLOG_QUAL_PREFIX=\"$(LOG_QUAL_PREFIX)\"
PROJECT_CPPFLAGS += -DKEEP_FILES_OPEN -DLOG_QUAL_PREFIX=\"$(LOG_QUAL_PREFIX)\" PROJECT_CPPFLAGS += -DKEEP_FILES_OPEN -DLOG_QUAL_PREFIX=\"$(LOG_QUAL_PREFIX)\"
endif endif
ifeq ($(CATCH_ONLY_YERROR),true) ifeq ($(CATCH_ONLY_YERROR),true)
BUILD_CFLAGS += -DCATCH_ONLY_YERROR BUILD_CFLAGS += -DCATCH_ONLY_YERROR
BUILD_CPPFLAGS += -DCATCH_ONLY_YERROR BUILD_CPPFLAGS += -DCATCH_ONLY_YERROR
endif endif
SYSCFG_DIR ?= /etc/sysconfig SYSCFG_DIR ?= /etc/sysconfig
@ -69,41 +69,41 @@ ifeq ($(USE_VERSION_MACROS),true)
endif endif
ifeq ($(TARGET),mingw) ifeq ($(TARGET),mingw)
ifneq ($(wildcard /usr/bin/i686-w64-mingw32-gcc),) ifneq ($(wildcard /usr/bin/i686-w64-mingw32-gcc),)
PROJECT_CFLAGS += -D_WINDOWS PROJECT_CFLAGS += -D_WINDOWS
PROJECT_CPPFLAGS += -D_WINDOWS PROJECT_CPPFLAGS += -D_WINDOWS
MINGW_SYS_ROOT ?= /usr/i686-w64-mingw32/sys-root/mingw MINGW_SYS_ROOT ?= /usr/i686-w64-mingw32/sys-root/mingw
CROSS_TOOL_DIR ?= CROSS_TOOL_DIR ?=
CROSS_TOOL_BIN_PREFIX ?= $(CROSS_TOOL_DIR)/usr/bin/i686-w64-mingw32- CROSS_TOOL_BIN_PREFIX ?= $(CROSS_TOOL_DIR)/usr/bin/i686-w64-mingw32-
PROJECT_LDFLAGS += -L$(MINGW_SYS_ROOT)/lib PROJECT_LDFLAGS += -L$(MINGW_SYS_ROOT)/lib
PROJECT_CFLAGS += -I$(MINGW_SYS_ROOT)/include PROJECT_CFLAGS += -I$(MINGW_SYS_ROOT)/include
PROJECT_CPPFLAGS += -I$(MINGW_SYS_ROOT)/include PROJECT_CPPFLAGS += -I$(MINGW_SYS_ROOT)/include
else else
CROSS_TOOL_DIR ?= /opt/cross-tools CROSS_TOOL_DIR ?= /opt/cross-tools
CROSS_TOOL_BIN_PREFIX ?= $(CROSS_TOOL_DIR)/bin/i686-pc-mingw32- CROSS_TOOL_BIN_PREFIX ?= $(CROSS_TOOL_DIR)/bin/i686-pc-mingw32-
endif endif
GCC ?= $(CROSS_TOOL_BIN_PREFIX)gcc GCC ?= $(CROSS_TOOL_BIN_PREFIX)gcc
GPP ?= $(CROSS_TOOL_BIN_PREFIX)g++ GPP ?= $(CROSS_TOOL_BIN_PREFIX)g++
LD ?= $(CROSS_TOOL_BIN_PREFIX)ld LD ?= $(CROSS_TOOL_BIN_PREFIX)ld
CLANG ?= $(CROSS_TOOL_BIN_PREFIX)clang CLANG ?= $(CROSS_TOOL_BIN_PREFIX)clang
CLANGPP ?= $(CROSS_TOOL_BIN_PREFIX)clang++ CLANGPP ?= $(CROSS_TOOL_BIN_PREFIX)clang++
STRIP ?= $(CROSS_TOOL_BIN_PREFIX)strip STRIP ?= $(CROSS_TOOL_BIN_PREFIX)strip
RANLIB ?= $(CROSS_TOOL_BIN_PREFIX)ranlib RANLIB ?= $(CROSS_TOOL_BIN_PREFIX)ranlib
AR ?= $(CROSS_TOOL_BIN_PREFIX)ar AR ?= $(CROSS_TOOL_BIN_PREFIX)ar
WINDRES ?= $(CROSS_TOOL_BIN_PREFIX)windres WINDRES ?= $(CROSS_TOOL_BIN_PREFIX)windres
BUILD_LDFLAGS += -lws2_32 BUILD_LDFLAGS += -lws2_32
USE_GFILTER ?= false USE_GFILTER ?= false
MS_LD ?= wine $(HOME)/local/mingw/packages/msvcpp/bin/LIB.EXE MS_LD ?= wine $(HOME)/local/mingw/packages/msvcpp/bin/LIB.EXE
else else
GCC ?= gcc GCC ?= gcc
GPP ?= g++ GPP ?= g++
LD ?= ld LD ?= ld
CLANG ?= clang CLANG ?= clang
CLANGPP ?= clang++ CLANGPP ?= clang++
STRIP ?= strip STRIP ?= strip
RANLIB ?= ranlib RANLIB ?= ranlib
AR ?= ar AR ?= ar
endif endif # ifeq ($(TARGET),mingw)
# compiler and linker # compiler and linker
# gcc # gcc
@ -123,11 +123,11 @@ LD_REV := $(word 3,$(LD_VERSION_NUMBERS))
CLANG_CPPFLAGS += -Wno-unused-private-field -Wno-self-assign-field -Wno-overloaded-virtual CLANG_CPPFLAGS += -Wno-unused-private-field -Wno-self-assign-field -Wno-overloaded-virtual
ifneq ($(GCC_VERSION),4.1.0) ifneq ($(GCC_VERSION),4.1.0)
ifneq ($(GCC_VERSION),4.5.1) ifneq ($(GCC_VERSION),4.5.1)
BUILD_CFLAGS += -std=gnu99 BUILD_CFLAGS += -std=gnu99
BUILD_CPPFLAGS += -std=c++11 BUILD_CPPFLAGS += -std=c++11
#BUILD_CPPFLAGS += -Wsuggest-override #BUILD_CPPFLAGS += -Wsuggest-override
endif endif
endif endif
ifeq ($(shell test $(GCC_MAJOR) -ge 5; echo $$?),0) ifeq ($(shell test $(GCC_MAJOR) -ge 5; echo $$?),0)
@ -177,20 +177,20 @@ ALL_CSRC += $(LOCAL_CSRC) $(PREREQ_CSRC)
# == # ==
ifeq ($(DEVELOPMENT),true) ifeq ($(DEVELOPMENT),true)
BUILD_CFLAGS += -D_DEVELOPMENT_ BUILD_CFLAGS += -D_DEVELOPMENT_
BUILD_CPPFLAGS+= -D_DEVELOPMENT_ BUILD_CPPFLAGS+= -D_DEVELOPMENT_
endif endif
CORE += $(filter-out $(wildcard *.intern-state*),$(wildcard core core.* vgcore vgcore.*)) CORE += $(filter-out $(wildcard *.intern-state*),$(wildcard core core.* vgcore vgcore.*))
ifeq ($(GCC_MAJOR),4) ifeq ($(GCC_MAJOR),4)
BUILD_CFLAGS += -DGCC_HASCLASSVISIBILITY BUILD_CFLAGS += -DGCC_HASCLASSVISIBILITY
BUILD_CPPFLAGS+= -DGCC_HASCLASSVISIBILITY BUILD_CPPFLAGS+= -DGCC_HASCLASSVISIBILITY
endif endif
ifeq ($(USE_QT),true) ifeq ($(USE_QT),true)
include $(MODDIR)/make/qtversion.mk include $(MODDIR)/make/qtversion.mk
include $(MODDIR)/make/qt-defs.mk include $(MODDIR)/make/qt-defs.mk
endif endif
ifeq ($(USE_X),true) ifeq ($(USE_X),true)
@ -201,9 +201,9 @@ LPPFLAGS += -lstdc++
ifeq ($(ARCH),x86_64) ifeq ($(ARCH),x86_64)
ifneq ($(TARGET),mingw) ifneq ($(TARGET),mingw)
BUILD_CFLAGS += -fPIC BUILD_CFLAGS += -fPIC
BUILD_CPPFLAGS+= -fPIC BUILD_CPPFLAGS+= -fPIC
LIBFLAGS += LIBFLAGS +=
endif endif
endif endif
@ -229,7 +229,7 @@ endif
ifeq ($(LIBTYPE),shared) ifeq ($(LIBTYPE),shared)
ifneq ($(TARGET),mingw) ifneq ($(TARGET),mingw)
BUILD_LDFLAGS += -rdynamic BUILD_LDFLAGS += -rdynamic
endif endif
endif endif
@ -238,8 +238,8 @@ endif
GENERATE_FUNC_TIMERS = $(MODDIR)/YStopWatchThreadList/generate_func_timers.sh GENERATE_FUNC_TIMERS = $(MODDIR)/YStopWatchThreadList/generate_func_timers.sh
ifeq ($(LOG_THREAD_NAMES), true) ifeq ($(LOG_THREAD_NAMES), true)
BUILD_CFLAGS += -DSLOG_THREAD_NAMES BUILD_CFLAGS += -DSLOG_THREAD_NAMES
BUILD_CPPFLAGS+= -DSLOG_THREAD_NAMES BUILD_CPPFLAGS+= -DSLOG_THREAD_NAMES
endif endif
CPP ?= g++ CPP ?= g++
@ -249,10 +249,10 @@ CPP ?= g++
#include $(MODDIR)/make/lib-deps.mk #include $(MODDIR)/make/lib-deps.mk
ifeq ($(USE_GFILTER),true) ifeq ($(USE_GFILTER),true)
GFILT = sh $(firstword $(wildcard $(MODDIR)/contrib/gfilt/gfilt $(MODDIR)/bin/gfilt)) GFILT = sh $(firstword $(wildcard $(MODDIR)/contrib/gfilt/gfilt $(MODDIR)/bin/gfilt))
ifneq ($(strip $(GFILT)),sh) ifneq ($(strip $(GFILT)),sh)
GPP = $(GFILT) GPP = $(GFILT)
endif endif
endif endif
ifeq "$(COMPILER_SUITE)" "gcc" ifeq "$(COMPILER_SUITE)" "gcc"
@ -272,175 +272,173 @@ ifeq ($(USE_PROJECT_LIB),true)
endif endif
ifneq ($(filter jw-build,$(PREREQ_BUILD)),) ifneq ($(filter jw-build,$(PREREQ_BUILD)),)
ifeq ($(TARGET),mingw) ifeq ($(TARGET),mingw)
JW_BUILD_LDFLAGS += -lglib-2.0 -lws2_32 -lstdc++ JW_BUILD_LDFLAGS += -lglib-2.0 -lws2_32 -lstdc++
endif endif
endif endif
ifeq ($(USE_SYSTEMD),true) ifeq ($(USE_SYSTEMD),true)
BUILD_CFLAGS += -D_USE_SYSTEMD_ $(shell pkg-config --cflags libsystemd) BUILD_CFLAGS += -D_USE_SYSTEMD_ $(shell pkg-config --cflags libsystemd)
BUILD_CPPFLAGS += -D_USE_SYSTEMD_ $(shell pkg-config --cflags libsystemd) BUILD_CPPFLAGS += -D_USE_SYSTEMD_ $(shell pkg-config --cflags libsystemd)
BUILD_LDFLAGS += $(shell pkg-config --libs libsystemd) BUILD_LDFLAGS += $(shell pkg-config --libs libsystemd)
endif endif
ifeq ($(USE_TIMER),true) ifeq ($(USE_TIMER),true)
BUILD_CFLAGS += -D_USE_TIMER_ BUILD_CFLAGS += -D_USE_TIMER_
BUILD_CPPFLAGS += -D_USE_TIMER_ BUILD_CPPFLAGS += -D_USE_TIMER_
endif endif
ifeq ($(USE_FAST_LOG),false) ifeq ($(USE_FAST_LOG),false)
BUILD_CFLAGS +=-D_USE_FAST_LOG_=0 BUILD_CFLAGS +=-D_USE_FAST_LOG_=0
BUILD_CPPFLAGS +=-D_USE_FAST_LOG_=0 BUILD_CPPFLAGS +=-D_USE_FAST_LOG_=0
endif endif
ifeq ($(USE_YAMD),true) ifeq ($(USE_YAMD),true)
CC = yamd-gcc CC = yamd-gcc
endif endif
ifeq ($(USE_MPATROL),true) ifeq ($(USE_MPATROL),true)
BUILD_CFLAGS += -include /usr/include/mpatrol.h BUILD_CFLAGS += -include /usr/include/mpatrol.h
#BUILD_CPPFLAGS += -include /usr/include/mpatrol.h #BUILD_CPPFLAGS += -include /usr/include/mpatrol.h
BUILD_LDFLAGS += -lmpatrolmt -lbfd -liberty BUILD_LDFLAGS += -lmpatrolmt -lbfd -liberty
endif endif
ifeq ($(USE_VALGRIND),true) ifeq ($(USE_VALGRIND),true)
BUILD_CFLAGS += -include /usr/include/valgrind/memcheck.h -D_VALGRIND_ BUILD_CFLAGS += -include /usr/include/valgrind/memcheck.h -D_VALGRIND_
BUILD_CPPFLAGS += -include /usr/include/valgrind/memcheck.h -D_VALGRIND_ BUILD_CPPFLAGS += -include /usr/include/valgrind/memcheck.h -D_VALGRIND_
# BUILD_LDFLAGS += # BUILD_LDFLAGS +=
endif endif
ifeq ($(USE_MCHECK),true) ifeq ($(USE_MCHECK),true)
BUILD_LDFLAGS += -lmcheck BUILD_LDFLAGS += -lmcheck
endif endif
ifeq ($(USE_STACK_PROTECTOR),true) ifeq ($(USE_STACK_PROTECTOR),true)
BUILD_CFLAGS += -fstack-protector-all BUILD_CFLAGS += -fstack-protector-all
BUILD_CPPFLAGS += -fstack-protector-all BUILD_CPPFLAGS += -fstack-protector-all
# BUILD_CFLAGS += -fstack-protector #BUILD_CFLAGS += -fstack-protector
endif endif
ifeq ($(USE_STACK_CHECKER),true) ifeq ($(USE_STACK_CHECKER),true)
ifeq "$(COMPILER_SUITE)" "clang" ifeq "$(COMPILER_SUITE)" "clang"
BUILD_CFLAGS += -fsanitize=address -fno-omit-frame-pointer BUILD_CFLAGS += -fsanitize=address -fno-omit-frame-pointer
BUILD_CPPFLAGS += -fsanitize=address -fno-omit-frame-pointer BUILD_CPPFLAGS += -fsanitize=address -fno-omit-frame-pointer
BUILD_LDFLAGS += -fsanitize=address BUILD_LDFLAGS += -fsanitize=address
else
endif endif
endif endif
ifeq ($(USE_DBMALLOC),true) ifeq ($(USE_DBMALLOC),true)
CONTRIB_LIBS += dbmalloc CONTRIB_LIBS += dbmalloc
BUILD_CFLAGS += -DDBMALLOC -DEXITFUN=_exit -I$(TOPDIR)/contrib/dbmalloc BUILD_CFLAGS += -DDBMALLOC -DEXITFUN=_exit -I$(TOPDIR)/contrib/dbmalloc
BUILD_CPPFLAGS += -DDBMALLOC -DEXITFUN=_exit -I$(TOPDIR)/contrib/dbmalloc BUILD_CPPFLAGS += -DDBMALLOC -DEXITFUN=_exit -I$(TOPDIR)/contrib/dbmalloc
BUILD_LDFLAGS += -ldbmalloc BUILD_LDFLAGS += -ldbmalloc
endif endif
ifeq ($(USE_DMALLOC),true) ifeq ($(USE_DMALLOC),true)
BUILD_CFLAGS += -DDMALLOC -DDMALLOC_FUNC_CHECK -DSTORE_SEEN_COUNT BUILD_CFLAGS += -DDMALLOC -DDMALLOC_FUNC_CHECK -DSTORE_SEEN_COUNT
BUILD_CPPFLAGS += -DDMALLOC -DDMALLOC_FUNC_CHECK -DSTORE_SEEN_COUNT BUILD_CPPFLAGS += -DDMALLOC -DDMALLOC_FUNC_CHECK -DSTORE_SEEN_COUNT
BUILD_LDFLAGS += -ldmallocthcxx -ldmallocth BUILD_LDFLAGS += -ldmallocthcxx -ldmallocth
endif endif
ifeq ($(USE_MEMWATCH),true) ifeq ($(USE_MEMWATCH),true)
BUILD_CFLAGS += -DMEMWATCH -DMW_STDIO BUILD_CFLAGS += -DMEMWATCH -DMW_STDIO
BUILD_CPPFLAGS += -DMEMWATCH -DMW_STDIO BUILD_CPPFLAGS += -DMEMWATCH -DMW_STDIO
endif endif
ifeq ($(USE_EFENCE),true) ifeq ($(USE_EFENCE),true)
BUILD_CFLAGS += -DEFENCE BUILD_CFLAGS += -DEFENCE
BUILD_CPPFLAGS += -DEFENCE BUILD_CPPFLAGS += -DEFENCE
BUILD_LDFLAGS += -lefence BUILD_LDFLAGS += -lefence
endif endif
ifeq ($(USE_TRACING),true) ifeq ($(USE_TRACING),true)
BUILD_CFLAGS += -D_DO_TRACE_ BUILD_CFLAGS += -D_DO_TRACE_
BUILD_CPPFLAGS += -D_DO_TRACE_ BUILD_CPPFLAGS += -D_DO_TRACE_
endif endif
ifeq ($(USE_ASSERTIONS),false) ifeq ($(USE_ASSERTIONS),false)
BUILD_CFLAGS += -DNDEBUG BUILD_CFLAGS += -DNDEBUG
BUILD_CPPFLAGS += -DNDEBUG BUILD_CPPFLAGS += -DNDEBUG
endif endif
ifeq ($(COMPILE_DEBUG_CODE),true) ifeq ($(COMPILE_DEBUG_CODE),true)
BUILD_CFLAGS += -D_DEBUG_ BUILD_CFLAGS += -D_DEBUG_
BUILD_CPPFLAGS += -D_DEBUG_ BUILD_CPPFLAGS += -D_DEBUG_
endif endif
ifeq ($(COMPILE_DEBUG_LOG),true) ifeq ($(COMPILE_DEBUG_LOG),true)
BUILD_CFLAGS += -D_LOG_DEBUG_ BUILD_CFLAGS += -D_LOG_DEBUG_
BUILD_CPPFLAGS += -D_LOG_DEBUG_ BUILD_CPPFLAGS += -D_LOG_DEBUG_
endif endif
ifeq ($(USE_MPATROL),true) ifeq ($(USE_MPATROL),true)
BUILD_CFLAGS += -include $(MODDIR)/include/mpatrol.h BUILD_CFLAGS += -include $(MODDIR)/include/mpatrol.h
BUILD_CPPFLAGS += -include $(MODDIR)/include/mpatrol.h BUILD_CPPFLAGS += -include $(MODDIR)/include/mpatrol.h
BUILD_LDFLAGS += -lmpatrolmt -lbfd -liberty BUILD_LDFLAGS += -lmpatrolmt -lbfd -liberty
endif endif
ifeq ($(BREAK_ABI),true) ifeq ($(BREAK_ABI),true)
BUILD_CFLAGS += -D_BREAK_ABI_ BUILD_CFLAGS += -D_BREAK_ABI_
BUILD_CPPFLAGS += -D_BREAK_ABI_ BUILD_CPPFLAGS += -D_BREAK_ABI_
endif endif
ifeq ($(USE_STACK_CHECK),true) ifeq ($(USE_STACK_CHECK),true)
BUILD_CFLAGS += -fstack-check BUILD_CFLAGS += -fstack-check
BUILD_CPPFLAGS += -fstack-check BUILD_CPPFLAGS += -fstack-check
endif endif
ifeq ($(USE_COMPILER_DEBUG_OPTS),true) ifeq ($(USE_COMPILER_DEBUG_OPTS),true)
BUILD_CFLAGS += -gdwarf-2 -g3 -ggdb BUILD_CFLAGS += -gdwarf-2 -g3 -ggdb
BUILD_CPPFLAGS += -gdwarf-2 -g3 -ggdb BUILD_CPPFLAGS += -gdwarf-2 -g3 -ggdb
BUILD_LDFLAGS += -gdwarf-2 -g3 -ggdb BUILD_LDFLAGS += -gdwarf-2 -g3 -ggdb
endif endif
ifeq ($(CC),$(GCC)) ifeq ($(CC),$(GCC))
GCC_NO_OPT_FLAGS = \ GCC_NO_OPT_FLAGS = \
-fno-inline-functions-called-once \ -fno-inline-functions-called-once \
-fno-tree-loop-optimize \ -fno-tree-loop-optimize \
-fno-early-inlining \ -fno-early-inlining \
-fno-default-inline -fno-default-inline
else else
ifeq ($(CC),$(CLANG)) ifeq ($(CC),$(CLANG))
BUILD_CFLAGS += -Werror BUILD_CFLAGS += -Werror
BUILD_CPPFLAGS += -Werror BUILD_CPPFLAGS += -Werror
endif endif
endif endif
ifeq ($(USE_COMPILER_OPTIMIZATION_OPTS),true) ifeq ($(USE_COMPILER_OPTIMIZATION_OPTS),true)
BUILD_CFLAGS += -funroll-loops -O3 BUILD_CFLAGS += -funroll-loops -O3
BUILD_CPPFLAGS += -funroll-loops -O3 BUILD_CPPFLAGS += -funroll-loops -O3
else else
NO_OPT_FLAGS = \ NO_OPT_FLAGS = \
-O0 -g -fno-inline -fno-omit-frame-pointer \ -O0 -g -fno-inline -fno-omit-frame-pointer \
-fno-builtin -fno-optimize-sibling-calls \ -fno-builtin -fno-optimize-sibling-calls \
$(GCC_NO_OPT_FLAGS) $(GCC_NO_OPT_FLAGS)
# -fconserve-stack # -fconserve-stack
_NO_OPT_FLAGS = \ _NO_OPT_FLAGS = \
-O0 \ -O0 \
-fno-implicit-inline-templates \ -fno-implicit-inline-templates \
-fno-implement-inlines \ -fno-implement-inlines \
-fno-default-inline \ -fno-default-inline \
-fno-inline \ -fno-inline \
-finline-limit=0 \ -finline-limit=0 \
-fkeep-inline-functions \ -fkeep-inline-functions \
-fno-inline-functions \ -fno-inline-functions \
$(GCC_NO_OPT_FLAGS) $(GCC_NO_OPT_FLAGS)
BUILD_CFLAGS += $(NO_OPT_FLAGS) BUILD_CFLAGS += $(NO_OPT_FLAGS)
BUILD_CPPFLAGS += $(NO_OPT_FLAGS) BUILD_CPPFLAGS += $(NO_OPT_FLAGS)
BUILD_LDFLAGS += $(NO_OPT_FLAGS) BUILD_LDFLAGS += $(NO_OPT_FLAGS)
endif endif
ifeq ($(USE_EXCEPTIONS_IN_C),true) ifeq ($(USE_EXCEPTIONS_IN_C),true)
BUILD_CFLAGS += -fexceptions BUILD_CFLAGS += -fexceptions
GCC_LDFLAGS += -shared-libgcc GCC_LDFLAGS += -shared-libgcc
endif endif
ifeq ($(STRIP_SYMBOLS),true) ifeq ($(STRIP_SYMBOLS),true)
STRIP_DONE ?= strip.done STRIP_DONE ?= strip.done
endif endif
INCLUDE += $(LOCAL_INCLUDE) INCLUDE += $(LOCAL_INCLUDE)
@ -453,8 +451,8 @@ else
endif endif
ifeq ($(USE_PROJECT_LIB),true) ifeq ($(USE_PROJECT_LIB),true)
INCLUDE += $(PROJECT_INCLUDE) -I$(TOPDIR)/include INCLUDE += $(PROJECT_INCLUDE) -I$(TOPDIR)/include
LIBFLAGS += -L$(BUILD_LIBDIR) LIBFLAGS += -L$(BUILD_LIBDIR)
endif endif
INCLUDE += $(call proj_query, cflags $(PREREQ_BUILD) $(PROJECT)) INCLUDE += $(call proj_query, cflags $(PREREQ_BUILD) $(PROJECT))
@ -469,11 +467,11 @@ endif
LIBFLAGS += $(call proj_query, ldflags $(LDFLAGS_QUERY_ARGS) $(LDFLAGS_QUERY_ARGS_SELF) $(PROJECT)) LIBFLAGS += $(call proj_query, ldflags $(LDFLAGS_QUERY_ARGS) $(LDFLAGS_QUERY_ARGS_SELF) $(PROJECT))
ifeq ($(USE_SNDFILE),true) ifeq ($(USE_SNDFILE),true)
LIBFLAGS += -lsndfile LIBFLAGS += -lsndfile
endif endif
ifeq ($(USE_FFTW),true) ifeq ($(USE_FFTW),true)
LIBFLAGS += -lfftw3 LIBFLAGS += -lfftw3
endif endif
ifeq ($(USE_GLIB),true) ifeq ($(USE_GLIB),true)
@ -495,15 +493,15 @@ ifeq ($(USE_GLIB),true)
endif endif
ifeq ($(CC),$(CLANG)) ifeq ($(CC),$(CLANG))
COMPILER_CFLAGS += $(CLANG_CFLAGS) COMPILER_CFLAGS += $(CLANG_CFLAGS)
COMPILER_CPPFLAGS += $(CLANG_CPPFLAGS) COMPILER_CPPFLAGS += $(CLANG_CPPFLAGS)
COMPILER_LDFLAGS += $(CLANG_LDFLAGS) COMPILER_LDFLAGS += $(CLANG_LDFLAGS)
endif endif
ifeq ($(CC),$(GCC)) ifeq ($(CC),$(GCC))
COMPILER_CFLAGS += $(GCC_CFLAGS) COMPILER_CFLAGS += $(GCC_CFLAGS)
COMPILER_CPPFLAGS += $(GCC_CPPFLAGS) COMPILER_CPPFLAGS += $(GCC_CPPFLAGS)
COMPILER_LDFLAGS += $(GCC_LDFLAGS) COMPILER_LDFLAGS += $(GCC_LDFLAGS)
endif endif
BUILD_CFLAGS += $(LOCAL_CFLAGS) $(PROJECT_CFLAGS) $(COMPLILER_CFLAGS) $(INCLUDE) BUILD_CFLAGS += $(LOCAL_CFLAGS) $(PROJECT_CFLAGS) $(COMPLILER_CFLAGS) $(INCLUDE)
@ -532,42 +530,43 @@ endif
LIBTYPE ?= shared LIBTYPE ?= shared
INSTALL_LIBDIR ?= $(EXE_PREFIX)/lib INSTALL_LIBDIR ?= $(EXE_PREFIX)/lib
ifeq ($(USE_PROJECT_LIB),true) ifeq ($(USE_PROJECT_LIB),true)
LIBNAME ?= $(PROJECT) LIBNAME ?= $(PROJECT)
MEMBERS += $(LIB_A)($(OBJ)) MEMBERS += $(LIB_A)($(OBJ))
VERSION_SCRIPT = $(BUILD_LIBDIR)/version.ldscript VERSION_SCRIPT = $(BUILD_LIBDIR)/version.ldscript
# TODO: use something like this as unifying variable, there are far too many # TODO: use something like this as unifying variable, there are far too many
# lib-related variables # lib-related variables
LOCAL_LIBS += LOCAL_LIBS +=
ifneq ($(TARGET),mingw) ifneq ($(TARGET),mingw)
LIB_A = $(BUILD_LIBDIR)/lib$(LIBNAME).a LIB_A = $(BUILD_LIBDIR)/lib$(LIBNAME).a
SO_SUFFIX = so.$(MAJOR_MINOR_RELEASE) SO_SUFFIX = so.$(MAJOR_MINOR_RELEASE)
SO_PREFIX ?= lib SO_PREFIX ?= lib
LIB_SO = $(BUILD_LIBDIR)/lib$(LIBNAME).$(SO_SUFFIX) LIB_SO = $(BUILD_LIBDIR)/lib$(LIBNAME).$(SO_SUFFIX)
LINKS_SO += $(shell echo $(LIB_SO) | $(SED) -e "s/\.so\..*$$/.so/" | grep -v $(LIB_SO)) LINKS_SO += $(shell echo $(LIB_SO) | $(SED) -e "s/\.so\..*$$/.so/" | grep -v $(LIB_SO))
INSTALLED_LINKS_SO += $(shell echo $(INSTALLED_LIB_SO) | $(SED) -e "s/\.so\..*$$/.so/" | grep -v $(INSTALLED_LIB_SO)) INSTALLED_LINKS_SO += $(shell echo $(INSTALLED_LIB_SO) | $(SED) -e "s/\.so\..*$$/.so/" | grep -v $(INSTALLED_LIB_SO))
INSTALLED_LIB_A = $(INSTALL_LIBDIR)/lib$(LIBNAME).a INSTALLED_LIB_A = $(INSTALL_LIBDIR)/lib$(LIBNAME).a
else else
LIB_A = $(BUILD_LIBDIR)/lib$(LIBNAME)-static.a LIB_A = $(BUILD_LIBDIR)/lib$(LIBNAME)-static.a
#WINRES_RC_TMPL = $(MODDIR)/make/winres-minimal.rc.tmpl #WINRES_RC_TMPL = $(MODDIR)/make/winres-minimal.rc.tmpl
WINRES_RC_TMPL = $(MODDIR)/make/winres.rc.tmpl WINRES_RC_TMPL = $(MODDIR)/make/winres.rc.tmpl
WINRES_RC = $(BUILD_LIBDIR)/$(PROJECT).rc WINRES_RC = $(BUILD_LIBDIR)/$(PROJECT).rc
WINRES_O = $(WINRES_RC).o WINRES_O = $(WINRES_RC).o
SO_SUFFIX = dll SO_SUFFIX = dll
SO_PREFIX ?= SO_PREFIX ?=
LIB_DEF = $(BUILD_LIBDIR)/$(LIBNAME).def LIB_DEF = $(BUILD_LIBDIR)/$(LIBNAME).def
MSVCPP_IMPLIB = $(BUILD_LIBDIR)/$(LIBNAME).lib MSVCPP_IMPLIB = $(BUILD_LIBDIR)/$(LIBNAME).lib
LIB_SO = $(BUILD_LIBDIR)/$(LIBNAME).dll LIB_SO = $(BUILD_LIBDIR)/$(LIBNAME).dll
INSTALLED_LIB_A = $(INSTALL_LIBDIR)/lib$(LIBNAME).a INSTALLED_LIB_A = $(INSTALL_LIBDIR)/lib$(LIBNAME).a
endif # mingw endif # mingw
BUILD_LIB += $(LIB_SO) BUILD_LIB += $(LIB_SO)
endif # USE_PROJECT_LIB endif # USE_PROJECT_LIB
INSTALLED_LIB_SO = $(addprefix $(INSTALL_LIBDIR)/,$(notdir $(LIB_SO))) INSTALLED_LIB_SO = $(addprefix $(INSTALL_LIBDIR)/,$(notdir $(LIB_SO)))
INSTALLED_DEF = $(addprefix $(INSTALL_LIBDIR)/,$(wildcard *.lib *.exp)) INSTALLED_DEF = $(addprefix $(INSTALL_LIBDIR)/,$(wildcard *.lib *.exp))
INSTALLED_LIB += $(addprefix $(INSTALL_LIBDIR)/,$(LOCAL_LIBS)) INSTALLED_LIB += $(addprefix $(INSTALL_LIBDIR)/,$(LOCAL_LIBS))
BUILD_LIB += $(addprefix $(BUILD_LIBDIR)/,$(LOCAL_LIBS)) BUILD_LIB += $(addprefix $(BUILD_LIBDIR)/,$(LOCAL_LIBS))
INSTALLED_ALL_LIBS = $(addprefix $(INSTALL_LIBDIR)/,$(wildcard *.a)) INSTALLED_ALL_LIBS = $(addprefix $(INSTALL_LIBDIR)/,$(wildcard *.a))
INSTALLED_LIB += $(INSTALLED_LIB_SO) $(INSTALLED_SHOBJS) \ INSTALLED_LIB += $(INSTALLED_LIB_SO) $(INSTALLED_SHOBJS) \
$(INSTALLED_LINKS_SO) $(sort $(INSTALLED_LIB_A) $(INSTALLED_ALL_LIBS)) \ $(INSTALLED_LINKS_SO) $(sort $(INSTALLED_LIB_A) $(INSTALLED_ALL_LIBS)) \
$(INSTALLED_DEF) $(INSTALLED_DEF)