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: Beautify defs-cpp.mk

Browse source 
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2019-06-29 19:50:33 +00:00
commit 1ff63505e7
1 changed files with 12 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

28
make/defs-cpp.mk
View file

@ -214,6 +214,18 @@ ifeq ($(COMPILER_SUITE),gcc)
endif endif
endif endif
ifeq ($(GCC_MAJOR),2)
FINAL_LPPFLAGS += -lm
FINAL_CPPFLAGS += -I/usr/local/include
else ifeq ($(GCC_MAJOR),3)
ifeq ($(GCC_MINOR),3)
FINAL_LPPFLAGS += -lgcc_s
# FINAL_LPPFLAGS += -L/usr/local/gcc3.3/lib
endif
else
FINAL_CPPFLAGS += -DGCC_HASCLASSVISIBILITY
endif
else ifeq ($(COMPILER_SUITE),clang) else ifeq ($(COMPILER_SUITE),clang)
# clang # clang
@ -462,10 +474,6 @@ ALL_CSRC += $(LOCAL_CSRC) $(PREREQ_CSRC)
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)
FINAL_CPPFLAGS += -DGCC_HASCLASSVISIBILITY
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
@ -479,18 +487,6 @@ ifneq ($(TARGET_TRIPLET),arm-none-eabi)
FINAL_LPPFLAGS += -lstdc++ FINAL_LPPFLAGS += -lstdc++
endif endif
ifeq ($(GCC_MAJOR),2)
FINAL_LPPFLAGS += -lm
FINAL_CPPFLAGS += -I/usr/local/include
else
ifeq ($(GCC_MAJOR),3)
ifeq ($(GCC_MINOR),3)
FINAL_LPPFLAGS += -lgcc_s
# FINAL_LPPFLAGS += -L/usr/local/gcc3.3/lib
endif
endif
endif
ifeq ($(TARGET),mingw) ifeq ($(TARGET),mingw)
FINAL_CPPFLAGS += -DWIN32 FINAL_CPPFLAGS += -DWIN32
# see https://stackoverflow.com/questions/4492799 # see https://stackoverflow.com/questions/4492799