Changeset 5513 for pjproject/branches/projects/uwp/build/rules.mak

Timestamp:

Dec 28, 2016 3:40:07 AM (8 years ago)

Author:

nanang

Message:

Re #1900: More merged from trunk (r5512 mistakenly contains merged changes in third-party dir only).

Location:

pjproject/branches/projects/uwp

Files:

• . (modified) (1 prop)
• build/rules.mak (modified) (2 diffs)

pjproject/branches/projects/uwp/build/rules.mak

@@ -52 +52 @@
 # FULL_SRCS is ../src/app/file1.c ../src/app/file1.S
 #
-FULL_SRCS = $(foreach file, $($(APP)_OBJS), $(SRCDIR)/$(basename $(file)).m $(SRCDIR)/$(basename $(file)).c $(SRCDIR)/$(basename $(file)).cpp $(SRCDIR)/$(basename $(file)).S)
+FULL_SRCS = $(foreach file, $($(APP)_OBJS), $(SRCDIR)/$(basename $(file)).m $(SRCDIR)/$(basename $(file)).c $(SRCDIR)/$(basename $(file)).cpp $(SRCDIR)/$(basename $(file)).cc $(SRCDIR)/$(basename $(file)).S)
 
 #
@@ -171 +171 @@
 
 $(OBJDIR)/%$(OBJEXT): $(SRCDIR)/%.cpp
+        $(CXX) $($(APP)_CXXFLAGS) \
+                $(CC_OUT)$(subst /,$(HOST_PSEP),$@) \
+                $(subst /,$(HOST_PSEP),$<)
+
+$(OBJDIR)/%$(OBJEXT): $(SRCDIR)/%.cc
         $(CXX) $($(APP)_CXXFLAGS) \
                 $(CC_OUT)$(subst /,$(HOST_PSEP),$@) \