Fixed build.

This commit is contained in:
2019-06-22 12:32:45 +01:00
parent 2956db9b06
commit e7eba249f5
3 changed files with 13 additions and 16 deletions

View File

@@ -2,7 +2,6 @@
SRC_DIR := .
OBJ_DIR := .
LDFLAGS := -r
CPPFLAGS :=
CXXFLAGS := --std=c++14
@@ -10,8 +9,8 @@ CXXFLAGS += -MMD -MP
MODULESC := $(SRC_DIR)/base64.cpp
OBJECTS := $(MODULESC:$(SRC_DIR)/%.cpp=$(OBJ_DIR)/%.o)
libcppb64.o: $(OBJECTS)
$(CXX) $(LDFLAGS) -o $@ $^
libcppb64.a: $(OBJECTS)
ar rcs $@ $^
$(OBJECTS): $(OBJ_DIR)/%.o: $(SRC_DIR)/%.cpp
@mkdir -p $(@D)

View File

@@ -2,26 +2,24 @@
SRC_DIR := .
OBJ_DIR := obj
LDFLAGS := -r
CPPFLAGS :=
CXXFLAGS := --std=c++14
CXXFLAGS += -MMD -MP
CFLAGS := -MMD -MP
MODULESC := $(wildcard $(SRC_DIR)/*.c)
MODULESI := $(SRC_DIR)/curve-specific.inc
OBJECTSC := $(MODULESC:$(SRC_DIR)/%.c=$(OBJ_DIR)/%.o)
OBJECTSI := $(MODULESI:$(SRC_DIR)/%.inc=$(OBJ_DIR)/%.o)
OBJECTS := $(OBJECTSC) $(OBJECTSI)
libuECC.o: $(OBJECTS)
$(CXX) $(LDFLAGS) -o $@ $^
libuECC.a: $(OBJECTS)
ar rcs $@ $^
$(OBJECTSC): $(OBJ_DIR)/%.o: $(SRC_DIR)/%.c
@mkdir -p $(@D)
@$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $<
@$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
$(OBJECTSI): $(OBJ_DIR)/%.o: $(SRC_DIR)/%.inc
@mkdir -p $(@D)
@$(CXX) -x c $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $<
@$(CC) -x c $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
-include $(OBJECTS:.o=.d)