Browse Source

JSON-193: json-spirit now uses .cc, so fix the Makefile, too.

Release_2.1
roker 1 year ago
parent
commit
5f53c63cdc
1 changed files with 2 additions and 5 deletions
  1. +2
    -5
      server/Makefile

+ 2
- 5
server/Makefile View File

@ -89,8 +89,8 @@ ALL_OBJECTS=$(subst .d,.o,$(DEPENDS))
LIB_OBJECTS=$(subst .cc,.o,$(LIB_SOURCE))
MA_OBJECTS=$(subst .cc,.o,$(MA_SOURCE))
SPIRIT_SOURCE=$(wildcard json_spirit/*.cpp)
SPIRIT_OBJECTS=$(subst .cpp,.o,$(SPIRIT_SOURCE))
SPIRIT_SOURCE=$(wildcard json_spirit/*.cc)
SPIRIT_OBJECTS=$(subst .cc,.o,$(SPIRIT_SOURCE))
TEST_SOURCE=$(wildcard unittest_*.cc)
TEST_OBJECTS=$(subst .cc,.o,$(TEST_SOURCE))
@ -113,9 +113,6 @@ endif
%.o: %.cc
$(CXX) $(CXXFLAGS) -c -o $@ $^
%.o: %.cpp
$(CXX) $(CXXFLAGS) -c -o $@ $^
$(LIB_TARGET): $(LIB_OBJECTS)
$(AR) -cr $@ $^


Loading…
Cancel
Save