From 734baf94c708072f189f23f429f27cd8de06c994 Mon Sep 17 00:00:00 2001
From: Clemens Marschner <clemensm@microsoft.com>
Date: Fri, 29 Jan 2016 16:58:34 +0100
Subject: [PATCH] Fix #define

Activate LibSparsePCReader on Linux build

Make file name consistent with Windows

Activate LibSparsePCReader on Linux build

Make file name consistent with Windows

Activate LibSparsePCReader on Linux build

Make file name consistent with Windows

Fix reader on Linux

Activate LibSparsePCReader on Linux build

Make file name consistent with Windows

Activate LibSparsePCReader on Linux build

Make file name consistent with Windows

Activate LibSparsePCReader on Linux build

Make file name consistent with Windows

Activate LibSparsePCReader on Linux build

Make file name consistent with Windows
---
 Makefile                                      | 140 ++++++++++++++++++
 .../Readers/SparsePCReader/SparsePCReader.h   |   2 +-
 2 files changed, 141 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 84f6963f5..fb2da6901 100644
--- a/Makefile
+++ b/Makefile
@@ -401,6 +401,146 @@ $(SPARSEPCREADER): $(SPARSEPCREADER_OBJ) | $(CNTKMATH_LIB)
 
 
 
+########################################
+# SparsePCReader plugin
+########################################
+
+SPARSEPCREADER_SRC =\
+	$(SOURCEDIR)/Readers/SparsePCReader/Exports.cpp \
+	$(SOURCEDIR)/Readers/SparsePCReader/SparsePCReader.cpp \
+
+LIBSPARSEPCREADER_OBJ := $(patsubst %.cpp, $(OBJDIR)/%.o, $(LIBSPARCEPCREADER_SRC))
+
+SPARSEPCREADER:=$(LIBDIR)/SparsePCReader.so
+ALL += $(SPARSEPCREADER)
+SRC+=$(SPARSEPCREADER_SRC)
+
+$(SPARSEPCREADER): $(SPARSEPCREADER_OBJ) | $(CNTKMATH_LIB)
+	@echo $(SEPARATOR)
+	$(CXX) $(LDFLAGS) -shared $(patsubst %,-L%, $(LIBDIR) $(LIBPATH)) $(patsubst %,$(RPATH)%, $(ORIGINDIR) $(LIBPATH)) -o $@ $^ -l$(CNTKMATH)
+
+
+
+########################################
+# SparsePCReader plugin
+########################################
+
+SPARSEPCREADER_SRC =\
+	$(SOURCEDIR)/Readers/SparsePCReader/Exports.cpp \
+	$(SOURCEDIR)/Readers/SparsePCReader/SparsePCReader.cpp \
+
+LIBSPARSEPCREADER_OBJ := $(patsubst %.cpp, $(OBJDIR)/%.o, $(LIBSPARCEPCREADER_SRC))
+
+LIBSPARSEPCREADER:=$(LIBDIR)/SparsePCReader.so
+ALL += $(LIBSPARSEPCREADER)
+SRC+=$(LIBSPARSEPCREADER_SRC)
+
+$(LIBSPARSEPCREADER): $(LIBSPARSEPCREADER_OBJ) | $(CNTKMATH_LIB)
+	@echo $(SEPARATOR)
+	$(CXX) $(LDFLAGS) -shared $(patsubst %,-L%, $(LIBDIR) $(LIBPATH)) $(patsubst %,$(RPATH)%, $(ORIGINDIR) $(LIBPATH)) -o $@ $^ -l$(CNTKMATH)
+
+
+
+########################################
+# SparsePCReader plugin
+########################################
+
+SPARSEPCREADER_SRC =\
+	$(SOURCEDIR)/Readers/SparsePCReader/Exports.cpp \
+	$(SOURCEDIR)/Readers/SparsePCReader/SparsePCReader.cpp \
+
+LIBSPARSEPCREADER_OBJ := $(patsubst %.cpp, $(OBJDIR)/%.o, $(LIBSPARCEPCREADER_SRC))
+
+LIBSPARSEPCREADER:=$(LIBDIR)/SparsePCReader.so
+ALL += $(LIBSPARSEPCREADER)
+SRC+=$(LIBSPARSEPCREADER_SRC)
+
+$(LIBSPARSEPCREADER): $(LIBSPARSEPCREADER_OBJ) | $(CNTKMATH_LIB)
+	@echo $(SEPARATOR)
+	$(CXX) $(LDFLAGS) -shared $(patsubst %,-L%, $(LIBDIR) $(LIBPATH)) $(patsubst %,$(RPATH)%, $(ORIGINDIR) $(LIBPATH)) -o $@ $^ -l$(CNTKMATH)
+
+
+
+########################################
+# SparsePCReader plugin
+########################################
+
+SPARSEPCREADER_SRC =\
+	$(SOURCEDIR)/Readers/SparsePCReader/Exports.cpp \
+	$(SOURCEDIR)/Readers/SparsePCReader/SparsePCReader.cpp \
+
+LIBSPARSEPCREADER_OBJ := $(patsubst %.cpp, $(OBJDIR)/%.o, $(LIBSPARCEPCREADER_SRC))
+
+LIBSPARSEPCREADER:=$(LIBDIR)/SparsePCReader.so
+ALL += $(LIBSPARSEPCREADER)
+SRC+=$(LIBSPARSEPCREADER_SRC)
+
+$(LIBSPARSEPCREADER): $(LIBSPARSEPCREADER_OBJ) | $(CNTKMATH_LIB)
+	@echo $(SEPARATOR)
+	$(CXX) $(LDFLAGS) -shared $(patsubst %,-L%, $(LIBDIR) $(LIBPATH)) $(patsubst %,$(RPATH)%, $(ORIGINDIR) $(LIBPATH)) -o $@ $^ -l$(CNTKMATH)
+
+
+
+########################################
+# SparsePCReader plugin
+########################################
+
+SPARSEPCREADER_SRC =\
+	$(SOURCEDIR)/Readers/SparsePCReader/Exports.cpp \
+	$(SOURCEDIR)/Readers/SparsePCReader/SparsePCReader.cpp \
+
+LIBSPARSEPCREADER_OBJ := $(patsubst %.cpp, $(OBJDIR)/%.o, $(LIBSPARCEPCREADER_SRC))
+
+LIBSPARSEPCREADER:=$(LIBDIR)/SparsePCReader.so
+ALL += $(LIBSPARSEPCREADER)
+SRC+=$(LIBSPARSEPCREADER_SRC)
+
+$(LIBSPARSEPCREADER): $(LIBSPARSEPCREADER_OBJ) | $(CNTKMATH_LIB)
+	@echo $(SEPARATOR)
+	$(CXX) $(LDFLAGS) -shared $(patsubst %,-L%, $(LIBDIR) $(LIBPATH)) $(patsubst %,$(RPATH)%, $(ORIGINDIR) $(LIBPATH)) -o $@ $^ -l$(CNTKMATH)
+
+
+
+########################################
+# SparsePCReader plugin
+########################################
+
+SPARSEPCREADER_SRC =\
+	$(SOURCEDIR)/Readers/SparsePCReader/Exports.cpp \
+	$(SOURCEDIR)/Readers/SparsePCReader/SparsePCReader.cpp \
+
+LIBSPARSEPCREADER_OBJ := $(patsubst %.cpp, $(OBJDIR)/%.o, $(LIBSPARCEPCREADER_SRC))
+
+LIBSPARSEPCREADER:=$(LIBDIR)/SparsePCReader.so
+ALL += $(LIBSPARSEPCREADER)
+SRC+=$(LIBSPARSEPCREADER_SRC)
+
+$(LIBSPARSEPCREADER): $(LIBSPARSEPCREADER_OBJ) | $(CNTKMATH_LIB)
+	@echo $(SEPARATOR)
+	$(CXX) $(LDFLAGS) -shared $(patsubst %,-L%, $(LIBDIR) $(LIBPATH)) $(patsubst %,$(RPATH)%, $(ORIGINDIR) $(LIBPATH)) -o $@ $^ -l$(CNTKMATH)
+
+
+
+########################################
+# SparsePCReader plugin
+########################################
+
+SPARSEPCREADER_SRC =\
+	$(SOURCEDIR)/Readers/SparsePCReader/Exports.cpp \
+	$(SOURCEDIR)/Readers/SparsePCReader/SparsePCReader.cpp \
+
+LIBSPARSEPCREADER_OBJ := $(patsubst %.cpp, $(OBJDIR)/%.o, $(LIBSPARCEPCREADER_SRC))
+
+LIBSPARSEPCREADER:=$(LIBDIR)/SparsePCReader.so
+ALL += $(LIBSPARSEPCREADER)
+SRC+=$(LIBSPARSEPCREADER_SRC)
+
+$(LIBSPARSEPCREADER): $(LIBSPARSEPCREADER_OBJ) | $(CNTKMATH_LIB)
+	@echo $(SEPARATOR)
+	$(CXX) $(LDFLAGS) -shared $(patsubst %,-L%, $(LIBDIR) $(LIBPATH)) $(patsubst %,$(RPATH)%, $(ORIGINDIR) $(LIBPATH)) -o $@ $^ -l$(CNTKMATH)
+
+
+
 ########################################
 # Kaldi plugins
 ########################################
diff --git a/Source/Readers/SparsePCReader/SparsePCReader.h b/Source/Readers/SparsePCReader/SparsePCReader.h
index 555ede02a..acbd2f672 100644
--- a/Source/Readers/SparsePCReader/SparsePCReader.h
+++ b/Source/Readers/SparsePCReader/SparsePCReader.h
@@ -15,7 +15,7 @@
 
 // Windows or Posix? Originally the reader was done only for Windows. Keep it this way for now when running on Windows.
 #ifdef __WINDOWS__
-#define SPARSE_PCREADER_USE_WINDOWS_API 1
+#define SPARSE_PCREADER_USE_WINDOWS_API
 #endif
 
 namespace Microsoft { namespace MSR { namespace CNTK {