|
|
@@ -1,6 +1,6 @@
|
|
|
-include $(PVFMM_DIR)/MakeVariables
|
|
|
|
|
|
-ifndef CXXFLAGS_PVFMM
|
|
|
+ifndef CXX_PVFMM
|
|
|
-include ../MakeVariables
|
|
|
endif
|
|
|
|
|
|
@@ -8,6 +8,10 @@ ifndef CXXFLAGS_PVFMM
|
|
|
$(error Cannot find file: MakeVariables)
|
|
|
endif
|
|
|
|
|
|
+CXX=$(CXX_PVFMM)
|
|
|
+CXXFLAGS=$(CXXFLAGS_PVFMM)
|
|
|
+LDLIBS=$(LDLIBS_PVFMM)
|
|
|
+
|
|
|
RM = rm -f
|
|
|
MKDIRS = mkdir -p
|
|
|
|
|
|
@@ -27,25 +31,25 @@ ifeq ($(INTEL_OFFLOAD_OK),yes)
|
|
|
|
|
|
$(BINDIR)/%: $(OBJDIR)/%.o
|
|
|
-@$(MKDIRS) $(dir $@)
|
|
|
- $(CXX_PVFMM) $(CXXFLAGS_PVFMM) -no-offload $^ $(LDFLAGS_PVFMM) -o $@
|
|
|
- $(CXX_PVFMM) $(CXXFLAGS_PVFMM) $^_async $(LDFLAGS_PVFMM) -o $@_async
|
|
|
- $(CXX_PVFMM) $(CXXFLAGS_PVFMM) -D__DEVICE_SYNC__=1 $^_mic $(LDFLAGS_PVFMM) -o $@_mic
|
|
|
+ $(CXX) $(CXXFLAGS) -no-offload $^ $(LDLIBS) -o $@
|
|
|
+ $(CXX) $(CXXFLAGS) $^_async $(LDLIBS) -o $@_async
|
|
|
+ $(CXX) $(CXXFLAGS) -D__DEVICE_SYNC__=1 $^_mic $(LDLIBS) -o $@_mic
|
|
|
|
|
|
$(OBJDIR)/%.o: $(SRCDIR)/%.cpp
|
|
|
-@$(MKDIRS) $(dir $@)
|
|
|
- $(CXX_PVFMM) $(CXXFLAGS_PVFMM) -no-offload -I$(INCDIR) -c $^ -o $@
|
|
|
- $(CXX_PVFMM) $(CXXFLAGS_PVFMM) -I$(INCDIR) -c $^ -o $@_async
|
|
|
- $(CXX_PVFMM) $(CXXFLAGS_PVFMM) -D__DEVICE_SYNC__=1 -I$(INCDIR) -c $^ -o $@_mic
|
|
|
+ $(CXX) $(CXXFLAGS) -no-offload -I$(INCDIR) -c $^ -o $@
|
|
|
+ $(CXX) $(CXXFLAGS) -I$(INCDIR) -c $^ -o $@_async
|
|
|
+ $(CXX) $(CXXFLAGS) -D__DEVICE_SYNC__=1 -I$(INCDIR) -c $^ -o $@_mic
|
|
|
|
|
|
else
|
|
|
|
|
|
$(BINDIR)/%: $(OBJDIR)/%.o
|
|
|
-@$(MKDIRS) $(dir $@)
|
|
|
- $(CXX_PVFMM) $(CXXFLAGS_PVFMM) $^ $(LDFLAGS_PVFMM) -o $@
|
|
|
+ $(CXX) $(CXXFLAGS) $^ $(LDLIBS) -o $@
|
|
|
|
|
|
$(OBJDIR)/%.o: $(SRCDIR)/%.cpp
|
|
|
-@$(MKDIRS) $(dir $@)
|
|
|
- $(CXX_PVFMM) $(CXXFLAGS_PVFMM) -I$(INCDIR) -c $^ -o $@
|
|
|
+ $(CXX) $(CXXFLAGS) -I$(INCDIR) -c $^ -o $@
|
|
|
|
|
|
endif
|
|
|
|
Dhairya Malhotra