Ignore:
Timestamp:
Aug 7, 2015 12:52:09 PM (6 years ago)
Author:
nanang
Message:

Misc (re #1843): Fixed compile warnings of "command line option '-frtti' is valid for C++/ObjC++ but not for C" on "make depend" for Android targets.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/build/rules.mak

    r4786 r5154  
    5858# CFLAGS or CXXFLAGS (not both). But I just couldn't make if/ifeq to work. 
    5959# 
    60 DEPFLAGS = $($(APP)_CXXFLAGS) $($(APP)_CFLAGS) 
     60#DEPFLAGS = $($(APP)_CXXFLAGS) $($(APP)_CFLAGS) 
     61DEPCFLAGS =  $($(APP)_CFLAGS) 
     62DEPCXXFLAGS = $($(APP)_CXXFLAGS) 
    6163 
    6264# Dependency file 
     
    7779        @echo $(APP)_CXXFLAGS=$($(APP)_CXXFLAGS) 
    7880        @echo $(APP)_LDFLAGS=$($(APP)_LDFLAGS) 
    79         @echo DEPFLAGS=$(DEPFLAGS) 
     81#       @echo DEPFLAGS=$(DEPFLAGS) 
    8082        @echo CC=$(CC) 
    8183        @echo AR=$(AR) 
     
    217219           if test -f $$F; then \ 
    218220             echo "$(OBJDIR)/" | tr -d '\n' >> $(DEP_FILE); \ 
    219              if $(CC) -M $(DEPFLAGS) $$F | sed '/^#/d' >> $(DEP_FILE); then \ 
     221             if echo $$F | grep -q .cpp$$; then \ 
     222                dep="$(CC) -M $(DEPCXXFLAGS) $$F"; \ 
     223             else \ 
     224                dep="$(CC) -M $(DEPCFLAGS) $$F"; \ 
     225             fi; \ 
     226             if eval $$dep | sed '/^#/d' >> $(DEP_FILE); then \ 
    220227                true; \ 
    221228             else \ 
Note: See TracChangeset for help on using the changeset viewer.